Make header sort order consistent again

13 files changed, 16 insertions, 12 deletions

diff --git a/SignalsPanel.h b/SignalsPanel.h
index 529043a1..d8676622 100644
--- a/SignalsPanel.h
+++ b/SignalsPanel.h
@@ -9,12 +9,12 @@ in the source distribution for its full text.
 
 #include "config.h" // IWYU pragma: keep
 
+#include "Panel.h"
+
 #ifndef HTOP_SOLARIS
 #include <signal.h>
 #endif
 
-#include "Panel.h"
-
 
 typedef struct SignalItem_ {
    const char* name;
diff --git a/generic/gettime.c b/generic/gettime.c
index b7c4885e..209f5232 100644
--- a/generic/gettime.c
+++ b/generic/gettime.c
@@ -4,6 +4,7 @@ htop - generic/gettime.c
 Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
+
 #include "config.h"  // IWYU pragma: keep
 
 #include "generic/gettime.h"
diff --git a/generic/hostname.c b/generic/hostname.c
index 69a41468..e3275828 100644
--- a/generic/hostname.c
+++ b/generic/hostname.c
@@ -4,6 +4,7 @@ htop - generic/hostname.c
 Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
+
 #include "config.h"  // IWYU pragma: keep
 
 #include "generic/hostname.h"
diff --git a/generic/uname.c b/generic/uname.c
index 2a734dc1..b5bb5834 100644
--- a/generic/uname.c
+++ b/generic/uname.c
@@ -4,6 +4,7 @@ htop - generic/uname.c
 Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
+
 #include "config.h"  // IWYU pragma: keep
 
 #include "generic/uname.h"
diff --git a/linux/LibSensors.c b/linux/LibSensors.c
index 6b980fb1..f52bd218 100644
--- a/linux/LibSensors.c
+++ b/linux/LibSensors.c
@@ -1,7 +1,7 @@
-#include "linux/LibSensors.h"
-
 #include "config.h" // IWYU pragma: keep
 
+#include "linux/LibSensors.h"
+
 #ifdef HAVE_SENSORS_SENSORS_H
 
 #include <assert.h>
diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
index 6c309893..4b0eab8b 100644
--- a/linux/LinuxProcess.h
+++ b/linux/LinuxProcess.h
@@ -13,10 +13,10 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "linux/IOPriority.h"
 #include "Machine.h"
 #include "Object.h"
 #include "Process.h"
+#include "linux/IOPriority.h"
 
 
 #define PROCESS_FLAG_LINUX_IOPRIO    0x00000100
diff --git a/linux/Platform.c b/linux/Platform.c
index 955f080b..422b243d 100644
--- a/linux/Platform.c
+++ b/linux/Platform.c
@@ -5,7 +5,6 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "ZramMeter.h"
 #include "config.h" // IWYU pragma: keep
 
 #include "linux/Platform.h"
@@ -47,7 +46,6 @@ in the source distribution for its full text.
 #include "Panel.h"
 #include "PressureStallMeter.h"
 #include "ProvideCurses.h"
-#include "linux/SELinuxMeter.h"
 #include "Settings.h"
 #include "SwapMeter.h"
 #include "SysArchMeter.h"
@@ -58,6 +56,7 @@ in the source distribution for its full text.
 #include "linux/IOPriorityPanel.h"
 #include "linux/LinuxMachine.h"
 #include "linux/LinuxProcess.h"
+#include "linux/SELinuxMeter.h"
 #include "linux/SystemdMeter.h"
 #include "linux/ZramMeter.h"
 #include "linux/ZramStats.h"
diff --git a/linux/Platform.h b/linux/Platform.h
index 4a69907e..4c775735 100644
--- a/linux/Platform.h
+++ b/linux/Platform.h
@@ -32,6 +32,7 @@ in the source distribution for its full text.
 #include "generic/hostname.h"
 #include "generic/uname.h"
 
+
 /* GNU/Hurd does not have PATH_MAX in limits.h */
 #ifndef PATH_MAX
    #define PATH_MAX 4096
diff --git a/pcp/PCPDynamicMeter.c b/pcp/PCPDynamicMeter.c
index e8999881..41958183 100644
--- a/pcp/PCPDynamicMeter.c
+++ b/pcp/PCPDynamicMeter.c
@@ -5,6 +5,7 @@ htop - PCPDynamicMeter.c
 Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
+
 #include "config.h" // IWYU pragma: keep
 
 #include "pcp/PCPDynamicMeter.h"
diff --git a/pcp/PCPMachine.c b/pcp/PCPMachine.c
index 59e05624..516de7b8 100644
--- a/pcp/PCPMachine.c
+++ b/pcp/PCPMachine.c
@@ -18,8 +18,8 @@ in the source distribution for its full text.
 #include <string.h>
 #include <sys/time.h>
 
-#include "Macros.h"
 #include "Machine.h"
+#include "Macros.h"
 #include "Object.h"
 #include "Platform.h"
 #include "Settings.h"
diff --git a/pcp/PCPProcessList.c b/pcp/PCPProcessList.c
index c18d74be..d902696a 100644
--- a/pcp/PCPProcessList.c
+++ b/pcp/PCPProcessList.c
@@ -18,8 +18,8 @@ in the source distribution for its full text.
 #include <string.h>
 #include <sys/time.h>
 
-#include "Macros.h"
 #include "Machine.h"
+#include "Macros.h"
 #include "Object.h"
 #include "Platform.h"
 #include "Process.h"
diff --git a/solaris/Platform.h b/solaris/Platform.h
index 3dc6e3b5..8bb6f05e 100644
--- a/solaris/Platform.h
+++ b/solaris/Platform.h
@@ -30,12 +30,12 @@ in the source distribution for its full text.
 
 #include "Action.h"
 #include "BatteryMeter.h"
+#include "CommandLine.h"
 #include "DiskIOMeter.h"
 #include "Hashtable.h"
 #include "NetworkIOMeter.h"
 #include "ProcessLocksScreen.h"
 #include "SignalsPanel.h"
-#include "CommandLine.h"
 #include "generic/gettime.h"
 #include "generic/hostname.h"
 #include "generic/uname.h"
diff --git a/solaris/SolarisMachine.h b/solaris/SolarisMachine.h
index da091c6e..3f0050f5 100644
--- a/solaris/SolarisMachine.h
+++ b/solaris/SolarisMachine.h
@@ -14,11 +14,11 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/param.h>
-#include <sys/uio.h>
 #include <sys/resource.h>
+#include <sys/swap.h>
 #include <sys/sysconf.h>
 #include <sys/sysinfo.h>
-#include <sys/swap.h>
+#include <sys/uio.h>
 
 #include "Hashtable.h"
 #include "UsersTable.h"