diff --git a/Action.c b/Action.c
index 61cc1ef96..4049a952f 100644
--- a/Action.c
+++ b/Action.c
@@ -9,9 +9,11 @@ in the source distribution for its full text.
 
 #include "Action.h"
 
+#include <assert.h>
 #include <pwd.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "CRT.h"
 #include "CategoriesPanel.h"
@@ -27,13 +29,16 @@ in the source distribution for its full text.
 #include "MainPanel.h"
 #include "OpenFilesScreen.h"
 #include "Process.h"
-#include "ProcessTable.h"
 #include "ProcessLocksScreen.h"
 #include "ProvideCurses.h"
+#include "Row.h"
+#include "RowField.h"
 #include "Scheduling.h"
 #include "ScreenManager.h"
 #include "SignalsPanel.h"
+#include "Table.h"
 #include "TraceScreen.h"
+#include "UsersTable.h"
 #include "Vector.h"
 #include "XUtils.h"
 
diff --git a/Action.h b/Action.h
index d285e1b88..db9d8b525 100644
--- a/Action.h
+++ b/Action.h
@@ -18,7 +18,6 @@ in the source distribution for its full text.
 #include "Panel.h"
 #include "Process.h"
 #include "Settings.h"
-#include "UsersTable.h"
 
 
 typedef enum {
diff --git a/Affinity.c b/Affinity.c
index 546975d5d..fab239eb3 100644
--- a/Affinity.c
+++ b/Affinity.c
@@ -10,6 +10,7 @@ in the source distribution for its full text.
 
 #include "Affinity.h"
 
+#include <assert.h>
 #include <stdlib.h>
 
 #include "Process.h"
diff --git a/AvailableColumnsPanel.c b/AvailableColumnsPanel.c
index 03684ff04..545ef7d78 100644
--- a/AvailableColumnsPanel.c
+++ b/AvailableColumnsPanel.c
@@ -23,6 +23,7 @@ in the source distribution for its full text.
 #include "Platform.h"
 #include "Process.h"
 #include "ProvideCurses.h"
+#include "RowField.h"
 #include "XUtils.h"
 
 
diff --git a/AvailableColumnsPanel.h b/AvailableColumnsPanel.h
index 3d233be09..0d8709fe0 100644
--- a/AvailableColumnsPanel.h
+++ b/AvailableColumnsPanel.h
@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "Hashtable.h"
 #include "Panel.h"
-#include "Settings.h"
 
 
 typedef struct AvailableColumnsPanel_ {
diff --git a/AvailableMetersPanel.c b/AvailableMetersPanel.c
index f34af8fe1..9a1d367cc 100644
--- a/AvailableMetersPanel.c
+++ b/AvailableMetersPanel.c
@@ -25,6 +25,7 @@ in the source distribution for its full text.
 #include "Object.h"
 #include "Platform.h"
 #include "ProvideCurses.h"
+#include "Settings.h"
 #include "XUtils.h"
 
 
diff --git a/CPUMeter.c b/CPUMeter.c
index 782f4170f..afcddeb1a 100644
--- a/CPUMeter.c
+++ b/CPUMeter.c
@@ -9,14 +9,16 @@ in the source distribution for its full text.
 
 #include "CPUMeter.h"
 
+#include <stdbool.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Macros.h"
 #include "Object.h"
 #include "Platform.h"
-#include "ProcessTable.h"
 #include "RichString.h"
 #include "Settings.h"
 #include "XUtils.h"
diff --git a/CategoriesPanel.c b/CategoriesPanel.c
index d653dcbde..64a3f0624 100644
--- a/CategoriesPanel.c
+++ b/CategoriesPanel.c
@@ -13,7 +13,6 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "AvailableColumnsPanel.h"
 #include "AvailableMetersPanel.h"
 #include "ColorsPanel.h"
 #include "DisplayOptionsPanel.h"
@@ -28,6 +27,7 @@ in the source distribution for its full text.
 #include "ProvideCurses.h"
 #include "ScreensPanel.h"
 #include "ScreenTabsPanel.h"
+#include "Settings.h"
 #include "Vector.h"
 #include "XUtils.h"
 
diff --git a/ClockMeter.c b/ClockMeter.c
index 82c3968b3..38f0591fa 100644
--- a/ClockMeter.c
+++ b/ClockMeter.c
@@ -13,8 +13,8 @@ in the source distribution for its full text.
 #include <sys/time.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Object.h"
-#include "ProcessTable.h"
 
 
 static const int ClockMeter_attributes[] = {
diff --git a/ColorsPanel.c b/ColorsPanel.c
index c00981e0c..01032bc3b 100644
--- a/ColorsPanel.c
+++ b/ColorsPanel.c
@@ -13,7 +13,6 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "FunctionBar.h"
-#include "Macros.h"
 #include "Object.h"
 #include "OptionItem.h"
 #include "ProvideCurses.h"
diff --git a/ColumnsPanel.c b/ColumnsPanel.c
index 0517ea7d7..66625666d 100644
--- a/ColumnsPanel.c
+++ b/ColumnsPanel.c
@@ -21,6 +21,7 @@ in the source distribution for its full text.
 #include "Object.h"
 #include "Process.h"
 #include "ProvideCurses.h"
+#include "RowField.h"
 #include "XUtils.h"
 
 
diff --git a/ColumnsPanel.h b/ColumnsPanel.h
index 63f6f92b0..723369fd9 100644
--- a/ColumnsPanel.h
+++ b/ColumnsPanel.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include <stdbool.h>
 
+#include "Hashtable.h"
 #include "Panel.h"
 #include "Settings.h"
 
diff --git a/CommandLine.c b/CommandLine.c
index 230b721ca..09e67b853 100644
--- a/CommandLine.c
+++ b/CommandLine.c
@@ -29,15 +29,16 @@ in the source distribution for its full text.
 #include "Hashtable.h"
 #include "Header.h"
 #include "IncSet.h"
+#include "Machine.h"
 #include "MainPanel.h"
 #include "MetersPanel.h"
 #include "Panel.h"
 #include "Platform.h"
 #include "Process.h"
 #include "ProcessTable.h"
-#include "ProvideCurses.h"
 #include "ScreenManager.h"
 #include "Settings.h"
+#include "Table.h"
 #include "UsersTable.h"
 #include "XUtils.h"
 
diff --git a/DateMeter.c b/DateMeter.c
index 224de306c..0bdb30a87 100644
--- a/DateMeter.c
+++ b/DateMeter.c
@@ -13,8 +13,8 @@ in the source distribution for its full text.
 #include <sys/time.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Object.h"
-#include "ProcessTable.h"
 
 
 static const int DateMeter_attributes[] = {
diff --git a/DateTimeMeter.c b/DateTimeMeter.c
index ebe722882..dcd85ea6c 100644
--- a/DateTimeMeter.c
+++ b/DateTimeMeter.c
@@ -13,8 +13,8 @@ in the source distribution for its full text.
 #include <sys/time.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Object.h"
-#include "ProcessTable.h"
 
 
 static const int DateTimeMeter_attributes[] = {
diff --git a/DiskIOMeter.c b/DiskIOMeter.c
index 545ebd836..8d658de84 100644
--- a/DiskIOMeter.c
+++ b/DiskIOMeter.c
@@ -10,15 +10,14 @@ in the source distribution for its full text.
 #include "DiskIOMeter.h"
 
 #include <stdbool.h>
-#include <stdio.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Macros.h"
-#include "Meter.h"
 #include "Object.h"
 #include "Platform.h"
-#include "ProcessTable.h"
 #include "RichString.h"
+#include "Row.h"
 #include "XUtils.h"
 
 
diff --git a/DiskIOMeter.h b/DiskIOMeter.h
index 3b03e321c..5ac9c4849 100644
--- a/DiskIOMeter.h
+++ b/DiskIOMeter.h
@@ -7,6 +7,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include <stdint.h>
+
 #include "Meter.h"
 
 
diff --git a/DisplayOptionsPanel.c b/DisplayOptionsPanel.c
index fb6fe9c4c..66793e164 100644
--- a/DisplayOptionsPanel.c
+++ b/DisplayOptionsPanel.c
@@ -11,6 +11,7 @@ in the source distribution for its full text.
 
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "CRT.h"
 #include "FunctionBar.h"
diff --git a/DynamicColumn.c b/DynamicColumn.c
index 7c0ed3ad1..5f021740f 100644
--- a/DynamicColumn.c
+++ b/DynamicColumn.c
@@ -12,6 +12,7 @@ in the source distribution for its full text.
 #include "DynamicColumn.h"
 
 #include <stddef.h>
+#include <stdlib.h>
 
 #include "Platform.h"
 #include "RichString.h"
diff --git a/DynamicMeter.c b/DynamicMeter.c
index 96b169d5d..15d853bd3 100644
--- a/DynamicMeter.c
+++ b/DynamicMeter.c
@@ -15,10 +15,11 @@ in the source distribution for its full text.
 #include <string.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Object.h"
 #include "Platform.h"
-#include "ProcessTable.h"
 #include "RichString.h"
+#include "Settings.h"
 #include "XUtils.h"
 
 
diff --git a/DynamicScreen.c b/DynamicScreen.c
index 6ab52541a..9e3d5e496 100644
--- a/DynamicScreen.c
+++ b/DynamicScreen.c
@@ -12,6 +12,7 @@ in the source distribution for its full text.
 
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdlib.h>
 
 #include "Hashtable.h"
 #include "Platform.h"
diff --git a/DynamicScreen.h b/DynamicScreen.h
index 76b3d428b..fb08ebc96 100644
--- a/DynamicScreen.h
+++ b/DynamicScreen.h
@@ -11,7 +11,6 @@ in the source distribution for its full text.
 
 #include "Hashtable.h"
 #include "Panel.h"
-#include "Settings.h"
 
 
 typedef struct DynamicScreen_ {
diff --git a/FileDescriptorMeter.c b/FileDescriptorMeter.c
index 4295f21a1..cf1ec9331 100644
--- a/FileDescriptorMeter.c
+++ b/FileDescriptorMeter.c
@@ -10,8 +10,6 @@ in the source distribution for its full text.
 #include "FileDescriptorMeter.h"
 
 #include <math.h>
-#include <stdbool.h>
-#include <string.h>
 
 #include "CRT.h"
 #include "Macros.h"
diff --git a/Header.c b/Header.c
index bb47f0c59..4fee26b41 100644
--- a/Header.c
+++ b/Header.c
@@ -24,6 +24,7 @@ in the source distribution for its full text.
 #include "Object.h"
 #include "Platform.h"
 #include "ProvideCurses.h"
+#include "Settings.h"
 #include "XUtils.h"
 
 
diff --git a/Header.h b/Header.h
index 82e385308..2cc78ab72 100644
--- a/Header.h
+++ b/Header.h
@@ -7,6 +7,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include <stddef.h>
+
 #include "HeaderLayout.h"
 #include "Machine.h"
 #include "Meter.h"
diff --git a/ListItem.h b/ListItem.h
index b2c3e061e..5efe8743b 100644
--- a/ListItem.h
+++ b/ListItem.h
@@ -10,6 +10,7 @@ in the source distribution for its full text.
 #include <stdbool.h>
 
 #include "Object.h"
+#include "RichString.h"
 
 
 typedef struct ListItem_ {
diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c
index 0a8e7f192..30c58bb96 100644
--- a/LoadAverageMeter.c
+++ b/LoadAverageMeter.c
@@ -10,9 +10,9 @@ in the source distribution for its full text.
 #include "LoadAverageMeter.h"
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Object.h"
 #include "Platform.h"
-#include "ProcessTable.h"
 #include "RichString.h"
 #include "XUtils.h"
 
diff --git a/Machine.c b/Machine.c
index 6ea086204..44aa27c81 100644
--- a/Machine.c
+++ b/Machine.c
@@ -11,11 +11,9 @@ in the source distribution for its full text.
 #include "Machine.h"
 
 #include <stdlib.h>
-#include <string.h>
+#include <unistd.h>
 
-#include "CRT.h"
-#include "Hashtable.h"
-#include "Macros.h"
+#include "Object.h"
 #include "Platform.h"
 #include "Row.h"
 #include "XUtils.h"
diff --git a/Machine.h b/Machine.h
index 6c60050db..f2dabddcd 100644
--- a/Machine.h
+++ b/Machine.h
@@ -16,12 +16,10 @@ in the source distribution for its full text.
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include "Hashtable.h"
 #include "Panel.h"
 #include "Settings.h"
 #include "Table.h"
 #include "UsersTable.h"
-#include "Vector.h"
 
 #ifdef HAVE_LIBHWLOC
 #include <hwloc.h>
diff --git a/Macros.h b/Macros.h
index db411e93d..01cc77740 100644
--- a/Macros.h
+++ b/Macros.h
@@ -10,6 +10,8 @@ in the source distribution for its full text.
 #include <assert.h> // IWYU pragma: keep
 #include <math.h>
 #include <stdbool.h>
+#include <string.h> // IWYU pragma: keep
+
 
 #ifndef MINIMUM
 #define MINIMUM(a, b)                  ((a) < (b) ? (a) : (b))
diff --git a/MainPanel.c b/MainPanel.c
index 05093f123..83490236e 100644
--- a/MainPanel.c
+++ b/MainPanel.c
@@ -12,12 +12,15 @@ in the source distribution for its full text.
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <sys/types.h>
 
 #include "CRT.h"
 #include "FunctionBar.h"
+#include "Machine.h"
 #include "Platform.h"
 #include "ProvideCurses.h"
 #include "Row.h"
+#include "RowField.h"
 #include "Settings.h"
 #include "Table.h"
 #include "XUtils.h"
diff --git a/MainPanel.h b/MainPanel.h
index 19229d59f..5f5a5ca4e 100644
--- a/MainPanel.h
+++ b/MainPanel.h
@@ -11,9 +11,9 @@ in the source distribution for its full text.
 #include "config.h" // IWYU pragma: keep
 
 #include <stdbool.h>
-#include <sys/types.h>
 
 #include "Action.h"
+#include "FunctionBar.h"
 #include "IncSet.h"
 #include "Object.h"
 #include "Panel.h"
diff --git a/MemoryMeter.c b/MemoryMeter.c
index 6483e95fa..9e0d7d5cf 100644
--- a/MemoryMeter.c
+++ b/MemoryMeter.c
@@ -7,6 +7,7 @@ in the source distribution for its full text.
 
 #include "MemoryMeter.h"
 
+#include <assert.h>
 #include <math.h>
 #include <stddef.h>
 
diff --git a/MemorySwapMeter.c b/MemorySwapMeter.c
index 0d89ced60..82eddee21 100644
--- a/MemorySwapMeter.c
+++ b/MemorySwapMeter.c
@@ -10,6 +10,7 @@ in the source distribution for its full text.
 #include "MemorySwapMeter.h"
 
 #include <assert.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
 
diff --git a/Meter.c b/Meter.c
index a52082acc..86f88856f 100644
--- a/Meter.c
+++ b/Meter.c
@@ -10,9 +10,7 @@ in the source distribution for its full text.
 #include "Meter.h"
 
 #include <assert.h>
-#include <limits.h>
 #include <math.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -21,6 +19,7 @@ in the source distribution for its full text.
 #include "Object.h"
 #include "ProvideCurses.h"
 #include "RichString.h"
+#include "Row.h"
 #include "Settings.h"
 #include "XUtils.h"
 
diff --git a/NetworkIOMeter.c b/NetworkIOMeter.c
index 1ab3a37ea..6bc2d0827 100644
--- a/NetworkIOMeter.c
+++ b/NetworkIOMeter.c
@@ -10,16 +10,15 @@ in the source distribution for its full text.
 #include "NetworkIOMeter.h"
 
 #include <stdbool.h>
-#include <stdint.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Macros.h"
 #include "Meter.h"
 #include "Object.h"
 #include "Platform.h"
-#include "Process.h"
-#include "ProcessTable.h"
 #include "RichString.h"
+#include "Row.h"
 #include "XUtils.h"
 
 
diff --git a/NetworkIOMeter.h b/NetworkIOMeter.h
index d112a7451..355b815b2 100644
--- a/NetworkIOMeter.h
+++ b/NetworkIOMeter.h
@@ -7,6 +7,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include <stdint.h>
+
 #include "Meter.h"
 
 
diff --git a/OpenFilesScreen.c b/OpenFilesScreen.c
index bb1c70c41..295402475 100644
--- a/OpenFilesScreen.c
+++ b/OpenFilesScreen.c
@@ -12,9 +12,9 @@ in the source distribution for its full text.
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/Process.c b/Process.c
index ea432be03..a36ab6c77 100644
--- a/Process.c
+++ b/Process.c
@@ -11,7 +11,6 @@ in the source distribution for its full text.
 #include "Process.h"
 
 #include <assert.h>
-#include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include <stdbool.h>
@@ -19,17 +18,18 @@ in the source distribution for its full text.
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <unistd.h>
 #include <sys/resource.h>
 
 #include "CRT.h"
+#include "Hashtable.h"
+#include "Machine.h"
 #include "Macros.h"
-#include "Platform.h"
 #include "ProcessTable.h"
 #include "DynamicColumn.h"
 #include "RichString.h"
 #include "Scheduling.h"
 #include "Settings.h"
+#include "Table.h"
 #include "XUtils.h"
 
 #if defined(MAJOR_IN_MKDEV)
diff --git a/Process.h b/Process.h
index 0c3562ac1..bcafc81a9 100644
--- a/Process.h
+++ b/Process.h
@@ -15,6 +15,7 @@ in the source distribution for its full text.
 #include "Object.h"
 #include "RichString.h"
 #include "Row.h"
+#include "RowField.h"
 
 
 #define PROCESS_FLAG_IO              0x00000001
diff --git a/ProcessTable.c b/ProcessTable.c
index 39e3eb876..058394559 100644
--- a/ProcessTable.c
+++ b/ProcessTable.c
@@ -9,15 +9,11 @@ in the source distribution for its full text.
 
 #include <assert.h>
 #include <stdlib.h>
-#include <string.h>
 
-#include "CRT.h"
-#include "DynamicColumn.h"
 #include "Hashtable.h"
-#include "Macros.h"
-#include "Platform.h"
+#include "Row.h"
+#include "Settings.h"
 #include "Vector.h"
-#include "XUtils.h"
 
 
 void ProcessTable_init(ProcessTable* this, const ObjectClass* klass, Machine* host, Hashtable* pidMatchList) {
diff --git a/ProcessTable.h b/ProcessTable.h
index ceaabc79b..3b35c1038 100644
--- a/ProcessTable.h
+++ b/ProcessTable.h
@@ -9,18 +9,13 @@ in the source distribution for its full text.
 
 #include "config.h" // IWYU pragma: keep
 
-#include <limits.h>
 #include <stdbool.h>
-#include <stdint.h>
-#include <sys/time.h>
 #include <sys/types.h>
 
 #include "Hashtable.h"
 #include "Machine.h"
 #include "Object.h"
-#include "Panel.h"
 #include "Process.h"
-#include "RichString.h"
 #include "Table.h"
 
 
diff --git a/Row.c b/Row.c
index f43c82036..e268837de 100644
--- a/Row.c
+++ b/Row.c
@@ -10,21 +10,22 @@ in the source distribution for its full text.
 
 #include "Row.h"
 
+#include <assert.h>
+#include <limits.h>
 #include <math.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
-#include <unistd.h>
 
 #include "CRT.h"
 #include "DynamicColumn.h"
+#include "Hashtable.h"
 #include "Machine.h"
 #include "Macros.h"
+#include "Process.h"
 #include "RichString.h"
 #include "Settings.h"
-#include "Table.h"
 #include "XUtils.h"
 
 
diff --git a/Scheduling.c b/Scheduling.c
index 425240733..d5c4b8a66 100644
--- a/Scheduling.c
+++ b/Scheduling.c
@@ -8,11 +8,11 @@ in the source distribution for its full text.
 #include "config.h" // IWYU pragma: keep
 
 #include "Scheduling.h"
-#include "EnvScreen.h"
 
 #ifdef SCHEDULER_SUPPORT
 
-#include <errno.h>
+#include <assert.h>
+#include <stddef.h>
 
 #include "FunctionBar.h"
 #include "ListItem.h"
diff --git a/Scheduling.h b/Scheduling.h
index e5952b007..4e4a34550 100644
--- a/Scheduling.h
+++ b/Scheduling.h
@@ -12,8 +12,10 @@ in the source distribution for its full text.
 #include <sched.h>
 #include <stdbool.h>
 
+#include "Object.h"
 #include "Panel.h"
 #include "Process.h"
+#include "Row.h"
 
 
 #if defined(HAVE_SCHED_SETSCHEDULER) && defined(HAVE_SCHED_GETSCHEDULER)
diff --git a/ScreenManager.c b/ScreenManager.c
index bfecd2c79..e7e82e1df 100644
--- a/ScreenManager.c
+++ b/ScreenManager.c
@@ -12,6 +12,7 @@ in the source distribution for its full text.
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/time.h>
 
 #include "CRT.h"
@@ -20,8 +21,10 @@ in the source distribution for its full text.
 #include "Macros.h"
 #include "Object.h"
 #include "Platform.h"
-#include "ProcessTable.h"
+#include "Process.h"
 #include "ProvideCurses.h"
+#include "Settings.h"
+#include "Table.h"
 #include "XUtils.h"
 
 
diff --git a/ScreenTabsPanel.c b/ScreenTabsPanel.c
index fdb84248a..e48e5fb8b 100644
--- a/ScreenTabsPanel.c
+++ b/ScreenTabsPanel.c
@@ -9,13 +9,16 @@ in the source distribution for its full text.
 
 #include "ScreenTabsPanel.h"
 
+#include <assert.h>
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "CRT.h"
 #include "FunctionBar.h"
 #include "Hashtable.h"
+#include "Macros.h"
 #include "ProvideCurses.h"
 #include "Settings.h"
 #include "XUtils.h"
diff --git a/ScreenTabsPanel.h b/ScreenTabsPanel.h
index 3b89ffc2d..fe1a313c6 100644
--- a/ScreenTabsPanel.h
+++ b/ScreenTabsPanel.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "DynamicScreen.h"
 #include "ListItem.h"
+#include "Object.h"
 #include "Panel.h"
 #include "ScreensPanel.h"
 #include "ScreenManager.h"
diff --git a/ScreensPanel.c b/ScreensPanel.c
index bf08f2e69..4138066b5 100644
--- a/ScreensPanel.c
+++ b/ScreensPanel.c
@@ -10,8 +10,9 @@ in the source distribution for its full text.
 
 #include "ScreensPanel.h"
 
-#include <stdlib.h>
+#include <assert.h>
 #include <ctype.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "AvailableColumnsPanel.h"
diff --git a/Settings.c b/Settings.c
index 4e0aa21dd..a7787d309 100644
--- a/Settings.c
+++ b/Settings.c
@@ -25,6 +25,8 @@ in the source distribution for its full text.
 #include "Macros.h"
 #include "Meter.h"
 #include "Platform.h"
+#include "Process.h"
+#include "Table.h"
 #include "XUtils.h"
 
 
diff --git a/Settings.h b/Settings.h
index 0c202f8a4..d3ee57a28 100644
--- a/Settings.h
+++ b/Settings.h
@@ -10,11 +10,13 @@ in the source distribution for its full text.
 #include "config.h" // IWYU pragma: keep
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 
 #include "Hashtable.h"
 #include "HeaderLayout.h"
 #include "Row.h"
+#include "RowField.h"
 
 
 #define DEFAULT_DELAY 15
diff --git a/Table.c b/Table.c
index c31e82548..17750d56f 100644
--- a/Table.c
+++ b/Table.c
@@ -9,17 +9,16 @@ in the source distribution for its full text.
 #include "Table.h"
 
 #include <assert.h>
+#include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "CRT.h"
-#include "DynamicColumn.h"
 #include "Hashtable.h"
 #include "Machine.h"
 #include "Macros.h"
-#include "Platform.h"
+#include "Panel.h"
+#include "RowField.h"
 #include "Vector.h"
-#include "XUtils.h"
 
 
 Table* Table_init(Table* this, const ObjectClass* klass, Machine* host) {
diff --git a/Table.h b/Table.h
index d16e47daa..aec66c49e 100644
--- a/Table.h
+++ b/Table.h
@@ -10,11 +10,7 @@ in the source distribution for its full text.
 
 #include "config.h" // IWYU pragma: keep
 
-#include <limits.h>
 #include <stdbool.h>
-#include <stdint.h>
-#include <sys/time.h>
-#include <sys/types.h>
 
 #include "Hashtable.h"
 #include "Object.h"
diff --git a/TasksMeter.c b/TasksMeter.c
index 04b1f9383..aa41e631e 100644
--- a/TasksMeter.c
+++ b/TasksMeter.c
@@ -10,6 +10,7 @@ in the source distribution for its full text.
 #include "TasksMeter.h"
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Macros.h"
 #include "Object.h"
 #include "ProcessTable.h"
diff --git a/XUtils.h b/XUtils.h
index 1babb86e6..68b948361 100644
--- a/XUtils.h
+++ b/XUtils.h
@@ -15,6 +15,7 @@ in the source distribution for its full text.
 #endif
 
 #include <stdbool.h>
+#include <stddef.h> // IWYU pragma: keep
 #include <stdio.h>
 #include <stdlib.h> // IWYU pragma: keep
 #include <string.h> // IWYU pragma: keep
diff --git a/linux/CGroupUtils.c b/linux/CGroupUtils.c
index 629245429..9554d672e 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 479919bf6..972a15bb5 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 65e3f2d7f..3860ead6f 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 d8d5fd2bc..ae2930d40 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 764223c16..b21a98488 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 b6c907807..c20397964 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 6419c04ab..7c6e2d447 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 aeda509e5..039a64ec3 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 3fea2523d..76d9a2d17 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 84eb8b1a0..8dc8bb595 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 5435f1924..ccf14f28e 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"
diff --git a/pcp/InDomTable.c b/pcp/InDomTable.c
index 68563fb9d..2f9a50082 100644
--- a/pcp/InDomTable.c
+++ b/pcp/InDomTable.c
@@ -8,7 +8,7 @@ in the source distribution for its full text.
 
 #include "config.h" // IWYU pragma: keep
 
-#include "InDomTable.h"
+#include "pcp/InDomTable.h"
 
 #include <assert.h>
 #include <stdlib.h>