Update includes based on IWYU

11 files changed, 29 insertions, 22 deletions

diff --git a/linux/CGroupUtils.c b/linux/CGroupUtils.c
index 62924542..9554d672 100644
--- a/linux/CGroupUtils.c
+++ b/linux/CGroupUtils.c
@@ -9,6 +9,12 @@ in the source distribution for its full text.
 
 #include "linux/CGroupUtils.h"
 
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "Macros.h"
 #include "XUtils.h"
 
 
diff --git a/linux/CGroupUtils.h b/linux/CGroupUtils.h
index 479919bf..972a15bb 100644
--- a/linux/CGroupUtils.h
+++ b/linux/CGroupUtils.h
@@ -7,9 +7,6 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include <stdbool.h>
-#include <stddef.h>
-
 
 char* CGroup_filterName(const char* cgroup);
 char* CGroup_filterContainer(const char* cgroup);
diff --git a/linux/HugePageMeter.c b/linux/HugePageMeter.c
index 65e3f2d7..3860ead6 100644
--- a/linux/HugePageMeter.c
+++ b/linux/HugePageMeter.c
@@ -12,9 +12,9 @@ in the source distribution for its full text.
 #include <stddef.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Macros.h"
 #include "Object.h"
-#include "ProcessTable.h"
 #include "RichString.h"
 #include "linux/LinuxMachine.h"
 
diff --git a/linux/LinuxMachine.c b/linux/LinuxMachine.c
index d8d5fd2b..ae2930d4 100644
--- a/linux/LinuxMachine.c
+++ b/linux/LinuxMachine.c
@@ -10,26 +10,28 @@ in the source distribution for its full text.
 #include "linux/LinuxMachine.h"
 
 #include <assert.h>
-#include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <inttypes.h>
+#include <limits.h>
 #include <math.h>
 #include <stdbool.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
-#include <sys/types.h>
 #include <time.h>
 
 #include "Compat.h"
+#include "CRT.h"
 #include "Macros.h"
+#include "ProcessTable.h"
+#include "Row.h"
+#include "Settings.h"
+#include "UsersTable.h"
 #include "XUtils.h"
-#include "linux/LinuxMachine.h"
+
 #include "linux/Platform.h" // needed for GNU/hurd to get PATH_MAX  // IWYU pragma: keep
 
 #ifdef HAVE_SENSORS_SENSORS_H
diff --git a/linux/LinuxMachine.h b/linux/LinuxMachine.h
index 764223c1..b21a9848 100644
--- a/linux/LinuxMachine.h
+++ b/linux/LinuxMachine.h
@@ -10,10 +10,8 @@ in the source distribution for its full text.
 #include "config.h" // IWYU pragma: keep
 
 #include <stdbool.h>
-#include <sys/types.h>
 
 #include "Machine.h"
-#include "UsersTable.h"
 #include "linux/ZramStats.h"
 #include "linux/ZswapStats.h"
 #include "zfs/ZfsArcStats.h"
diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c
index b6c90780..c2039796 100644
--- a/linux/LinuxProcess.c
+++ b/linux/LinuxProcess.c
@@ -10,7 +10,9 @@ in the source distribution for its full text.
 
 #include "linux/LinuxProcess.h"
 
+#include <assert.h>
 #include <math.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <syscall.h>
@@ -21,7 +23,9 @@ in the source distribution for its full text.
 #include "Process.h"
 #include "ProvideCurses.h"
 #include "RichString.h"
+#include "RowField.h"
 #include "Scheduling.h"
+#include "Settings.h"
 #include "XUtils.h"
 #include "linux/IOPriority.h"
 #include "linux/LinuxMachine.h"
diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
index 6419c04a..7c6e2d44 100644
--- a/linux/LinuxProcess.h
+++ b/linux/LinuxProcess.h
@@ -11,11 +11,12 @@ in the source distribution for its full text.
 #include "config.h" // IWYU pragma: keep
 
 #include <stdbool.h>
-#include <sys/types.h>
 
 #include "Machine.h"
 #include "Object.h"
 #include "Process.h"
+#include "Row.h"
+
 #include "linux/IOPriority.h"
 
 
diff --git a/linux/LinuxProcessTable.c b/linux/LinuxProcessTable.c
index aeda509e..039a64ec 100644
--- a/linux/LinuxProcessTable.c
+++ b/linux/LinuxProcessTable.c
@@ -12,21 +12,16 @@ in the source distribution for its full text.
 #include <assert.h>
 #include <ctype.h>
 #include <dirent.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <math.h>
 #include <stdbool.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
-#include <time.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #ifdef HAVE_DELAYACCT
 #include <linux/netlink.h>
@@ -41,12 +36,17 @@ in the source distribution for its full text.
 #endif
 
 #include "Compat.h"
-#include "CRT.h"
+#include "Hashtable.h"
+#include "Machine.h"
 #include "Macros.h"
 #include "Object.h"
 #include "Process.h"
+#include "Row.h"
+#include "RowField.h"
 #include "Scheduling.h"
 #include "Settings.h"
+#include "Table.h"
+#include "UsersTable.h"
 #include "XUtils.h"
 #include "linux/CGroupUtils.h"
 #include "linux/LinuxMachine.h"
diff --git a/linux/LinuxProcessTable.h b/linux/LinuxProcessTable.h
index 3fea2523..76d9a2d1 100644
--- a/linux/LinuxProcessTable.h
+++ b/linux/LinuxProcessTable.h
@@ -10,11 +10,8 @@ in the source distribution for its full text.
 #include "config.h" // IWYU pragma: keep
 
 #include <stdbool.h>
-#include <sys/types.h>
 
-#include "Hashtable.h"
 #include "ProcessTable.h"
-#include "UsersTable.h"
 
 
 typedef struct TtyDriver_ {
diff --git a/linux/Platform.c b/linux/Platform.c
index 84eb8b1a..8dc8bb59 100644
--- a/linux/Platform.c
+++ b/linux/Platform.c
@@ -10,7 +10,6 @@ in the source distribution for its full text.
 #include "linux/Platform.h"
 
 #include <assert.h>
-#include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -60,6 +59,7 @@ in the source distribution for its full text.
 #include "linux/SystemdMeter.h"
 #include "linux/ZramMeter.h"
 #include "linux/ZramStats.h"
+#include "linux/ZswapStats.h"
 #include "zfs/ZfsArcMeter.h"
 #include "zfs/ZfsArcStats.h"
 #include "zfs/ZfsCompressedArcMeter.h"
diff --git a/linux/Platform.h b/linux/Platform.h
index 5435f192..ccf14f28 100644
--- a/linux/Platform.h
+++ b/linux/Platform.h
@@ -23,9 +23,11 @@ in the source distribution for its full text.
 #include "Macros.h"
 #include "Meter.h"
 #include "NetworkIOMeter.h"
+#include "Panel.h"
 #include "Process.h"
 #include "ProcessLocksScreen.h"
 #include "RichString.h"
+#include "Settings.h"
 #include "SignalsPanel.h"
 #include "CommandLine.h"
 #include "generic/gettime.h"