From b612367b33df901397fdf6f87ea5214e0fb05e7e Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@gmx.org>
Date: Mon, 24 Aug 2020 22:01:58 +0200
Subject: [PATCH] netlist: clang tidy include order fixes.

---
 src/lib/netlist/core/nets.h   | 2 +-
 src/lib/netlist/core/param.h  | 2 +-
 src/lib/netlist/nl_base.h     | 6 +++---
 src/lib/netlist/nl_parser.cpp | 2 +-
 src/lib/netlist/nl_setup.cpp  | 2 +-
 src/lib/netlist/nl_setup.h    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lib/netlist/core/nets.h b/src/lib/netlist/core/nets.h
index 7b872250d56..db28687e5d0 100644
--- a/src/lib/netlist/core/nets.h
+++ b/src/lib/netlist/core/nets.h
@@ -9,9 +9,9 @@
 #define NL_CORE_NETS_H_
 
 #include "base_objects.h"
-#include "state_var.h"
 #include "core_device.h"
 #include "exec.h"
+#include "state_var.h"
 
 #include "../nltypes.h"
 #include "../plib/plists.h"
diff --git a/src/lib/netlist/core/param.h b/src/lib/netlist/core/param.h
index 609c89d1cf3..adb13f465da 100644
--- a/src/lib/netlist/core/param.h
+++ b/src/lib/netlist/core/param.h
@@ -28,10 +28,10 @@
 #include "setup.h"
 
 #include "../plib/palloc.h"
+#include "../plib/pfunction.h"
 #include "../plib/pstream.h"
 #include "../plib/pstring.h"
 #include "../plib/putil.h" // psource_t
-#include "../plib/pfunction.h"
 
 #include <memory>
 
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 1eebae7b75a..24a0ddbfc5e 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -15,6 +15,9 @@
 #include "core/analog.h"
 #include "core/base_objects.h"
 #include "core/device.h"
+#include "core/device_macros.h"
+#include "core/devices.h"
+#include "core/exec.h"
 #include "core/logic.h"
 #include "core/logic_family.h"
 #include "core/netlist_state.h"
@@ -22,9 +25,6 @@
 #include "core/object_array.h"
 #include "core/param.h"
 #include "core/state_var.h"
-#include "core/exec.h"
-#include "core/device_macros.h"
-#include "core/devices.h"
 
 //============================================================
 // Namespace starts
diff --git a/src/lib/netlist/nl_parser.cpp b/src/lib/netlist/nl_parser.cpp
index d8b8da88419..85f78cabdd1 100644
--- a/src/lib/netlist/nl_parser.cpp
+++ b/src/lib/netlist/nl_parser.cpp
@@ -3,9 +3,9 @@
 
 #include "nl_parser.h"
 #include "nl_base.h"
-#include "nl_setup.h"
 #include "nl_errstr.h"
 #include "nl_factory.h"
+#include "nl_setup.h"
 
 namespace netlist
 {
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index 06ad0619cc7..e8d6b1cf249 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -11,8 +11,8 @@
 #include "nl_parser.h"
 #include "nl_setup.h"
 #include "plib/penum.h"
-#include "plib/putil.h"
 #include "plib/pstonum.h"
+#include "plib/putil.h"
 
 #include "solver/nld_solver.h"
 
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index 964cb0d19d2..b81f5c6c4f6 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -16,8 +16,8 @@
 #include "plib/putil.h"
 
 #include "nl_config.h"
-#include "nltypes.h"
 #include "nl_parser.h"
+#include "nltypes.h"
 // FIXME: avoid including factory
 //#include "nl_factory.h"