diff --git a/Header.h b/Header.h
index 6d13fc47..7f6943c1 100644
--- a/Header.h
+++ b/Header.h
@@ -12,6 +12,7 @@ in the source distribution for its full text.
 #include "Settings.h"
 #include "Vector.h"
 
+
 typedef struct Header_ {
    Vector** columns;
    Settings* settings;
diff --git a/darwin/DarwinProcess.c b/darwin/DarwinProcess.c
index 810b1fa0..9287641e 100644
--- a/darwin/DarwinProcess.c
+++ b/darwin/DarwinProcess.c
@@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "DarwinProcess.h"
+#include "darwin/DarwinProcess.h"
 
 #include <libproc.h>
 #include <stdio.h>
@@ -14,8 +14,8 @@ in the source distribution for its full text.
 #include <mach/mach.h>
 
 #include "CRT.h"
-#include "Platform.h"
 #include "Process.h"
+#include "darwin/Platform.h"
 
 
 const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
diff --git a/darwin/DarwinProcess.h b/darwin/DarwinProcess.h
index f87dd182..3fbcc792 100644
--- a/darwin/DarwinProcess.h
+++ b/darwin/DarwinProcess.h
@@ -9,9 +9,8 @@ in the source distribution for its full text.
 
 #include <sys/sysctl.h>
 
-#include "DarwinProcessList.h"
 #include "Settings.h"
-
+#include "darwin/DarwinProcessList.h"
 
 typedef struct DarwinProcess_ {
    Process super;
diff --git a/darwin/DarwinProcessList.c b/darwin/DarwinProcessList.c
index 27601f02..b50c5b8c 100644
--- a/darwin/DarwinProcessList.c
+++ b/darwin/DarwinProcessList.c
@@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "DarwinProcessList.h"
+#include "darwin/DarwinProcessList.h"
 
 #include <errno.h>
 #include <libproc.h>
@@ -19,9 +19,9 @@ in the source distribution for its full text.
 #include <sys/sysctl.h>
 
 #include "CRT.h"
-#include "DarwinProcess.h"
-#include "Platform.h"
 #include "ProcessList.h"
+#include "darwin/DarwinProcess.h"
+#include "darwin/Platform.h"
 #include "generic/openzfs_sysctl.h"
 #include "zfs/ZfsArcStats.h"
 
diff --git a/darwin/Platform.c b/darwin/Platform.c
index ca8df611..a983df9b 100644
--- a/darwin/Platform.c
+++ b/darwin/Platform.c
@@ -8,7 +8,7 @@ in the source distribution for its full text.
 
 #include "config.h" // IWYU pragma: keep
 
-#include "Platform.h"
+#include "darwin/Platform.h"
 
 #include <errno.h>
 #include <math.h>
@@ -22,7 +22,6 @@ in the source distribution for its full text.
 #include "ClockMeter.h"
 #include "CPUMeter.h"
 #include "CRT.h"
-#include "DarwinProcessList.h"
 #include "DateMeter.h"
 #include "DateTimeMeter.h"
 #include "HostnameMeter.h"
@@ -34,6 +33,7 @@ in the source distribution for its full text.
 #include "SysArchMeter.h"
 #include "TasksMeter.h"
 #include "UptimeMeter.h"
+#include "darwin/DarwinProcessList.h"
 #include "zfs/ZfsArcMeter.h"
 #include "zfs/ZfsCompressedArcMeter.h"
 
diff --git a/darwin/Platform.h b/darwin/Platform.h
index 902d27ef..694fd7dc 100644
--- a/darwin/Platform.h
+++ b/darwin/Platform.h
@@ -14,11 +14,11 @@ in the source distribution for its full text.
 #include "Action.h"
 #include "BatteryMeter.h"
 #include "CPUMeter.h"
-#include "DarwinProcess.h"
 #include "DiskIOMeter.h"
 #include "NetworkIOMeter.h"
 #include "ProcessLocksScreen.h"
 #include "SignalsPanel.h"
+#include "darwin/DarwinProcess.h"
 #include "generic/gettime.h"
 #include "generic/hostname.h"
 #include "generic/uname.h"
diff --git a/dragonflybsd/DragonFlyBSDProcess.c b/dragonflybsd/DragonFlyBSDProcess.c
index 9b30a334..7b33605a 100644
--- a/dragonflybsd/DragonFlyBSDProcess.c
+++ b/dragonflybsd/DragonFlyBSDProcess.c
@@ -6,17 +6,17 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "Process.h"
-#include "ProcessList.h"
-#include "DragonFlyBSDProcess.h"
-#include "Platform.h"
-#include "CRT.h"
+#include "dragonflybsd/DragonFlyBSDProcess.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/syscall.h>
 
+#include "Process.h"
+#include "ProcessList.h"
+#include "dragonflybsd/Platform.h"
+#include "CRT.h"
 
 const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
    [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
diff --git a/dragonflybsd/DragonFlyBSDProcessList.c b/dragonflybsd/DragonFlyBSDProcessList.c
index 935444e3..71ba594e 100644
--- a/dragonflybsd/DragonFlyBSDProcessList.c
+++ b/dragonflybsd/DragonFlyBSDProcessList.c
@@ -6,9 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "ProcessList.h"
-#include "DragonFlyBSDProcessList.h"
-#include "DragonFlyBSDProcess.h"
+#include "dragonflybsd/DragonFlyBSDProcessList.h"
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -22,6 +20,8 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "Macros.h"
+#include "ProcessList.h"
+#include "dragonflybsd/DragonFlyBSDProcess.h"
 
 
 static int MIB_hw_physmem[2];
diff --git a/dragonflybsd/DragonFlyBSDProcessList.h b/dragonflybsd/DragonFlyBSDProcessList.h
index 80fb9f38..d596054c 100644
--- a/dragonflybsd/DragonFlyBSDProcessList.h
+++ b/dragonflybsd/DragonFlyBSDProcessList.h
@@ -15,7 +15,8 @@ in the source distribution for its full text.
 #include <sys/uio.h>
 #include <sys/resource.h>
 #include "Hashtable.h"
-#include "DragonFlyBSDProcess.h"
+
+#include "dragonflybsd/DragonFlyBSDProcess.h"
 
 
 typedef struct CPUData_ {
diff --git a/dragonflybsd/Platform.c b/dragonflybsd/Platform.c
index 14fbbf0f..f81078d7 100644
--- a/dragonflybsd/Platform.c
+++ b/dragonflybsd/Platform.c
@@ -6,30 +6,31 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "Platform.h"
-#include "Macros.h"
-#include "Meter.h"
-#include "CPUMeter.h"
-#include "MemoryMeter.h"
-#include "SwapMeter.h"
-#include "TasksMeter.h"
-#include "LoadAverageMeter.h"
-#include "UptimeMeter.h"
+#include "dragonflybsd/Platform.h"
+
+#include <math.h>
+#include <time.h>
+#include <sys/resource.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <vm/vm_param.h>
+
 #include "ClockMeter.h"
+#include "CPUMeter.h"
 #include "DateMeter.h"
 #include "DateTimeMeter.h"
 #include "HostnameMeter.h"
+#include "LoadAverageMeter.h"
+#include "Macros.h"
+#include "MemoryMeter.h"
+#include "Meter.h"
+#include "SwapMeter.h"
 #include "SysArchMeter.h"
-#include "DragonFlyBSDProcess.h"
-#include "DragonFlyBSDProcessList.h"
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <vm/vm_param.h>
-#include <time.h>
-#include <math.h>
+#include "TasksMeter.h"
+#include "UptimeMeter.h"
+#include "dragonflybsd/DragonFlyBSDProcess.h"
+#include "dragonflybsd/DragonFlyBSDProcessList.h"
 
 
 const ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_VIRT, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c
index 72e0b10f..3a016562 100644
--- a/freebsd/FreeBSDProcess.c
+++ b/freebsd/FreeBSDProcess.c
@@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "FreeBSDProcess.h"
+#include "freebsd/FreeBSDProcess.h"
 
 #include <stdlib.h>
 
diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c
index 84d0946d..92fdd3dd 100644
--- a/freebsd/FreeBSDProcessList.c
+++ b/freebsd/FreeBSDProcessList.c
@@ -7,7 +7,7 @@ in the source distribution for its full text.
 
 #include "config.h" // IWYU pragma: keep
 
-#include "FreeBSDProcessList.h"
+#include "freebsd/FreeBSDProcessList.h"
 
 #include <assert.h>
 #include <limits.h>
diff --git a/freebsd/Platform.c b/freebsd/Platform.c
index 1ca080d0..61a6ae37 100644
--- a/freebsd/Platform.c
+++ b/freebsd/Platform.c
@@ -7,7 +7,7 @@ in the source distribution for its full text.
 
 #include "config.h" // IWYU pragma: keep
 
-#include "Platform.h"
+#include "freebsd/Platform.h"
 
 #include <devstat.h>
 #include <math.h>
@@ -31,8 +31,6 @@ in the source distribution for its full text.
 #include "DateMeter.h"
 #include "DateTimeMeter.h"
 #include "DiskIOMeter.h"
-#include "FreeBSDProcess.h"
-#include "FreeBSDProcessList.h"
 #include "HostnameMeter.h"
 #include "LoadAverageMeter.h"
 #include "Macros.h"
@@ -46,6 +44,8 @@ in the source distribution for its full text.
 #include "TasksMeter.h"
 #include "UptimeMeter.h"
 #include "XUtils.h"
+#include "freebsd/FreeBSDProcess.h"
+#include "freebsd/FreeBSDProcessList.h"
 #include "zfs/ZfsArcMeter.h"
 #include "zfs/ZfsCompressedArcMeter.h"
 
diff --git a/generic/gettime.c b/generic/gettime.c
index ef7d2290..477247d8 100644
--- a/generic/gettime.c
+++ b/generic/gettime.c
@@ -6,11 +6,11 @@ in the source distribution for its full text.
 */
 #include "config.h"  // IWYU pragma: keep
 
+#include "generic/gettime.h"
+
 #include <string.h>
 #include <time.h>
 
-#include "generic/gettime.h"
-
 
 void Generic_gettime_realtime(struct timeval* tvp, uint64_t* msec) {
 
diff --git a/generic/uname.c b/generic/uname.c
index b77bc8a9..9263d828 100644
--- a/generic/uname.c
+++ b/generic/uname.c
@@ -6,13 +6,14 @@ in the source distribution for its full text.
 */
 #include "config.h"  // IWYU pragma: keep
 
+#include "generic/uname.h"
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "Macros.h"
 #include "XUtils.h"
-#include "generic/uname.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #include <sys/utsname.h>
diff --git a/linux/HugePageMeter.c b/linux/HugePageMeter.c
index 7f79e125..cb7d9f4d 100644
--- a/linux/HugePageMeter.c
+++ b/linux/HugePageMeter.c
@@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "HugePageMeter.h"
+#include "linux/HugePageMeter.h"
 
 #include <assert.h>
 #include <limits.h>
@@ -13,11 +13,11 @@ in the source distribution for its full text.
 #include <stddef.h>
 
 #include "CRT.h"
-#include "LinuxProcessList.h"
 #include "Macros.h"
 #include "Object.h"
 #include "ProcessList.h"
 #include "RichString.h"
+#include "linux/LinuxProcessList.h"
 
 
 static const char *HugePageMeter_active_labels[4] = { NULL, NULL, NULL, NULL };
diff --git a/linux/IOPriorityPanel.c b/linux/IOPriorityPanel.c
index 25d2199d..1bcbf4ba 100644
--- a/linux/IOPriorityPanel.c
+++ b/linux/IOPriorityPanel.c
@@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "IOPriorityPanel.h"
+#include "linux/IOPriorityPanel.h"
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -14,6 +14,7 @@ in the source distribution for its full text.
 #include "ListItem.h"
 #include "Object.h"
 #include "XUtils.h"
+#include "IOPriority.h"
 
 
 Panel* IOPriorityPanel_new(IOPriority currPrio) {
diff --git a/linux/IOPriorityPanel.h b/linux/IOPriorityPanel.h
index 2ac4b316..3aa76101 100644
--- a/linux/IOPriorityPanel.h
+++ b/linux/IOPriorityPanel.h
@@ -8,7 +8,7 @@ in the source distribution for its full text.
 */
 
 #include "Panel.h"
-#include "IOPriority.h"
+#include "linux/IOPriority.h"
 
 Panel* IOPriorityPanel_new(IOPriority currPrio);
 
diff --git a/linux/LibSensors.c b/linux/LibSensors.c
index aa40eae2..5780c74f 100644
--- a/linux/LibSensors.c
+++ b/linux/LibSensors.c
@@ -1,4 +1,4 @@
-#include "LibSensors.h"
+#include "linux/LibSensors.h"
 
 #ifdef HAVE_SENSORS_SENSORS_H
 
diff --git a/linux/LibSensors.h b/linux/LibSensors.h
index cceeedbf..f3410175 100644
--- a/linux/LibSensors.h
+++ b/linux/LibSensors.h
@@ -5,7 +5,7 @@
 
 #include <stdio.h>
 
-#include "LinuxProcessList.h"
+#include "linux/LinuxProcessList.h"
 
 
 int LibSensors_init(FILE* input);
diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c
index 7ccdeca6..1c8d2cfc 100644
--- a/linux/LinuxProcess.c
+++ b/linux/LinuxProcess.c
@@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "LinuxProcess.h"
+#include "linux/LinuxProcess.h"
 
 #include <assert.h>
 #include <math.h>
@@ -22,6 +22,7 @@ in the source distribution for its full text.
 #include "ProvideCurses.h"
 #include "RichString.h"
 #include "XUtils.h"
+#include "linux/IOPriority.h"
 
 
 /* semi-global */
diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
index 3813aa18..80a20864 100644
--- a/linux/LinuxProcess.h
+++ b/linux/LinuxProcess.h
@@ -12,7 +12,7 @@ in the source distribution for its full text.
 
 #include <stdbool.h>
 
-#include "IOPriority.h"
+#include "linux/IOPriority.h"
 #include "Object.h"
 #include "Process.h"
 #include "Settings.h"
diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
index 62bd792e..51999d1a 100644
--- a/linux/LinuxProcessList.c
+++ b/linux/LinuxProcessList.c
@@ -7,7 +7,7 @@ in the source distribution for its full text.
 
 #include "config.h" // IWYU pragma: keep
 
-#include "LinuxProcessList.h"
+#include "linux/LinuxProcessList.h"
 
 #include <assert.h>
 #include <dirent.h>
@@ -41,13 +41,13 @@ in the source distribution for its full text.
 
 #include "Compat.h"
 #include "CRT.h"
-#include "LinuxProcess.h"
 #include "Macros.h"
 #include "Object.h"
-#include "Platform.h" // needed for GNU/hurd to get PATH_MAX
 #include "Process.h"
 #include "Settings.h"
 #include "XUtils.h"
+#include "linux/LinuxProcess.h"
+#include "linux/Platform.h" // needed for GNU/hurd to get PATH_MAX
 
 #if defined(MAJOR_IN_MKDEV)
 #include <sys/mkdev.h>
diff --git a/linux/Platform.c b/linux/Platform.c
index 0be82fc3..a888dace 100644
--- a/linux/Platform.c
+++ b/linux/Platform.c
@@ -7,7 +7,7 @@ in the source distribution for its full text.
 
 #include "config.h"
 
-#include "Platform.h"
+#include "linux/Platform.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -31,10 +31,6 @@ in the source distribution for its full text.
 #include "DiskIOMeter.h"
 #include "HostnameMeter.h"
 #include "HugePageMeter.h"
-#include "IOPriority.h"
-#include "IOPriorityPanel.h"
-#include "LinuxProcess.h"
-#include "LinuxProcessList.h"
 #include "LoadAverageMeter.h"
 #include "Macros.h"
 #include "MainPanel.h"
@@ -46,17 +42,20 @@ in the source distribution for its full text.
 #include "PressureStallMeter.h"
 #include "ProcessList.h"
 #include "ProvideCurses.h"
-#include "SELinuxMeter.h"
+#include "linux/SELinuxMeter.h"
 #include "Settings.h"
 #include "SwapMeter.h"
 #include "SysArchMeter.h"
-#include "SystemdMeter.h"
 #include "TasksMeter.h"
 #include "UptimeMeter.h"
 #include "XUtils.h"
-#include "ZramMeter.h"
-#include "ZramStats.h"
-
+#include "linux/IOPriority.h"
+#include "linux/IOPriorityPanel.h"
+#include "linux/LinuxProcess.h"
+#include "linux/LinuxProcessList.h"
+#include "linux/SystemdMeter.h"
+#include "linux/ZramMeter.h"
+#include "linux/ZramStats.h"
 #include "zfs/ZfsArcMeter.h"
 #include "zfs/ZfsArcStats.h"
 #include "zfs/ZfsCompressedArcMeter.h"
diff --git a/linux/PressureStallMeter.c b/linux/PressureStallMeter.c
index 573c1a3a..ff34f9b1 100644
--- a/linux/PressureStallMeter.c
+++ b/linux/PressureStallMeter.c
@@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "PressureStallMeter.h"
+#include "linux/PressureStallMeter.h"
 
 #include <stdbool.h>
 #include <string.h>
diff --git a/linux/SELinuxMeter.c b/linux/SELinuxMeter.c
index 374fa5e9..e3b076d3 100644
--- a/linux/SELinuxMeter.c
+++ b/linux/SELinuxMeter.c
@@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "SELinuxMeter.h"
+#include "linux/SELinuxMeter.h"
 
 #include "CRT.h"
 
diff --git a/linux/SystemdMeter.c b/linux/SystemdMeter.c
index 36ad40a9..8ffb6130 100644
--- a/linux/SystemdMeter.c
+++ b/linux/SystemdMeter.c
@@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "SystemdMeter.h"
+#include "linux/SystemdMeter.h"
 
 #include <dlfcn.h>
 #include <fcntl.h>
diff --git a/linux/ZramMeter.c b/linux/ZramMeter.c
index 4cfd1f79..e1e27b71 100644
--- a/linux/ZramMeter.c
+++ b/linux/ZramMeter.c
@@ -1,4 +1,4 @@
-#include "ZramMeter.h"
+#include "linux/ZramMeter.h"
 
 #include <stddef.h>
 
diff --git a/openbsd/OpenBSDProcess.c b/openbsd/OpenBSDProcess.c
index f757b23b..030813c0 100644
--- a/openbsd/OpenBSDProcess.c
+++ b/openbsd/OpenBSDProcess.c
@@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "OpenBSDProcess.h"
+#include "openbsd/OpenBSDProcess.h"
 
 #include <stdlib.h>
 
diff --git a/openbsd/OpenBSDProcessList.c b/openbsd/OpenBSDProcessList.c
index 1c6c0e2f..67d4da1f 100644
--- a/openbsd/OpenBSDProcessList.c
+++ b/openbsd/OpenBSDProcessList.c
@@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "OpenBSDProcessList.h"
+#include "openbsd/OpenBSDProcessList.h"
 
 #include <kvm.h>
 #include <limits.h>
@@ -25,11 +25,11 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "Macros.h"
 #include "Object.h"
-#include "OpenBSDProcess.h"
 #include "Process.h"
 #include "ProcessList.h"
 #include "Settings.h"
 #include "XUtils.h"
+#include "openbsd/OpenBSDProcess.h"
 
 
 static long fscale;
diff --git a/openbsd/Platform.c b/openbsd/Platform.c
index eea21411..00e5008a 100644
--- a/openbsd/Platform.c
+++ b/openbsd/Platform.c
@@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "Platform.h"
+#include "openbsd/Platform.h"
 
 #include <errno.h>
 #include <kvm.h>
@@ -33,8 +33,6 @@ in the source distribution for its full text.
 #include "Macros.h"
 #include "MemoryMeter.h"
 #include "Meter.h"
-#include "OpenBSDProcess.h"
-#include "OpenBSDProcessList.h"
 #include "ProcessList.h"
 #include "Settings.h"
 #include "SignalsPanel.h"
@@ -43,6 +41,8 @@ in the source distribution for its full text.
 #include "TasksMeter.h"
 #include "UptimeMeter.h"
 #include "XUtils.h"
+#include "openbsd/OpenBSDProcess.h"
+#include "openbsd/OpenBSDProcessList.h"
 
 
 const ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_VIRT, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
diff --git a/solaris/Platform.h b/solaris/Platform.h
index 47fa3727..95a7ceb1 100644
--- a/solaris/Platform.h
+++ b/solaris/Platform.h
@@ -25,7 +25,6 @@ in the source distribution for its full text.
 #include "NetworkIOMeter.h"
 #include "ProcessLocksScreen.h"
 #include "SignalsPanel.h"
-
 #include "generic/gettime.h"
 #include "generic/hostname.h"
 #include "generic/uname.h"
diff --git a/solaris/SolarisProcessList.c b/solaris/SolarisProcessList.c
index 5e160540..5e7e66ee 100644
--- a/solaris/SolarisProcessList.c
+++ b/solaris/SolarisProcessList.c
@@ -6,9 +6,8 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "ProcessList.h"
-#include "SolarisProcess.h"
-#include "SolarisProcessList.h"
+
+#include "solaris/SolarisProcessList.h"
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -23,6 +22,8 @@ in the source distribution for its full text.
 #include <time.h>
 
 #include "CRT.h"
+#include "solaris/ProcessList.h"
+#include "solaris/SolarisProcess.h"
 
 
 #define MAXCMDLINE 255
diff --git a/solaris/SolarisProcessList.h b/solaris/SolarisProcessList.h
index 78362b65..90d893c8 100644
--- a/solaris/SolarisProcessList.h
+++ b/solaris/SolarisProcessList.h
@@ -13,8 +13,6 @@ in the source distribution for its full text.
 #define GZONE "global    "
 #define UZONE "unknown   "
 
-#include "zfs/ZfsArcStats.h"
-
 #include <kstat.h>
 #include <sys/param.h>
 #include <sys/uio.h>
@@ -23,6 +21,9 @@ in the source distribution for its full text.
 #include <sys/sysinfo.h>
 #include <sys/swap.h>
 
+#include "zfs/ZfsArcStats.h"
+
+
 #define ZONE_ERRMSGLEN 1024
 extern char zone_errmsg[ZONE_ERRMSGLEN];
 
diff --git a/unsupported/Platform.c b/unsupported/Platform.c
index bdbc762e..fb97fad5 100644
--- a/unsupported/Platform.c
+++ b/unsupported/Platform.c
@@ -8,7 +8,7 @@ in the source distribution for its full text.
 
 #include "config.h" // IWYU pragma: keep
 
-#include "Platform.h"
+#include "unsupported/Platform.h"
 
 #include <math.h>
 
diff --git a/unsupported/Platform.h b/unsupported/Platform.h
index 849a6861..582accb2 100644
--- a/unsupported/Platform.h
+++ b/unsupported/Platform.h
@@ -14,8 +14,8 @@ in the source distribution for its full text.
 #include "NetworkIOMeter.h"
 #include "ProcessLocksScreen.h"
 #include "SignalsPanel.h"
-#include "UnsupportedProcess.h"
 #include "generic/gettime.h"
+#include "unsupported/UnsupportedProcess.h"
 
 
 extern const SignalItem Platform_signals[];
diff --git a/unsupported/UnsupportedProcess.c b/unsupported/UnsupportedProcess.c
index def2a180..86bec176 100644
--- a/unsupported/UnsupportedProcess.c
+++ b/unsupported/UnsupportedProcess.c
@@ -7,7 +7,7 @@ in the source distribution for its full text.
 
 #include "config.h" // IWYU pragma: keep
 
-#include "UnsupportedProcess.h"
+#include "unsupported/UnsupportedProcess.h"
 
 #include <stdlib.h>
 
diff --git a/zfs/ZfsArcMeter.c b/zfs/ZfsArcMeter.c
index 47812e02..7653a351 100644
--- a/zfs/ZfsArcMeter.c
+++ b/zfs/ZfsArcMeter.c
@@ -5,8 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "ZfsArcMeter.h"
-#include "ZfsArcStats.h"
+#include "zfs/ZfsArcMeter.h"
 
 #include <stddef.h>
 
@@ -15,6 +14,8 @@ in the source distribution for its full text.
 #include "Platform.h"
 #include "RichString.h"
 
+#include "zfs/ZfsArcStats.h"
+
 
 static const int ZfsArcMeter_attributes[] = {
    ZFS_MFU, ZFS_MRU, ZFS_ANON, ZFS_HEADER, ZFS_OTHER
diff --git a/zfs/ZfsArcMeter.h b/zfs/ZfsArcMeter.h
index d258986d..19a04542 100644
--- a/zfs/ZfsArcMeter.h
+++ b/zfs/ZfsArcMeter.h
@@ -7,7 +7,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "ZfsArcStats.h"
+#include "zfs/ZfsArcStats.h"
 
 #include "Meter.h"
 
diff --git a/zfs/ZfsCompressedArcMeter.c b/zfs/ZfsCompressedArcMeter.c
index 5f9511c1..29ac3c44 100644
--- a/zfs/ZfsCompressedArcMeter.c
+++ b/zfs/ZfsCompressedArcMeter.c
@@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "ZfsCompressedArcMeter.h"
+#include "zfs/ZfsCompressedArcMeter.h"
 
 #include <stddef.h>
 
diff --git a/zfs/ZfsCompressedArcMeter.h b/zfs/ZfsCompressedArcMeter.h
index edfc5cb4..9a534303 100644
--- a/zfs/ZfsCompressedArcMeter.h
+++ b/zfs/ZfsCompressedArcMeter.h
@@ -7,7 +7,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "ZfsArcStats.h"
+#include "zfs/ZfsArcStats.h"
 
 #include "Meter.h"