cleaned up includes with iwyu

71 files changed, 92 insertions, 29 deletions

diff --git a/AffinityPanel.h b/AffinityPanel.h
index 3b4b0f79..183e447d 100644
--- a/AffinityPanel.h
+++ b/AffinityPanel.h
@@ -11,6 +11,7 @@ in the source distribution for its full text.
 #include "Panel.h"
 #include "ProcessList.h"
 
+
 extern const PanelClass AffinityPanel_class;
 
 Panel* AffinityPanel_new(ProcessList* pl, const Affinity* affinity, int* width);
diff --git a/AvailableColumnsPanel.c b/AvailableColumnsPanel.c
index fb0357cf..04e4fa58 100644
--- a/AvailableColumnsPanel.c
+++ b/AvailableColumnsPanel.c
@@ -15,7 +15,6 @@ in the source distribution for its full text.
 #include "FunctionBar.h"
 #include "ListItem.h"
 #include "Object.h"
-#include "Platform.h"
 #include "Process.h"
 #include "ProvideCurses.h"
 #include "XUtils.h"
diff --git a/AvailableColumnsPanel.h b/AvailableColumnsPanel.h
index 8672eb9e..bf87dcfb 100644
--- a/AvailableColumnsPanel.h
+++ b/AvailableColumnsPanel.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "Panel.h"
 
+
 typedef struct AvailableColumnsPanel_ {
    Panel super;
    Panel* columns;
diff --git a/AvailableMetersPanel.h b/AvailableMetersPanel.h
index a9c0da95..5c05a297 100644
--- a/AvailableMetersPanel.h
+++ b/AvailableMetersPanel.h
@@ -13,6 +13,7 @@ in the source distribution for its full text.
 #include "ScreenManager.h"
 #include "Settings.h"
 
+
 typedef struct AvailableMetersPanel_ {
    Panel super;
    ScreenManager* scr;
diff --git a/BatteryMeter.h b/BatteryMeter.h
index b6e8c520..fa6d503c 100644
--- a/BatteryMeter.h
+++ b/BatteryMeter.h
@@ -11,6 +11,7 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
 
 #include "Meter.h"
 
+
 typedef enum ACPresence_ {
    AC_ABSENT,
    AC_PRESENT,
diff --git a/CPUMeter.h b/CPUMeter.h
index 989451a4..6dbf815d 100644
--- a/CPUMeter.h
+++ b/CPUMeter.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "Meter.h"
 
+
 typedef enum {
    CPU_METER_NICE = 0,
    CPU_METER_NORMAL = 1,
diff --git a/CategoriesPanel.h b/CategoriesPanel.h
index 0582c642..c438e45f 100644
--- a/CategoriesPanel.h
+++ b/CategoriesPanel.h
@@ -13,6 +13,7 @@ in the source distribution for its full text.
 #include "ScreenManager.h"
 #include "Settings.h"
 
+
 typedef struct CategoriesPanel_ {
    Panel super;
    ScreenManager* scr;
diff --git a/ClockMeter.c b/ClockMeter.c
index f8a447e9..79bdecd9 100644
--- a/ClockMeter.c
+++ b/ClockMeter.c
@@ -10,9 +10,11 @@ in the source distribution for its full text.
 #include "ClockMeter.h"
 
 #include <time.h>
+#include <sys/time.h>
 
 #include "CRT.h"
 #include "Object.h"
+#include "ProcessList.h"
 
 
 static const int ClockMeter_attributes[] = {
diff --git a/ClockMeter.h b/ClockMeter.h
index ecd4b6a9..675df3d9 100644
--- a/ClockMeter.h
+++ b/ClockMeter.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "Meter.h"
 
+
 extern const MeterClass ClockMeter_class;
 
 #endif
diff --git a/ColorsPanel.c b/ColorsPanel.c
index c076adc0..d9857308 100644
--- a/ColorsPanel.c
+++ b/ColorsPanel.c
@@ -7,17 +7,15 @@ in the source distribution for its full text.
 
 #include "ColorsPanel.h"
 
+#include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
 #include "CRT.h"
 #include "FunctionBar.h"
-#include "Header.h"
 #include "Object.h"
 #include "OptionItem.h"
 #include "ProvideCurses.h"
-#include "RichString.h"
-#include "Vector.h"
 
 
 // TO ADD A NEW SCHEME:
diff --git a/ColorsPanel.h b/ColorsPanel.h
index f63ca356..54bb8580 100644
--- a/ColorsPanel.h
+++ b/ColorsPanel.h
@@ -11,6 +11,7 @@ in the source distribution for its full text.
 #include "ScreenManager.h"
 #include "Settings.h"
 
+
 typedef struct ColorsPanel_ {
    Panel super;
 
diff --git a/ColumnsPanel.h b/ColumnsPanel.h
index 173e039b..8bc806eb 100644
--- a/ColumnsPanel.h
+++ b/ColumnsPanel.h
@@ -12,6 +12,7 @@ in the source distribution for its full text.
 #include "Panel.h"
 #include "Settings.h"
 
+
 typedef struct ColumnsPanel_ {
    Panel super;
 
diff --git a/CommandScreen.c b/CommandScreen.c
index 12b1987d..6a87d137 100644
--- a/CommandScreen.c
+++ b/CommandScreen.c
@@ -2,13 +2,13 @@
 
 #include "CommandScreen.h"
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "Macros.h"
 #include "Panel.h"
 #include "ProvideCurses.h"
-#include "XUtils.h"
 
 
 static void CommandScreen_scan(InfoScreen* this) {
diff --git a/DateMeter.c b/DateMeter.c
index 520e516a..d01f464d 100644
--- a/DateMeter.c
+++ b/DateMeter.c
@@ -10,9 +10,11 @@ in the source distribution for its full text.
 #include "DateMeter.h"
 
 #include <time.h>
+#include <sys/time.h>
 
 #include "CRT.h"
 #include "Object.h"
+#include "ProcessList.h"
 
 
 static const int DateMeter_attributes[] = {
diff --git a/DateMeter.h b/DateMeter.h
index 63455767..a6ce47a7 100644
--- a/DateMeter.h
+++ b/DateMeter.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "Meter.h"
 
+
 extern const MeterClass DateMeter_class;
 
 #endif
diff --git a/DateTimeMeter.c b/DateTimeMeter.c
index 588b9fbe..a042a61a 100644
--- a/DateTimeMeter.c
+++ b/DateTimeMeter.c
@@ -10,9 +10,11 @@ in the source distribution for its full text.
 #include "DateTimeMeter.h"
 
 #include <time.h>
+#include <sys/time.h>
 
 #include "CRT.h"
 #include "Object.h"
+#include "ProcessList.h"
 
 
 static const int DateTimeMeter_attributes[] = {
diff --git a/DateTimeMeter.h b/DateTimeMeter.h
index 6cb73c24..04cc3273 100644
--- a/DateTimeMeter.h
+++ b/DateTimeMeter.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "Meter.h"
 
+
 extern const MeterClass DateTimeMeter_class;
 
 #endif
diff --git a/DiskIOMeter.c b/DiskIOMeter.c
index 15ad5e54..67122a15 100644
--- a/DiskIOMeter.c
+++ b/DiskIOMeter.c
@@ -9,12 +9,12 @@ in the source distribution for its full text.
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <sys/time.h>
 
 #include "CRT.h"
 #include "Macros.h"
 #include "Object.h"
 #include "Platform.h"
+#include "ProcessList.h"
 #include "RichString.h"
 #include "XUtils.h"
 
diff --git a/DiskIOMeter.h b/DiskIOMeter.h
index 47afa5ed..68ea638a 100644
--- a/DiskIOMeter.h
+++ b/DiskIOMeter.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "Meter.h"
 
+
 typedef struct DiskIOData_ {
    uint64_t totalBytesRead;
    uint64_t totalBytesWritten;
diff --git a/DisplayOptionsPanel.h b/DisplayOptionsPanel.h
index 02b67a08..745f125f 100644
--- a/DisplayOptionsPanel.h
+++ b/DisplayOptionsPanel.h
@@ -11,6 +11,7 @@ in the source distribution for its full text.
 #include "ScreenManager.h"
 #include "Settings.h"
 
+
 typedef struct DisplayOptionsPanel_ {
    Panel super;
 
diff --git a/EnvScreen.c b/EnvScreen.c
index bd8a2b03..0fcee83a 100644
--- a/EnvScreen.c
+++ b/EnvScreen.c
@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "CRT.h"
 #include "Macros.h"
 #include "Panel.h"
 #include "Platform.h"
diff --git a/EnvScreen.h b/EnvScreen.h
index 66d263fc..4d44c81c 100644
--- a/EnvScreen.h
+++ b/EnvScreen.h
@@ -5,6 +5,7 @@
 #include "Object.h"
 #include "Process.h"
 
+
 typedef struct EnvScreen_ {
    InfoScreen super;
 } EnvScreen;
diff --git a/FunctionBar.h b/FunctionBar.h
index 925e323b..1f52658e 100644
--- a/FunctionBar.h
+++ b/FunctionBar.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include <stdbool.h>
 
+
 typedef struct FunctionBar_ {
    int size;
    char** functions;
diff --git a/Hashtable.c b/Hashtable.c
index fdc87bec..f1761eeb 100644
--- a/Hashtable.c
+++ b/Hashtable.c
@@ -11,7 +11,6 @@ in the source distribution for its full text.
 
 #include <assert.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/HostnameMeter.c b/HostnameMeter.c
index 4968fd30..b1570c8c 100644
--- a/HostnameMeter.c
+++ b/HostnameMeter.c
@@ -8,12 +8,10 @@ in the source distribution for its full text.
 #include "config.h" // IWYU pragma: keep
 
 #include "HostnameMeter.h"
-#include "Platform.h"
-
-#include <unistd.h>
 
 #include "CRT.h"
 #include "Object.h"
+#include "Platform.h"
 
 
 static const int HostnameMeter_attributes[] = {
diff --git a/HostnameMeter.h b/HostnameMeter.h
index 77fe3da9..85d94d84 100644
--- a/HostnameMeter.h
+++ b/HostnameMeter.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "Meter.h"
 
+
 extern const MeterClass HostnameMeter_class;
 
 #endif
diff --git a/IncSet.h b/IncSet.h
index 4ff19aad..e2062c6d 100644
--- a/IncSet.h
+++ b/IncSet.h
@@ -14,6 +14,7 @@ in the source distribution for its full text.
 #include "Panel.h"
 #include "Vector.h"
 
+
 #define INCMODE_MAX 40
 
 typedef enum {
diff --git a/InfoScreen.c b/InfoScreen.c
index 4a1f6592..8f575232 100644
--- a/InfoScreen.c
+++ b/InfoScreen.c
@@ -4,7 +4,6 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "CRT.h"
diff --git a/ListItem.h b/ListItem.h
index 87a7c073..0bbca2f4 100644
--- a/ListItem.h
+++ b/ListItem.h
@@ -11,6 +11,7 @@ in the source distribution for its full text.
 
 #include "Object.h"
 
+
 typedef struct ListItem_ {
    Object super;
    char* value;
diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c
index 46685f43..c91e6a2d 100644
--- a/LoadAverageMeter.c
+++ b/LoadAverageMeter.c
@@ -10,6 +10,7 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "Object.h"
 #include "Platform.h"
+#include "ProcessList.h"
 #include "RichString.h"
 #include "XUtils.h"
 
diff --git a/LoadAverageMeter.h b/LoadAverageMeter.h
index 776c8bf6..d575ad53 100644
--- a/LoadAverageMeter.h
+++ b/LoadAverageMeter.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "Meter.h"
 
+
 extern const MeterClass LoadAverageMeter_class;
 
 extern const MeterClass LoadMeter_class;
diff --git a/MemoryMeter.c b/MemoryMeter.c
index fe9ae20a..75ad7e8c 100644
--- a/MemoryMeter.c
+++ b/MemoryMeter.c
@@ -8,6 +8,7 @@ in the source distribution for its full text.
 #include "MemoryMeter.h"
 
 #include <math.h>
+#include <stddef.h>
 
 #include "CRT.h"
 #include "Object.h"
diff --git a/MemoryMeter.h b/MemoryMeter.h
index d299483a..6d7dd825 100644
--- a/MemoryMeter.h
+++ b/MemoryMeter.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "Meter.h"
 
+
 extern const MeterClass MemoryMeter_class;
 
 #endif
diff --git a/Meter.c b/Meter.c
index 13df763a..ae867e1c 100644
--- a/Meter.c
+++ b/Meter.c
@@ -18,7 +18,6 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "Macros.h"
 #include "Object.h"
-#include "Platform.h"
 #include "ProvideCurses.h"
 #include "RichString.h"
 #include "Settings.h"
diff --git a/Meter.h b/Meter.h
index ff691286..cd9c9b8e 100644
--- a/Meter.h
+++ b/Meter.h
@@ -10,6 +10,7 @@ in the source distribution for its full text.
 #include "config.h" // IWYU pragma: keep
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <sys/time.h>
 
diff --git a/NetworkIOMeter.c b/NetworkIOMeter.c
index 353521ad..dcba78de 100644
--- a/NetworkIOMeter.c
+++ b/NetworkIOMeter.c
@@ -1,13 +1,14 @@
 #include "NetworkIOMeter.h"
 
 #include <stdbool.h>
-#include <stddef.h>
-#include <sys/time.h>
+#include <stdint.h>
 
 #include "CRT.h"
 #include "Macros.h"
 #include "Object.h"
 #include "Platform.h"
+#include "Process.h"
+#include "ProcessList.h"
 #include "RichString.h"
 #include "XUtils.h"
 
diff --git a/NetworkIOMeter.h b/NetworkIOMeter.h
index 8178b02f..18c23ce2 100644
--- a/NetworkIOMeter.h
+++ b/NetworkIOMeter.h
@@ -3,6 +3,7 @@
 
 #include "Meter.h"
 
+
 typedef struct NetworkIOData_ {
    uint64_t bytesReceived;
    uint64_t packetsReceived;
diff --git a/OpenFilesScreen.h b/OpenFilesScreen.h
index 0fbafe0e..f3c129cc 100644
--- a/OpenFilesScreen.h
+++ b/OpenFilesScreen.h
@@ -13,6 +13,7 @@ in the source distribution for its full text.
 #include "Object.h"
 #include "Process.h"
 
+
 typedef struct OpenFilesScreen_ {
    InfoScreen super;
    pid_t pid;
diff --git a/Process.c b/Process.c
index 876b3b72..01c08b88 100644
--- a/Process.c
+++ b/Process.c
@@ -17,6 +17,7 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/resource.h>
@@ -31,8 +32,6 @@ in the source distribution for its full text.
 
 #if defined(MAJOR_IN_MKDEV)
 #include <sys/mkdev.h>
-#elif defined(MAJOR_IN_SYSMACROS)
-#include <sys/sysmacros.h>
 #endif
 
 
diff --git a/ProcessList.c b/ProcessList.c
index 4d4a7ca1..8c82cbfc 100644
--- a/ProcessList.c
+++ b/ProcessList.c
@@ -10,7 +10,6 @@ in the source distribution for its full text.
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/time.h>
 
 #include "CRT.h"
 #include "Hashtable.h"
diff --git a/ProcessList.h b/ProcessList.h
index 50304f7c..32bdfa18 100644
--- a/ProcessList.h
+++ b/ProcessList.h
@@ -10,6 +10,8 @@ in the source distribution for its full text.
 #include "config.h" // IWYU pragma: keep
 
 #include <stdbool.h>
+#include <stdint.h>
+#include <sys/time.h>
 #include <sys/types.h>
 
 #include "Hashtable.h"
diff --git a/RichString.c b/RichString.c
index 558c7430..ac1100f3 100644
--- a/RichString.c
+++ b/RichString.c
@@ -8,6 +8,7 @@ in the source distribution for its full text.
 #include "RichString.h"
 
 #include <ctype.h>
+#include &