From e56089e1fa880064999ed6881e93f500445eacfb Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Tue, 28 Nov 2023 15:15:03 +0100 Subject: Update includes based on IWYU --- Action.c | 7 ++++++- Action.h | 1 - Affinity.c | 1 + AvailableColumnsPanel.c | 1 + AvailableColumnsPanel.h | 1 - AvailableMetersPanel.c | 1 + CPUMeter.c | 4 +++- CategoriesPanel.c | 2 +- ClockMeter.c | 2 +- ColorsPanel.c | 1 - ColumnsPanel.c | 1 + ColumnsPanel.h | 1 + CommandLine.c | 3 ++- DateMeter.c | 2 +- DateTimeMeter.c | 2 +- DiskIOMeter.c | 5 ++--- DiskIOMeter.h | 2 ++ DisplayOptionsPanel.c | 1 + DynamicColumn.c | 1 + DynamicMeter.c | 3 ++- DynamicScreen.c | 1 + DynamicScreen.h | 1 - FileDescriptorMeter.c | 2 -- Header.c | 1 + Header.h | 2 ++ ListItem.h | 1 + LoadAverageMeter.c | 2 +- Machine.c | 6 ++---- Machine.h | 2 -- Macros.h | 2 ++ MainPanel.c | 3 +++ MainPanel.h | 2 +- MemoryMeter.c | 1 + MemorySwapMeter.c | 1 + Meter.c | 3 +-- NetworkIOMeter.c | 5 ++--- NetworkIOMeter.h | 2 ++ OpenFilesScreen.c | 2 +- Process.c | 6 +++--- Process.h | 1 + ProcessTable.c | 8 ++------ ProcessTable.h | 5 ----- Row.c | 7 ++++--- Scheduling.c | 4 ++-- Scheduling.h | 2 ++ ScreenManager.c | 5 ++++- ScreenTabsPanel.c | 3 +++ ScreenTabsPanel.h | 1 + ScreensPanel.c | 3 ++- Settings.c | 2 ++ Settings.h | 2 ++ Table.c | 7 +++---- Table.h | 4 ---- TasksMeter.c | 1 + XUtils.h | 1 + linux/CGroupUtils.c | 6 ++++++ linux/CGroupUtils.h | 3 --- linux/HugePageMeter.c | 2 +- linux/LinuxMachine.c | 12 +++++++----- linux/LinuxMachine.h | 2 -- linux/LinuxProcess.c | 4 ++++ linux/LinuxProcess.h | 3 ++- linux/LinuxProcessTable.c | 12 ++++++------ linux/LinuxProcessTable.h | 3 --- linux/Platform.c | 2 +- linux/Platform.h | 2 ++ pcp/InDomTable.c | 2 +- 67 files changed, 113 insertions(+), 83 deletions(-) diff --git a/Action.c b/Action.c index 61cc1ef9..4049a952 100644 --- a/Action.c +++ b/Action.c @@ -9,9 +9,11 @@ in the source distribution for its full text. #include "Action.h" +#include #include #include #include +#include #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 d285e1b8..db9d8b52 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 546975d5..fab239eb 100644 --- a/Affinity.c +++ b/Affinity.c @@ -10,6 +10,7 @@ in the source distribution for its full text. #include "Affinity.h" +#include #include #include "Process.h" diff --git a/AvailableColumnsPanel.c b/AvailableColumnsPanel.c index 03684ff0..545ef7d7 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 3d233be0..0d8709fe 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 f34af8fe..9a1d367c 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 782f4170..afcddeb1 100644 --- a/CPUMeter.c +++ b/CPUMeter.c @@ -9,14 +9,16 @@ in the source distribution for its full text. #include "CPUMeter.h" +#include +#include #include #include #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 d653dcbd..64a3f062 100644 --- a/CategoriesPanel.c +++ b/CategoriesPanel.c @@ -13,7 +13,6 @@ in the source distribution for its full text. #include #include -#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 82c3968b..38f0591f 100644 --- a/ClockMeter.c +++ b/ClockMeter.c @@ -13,8 +13,8 @@ in the source distribution for its full text. #include #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 c00981e0..01032bc3 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 0517ea7d..66625666 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 63f6f92b..723369fd 100644 --- a/ColumnsPanel.h +++ b/ColumnsPanel.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include +#include "Hashtable.h" #include "Panel.h" #include "Settings.h" diff --git a/CommandLine.c b/CommandLine.c index 230b721c..09e67b85 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 224de306..0bdb30a8 100644 --- a/DateMeter.c +++ b/DateMeter.c @@ -13,8 +13,8 @@ in the source distribution for its full text. #include #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 ebe72288..dcd85ea6 100644 --- a/DateTimeMeter.c +++ b/DateTimeMeter.c @@ -13,8 +13,8 @@ in the source distribution for its full text. #include #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 545ebd83..8d658de8 100644 --- a/DiskIOMeter.c +++ b/DiskIOMeter.c @@ -10,15 +10,14 @@ in the source distribution for its full text. #include "DiskIOMeter.h" #include -#include #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 3b03e321..5ac9c484 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 + #include "Meter.h" diff --git a/DisplayOptionsPanel.c b/DisplayOptionsPanel.c index fb6fe9c4..66793e16 100644 --- a/DisplayOptionsPanel.c +++ b/DisplayOptionsPanel.c @@ -11,6 +11,7 @@ in the source distribution for its full text. #include #include +#include #include "CRT.h" #include "FunctionBar.h" diff --git a/DynamicColumn.c b/DynamicColumn.c index 7c0ed3ad..5f021740 100644 --- a/DynamicColumn.c +++ b/DynamicColumn.c @@ -12,6 +12,7 @@ in the source distribution for its full text. #include "DynamicColumn.h" #include +#include #include "Platform.h" #include "RichString.h" diff --git a/DynamicMeter.c b/DynamicMeter.c index 96b169d5..15d853bd 100644 --- a/DynamicMeter.c +++ b/DynamicMeter.c @@ -15,10 +15,11 @@ in the source distribution for its full text. #include #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 6ab52541..9e3d5e49 100644 --- a/DynamicScreen.c +++ b/DynamicScreen.c @@ -12,6 +12,7 @@ in the source distribution for its full text. #include #include +#include #include "Hashtable.h" #include "Platform.h" diff --git a/DynamicScreen.h b/DynamicScreen.h index 76b3d428..fb08ebc9 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 4295f21a..cf1ec933 100644 --- a/FileDescriptorMeter.c +++ b/FileDescriptorMeter.c @@ -10,8 +10,6 @@ in the source distribution for its full text. #include "FileDescriptorMeter.h" #include -#include -#include #include "CRT.h" #include "Macros.h" diff --git a/Header.c b/Header.c index bb47f0c5..4fee26b4 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 82e38530..2cc78ab7 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 + #include "HeaderLayout.h" #include "Machine.h" #include "Meter.h" diff --git a/ListItem.h b/ListItem.h index b2c3e061..5efe8743 100644 --- a/ListItem.h +++ b/ListItem.h @@ -10,6 +10,7 @@ in the source distribution for its full text. #include #include "Object.h" +#include "RichString.h" typedef struct ListItem_ { diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c index 0a8e7f19..30c58bb9 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 6ea08620..44aa27c8 100644 --- a/Machine.c +++ b/Machine.c @@ -11,11 +11,9 @@ in the source distribution for its full text. #include "Machine.h" #include -#include +#include -#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 6c60050d..f2dabddc 100644 --- a/Machine.h +++ b/Machine.h @@ -16,12 +16,10 @@ in the source distribution for its full text. #include #include -#include "Hashtable.h" #include "Panel.h" #include "Settings.h" #include "Table.h" #include "UsersTable.h" -#include "Vector.h" #ifdef HAVE_LIBHWLOC #include diff --git a/Macros.h b/Macros.h index db411e93..01cc7774 100644 --- a/Macros.h +++ b/Macros.h @@ -10,6 +10,8 @@ in the source distribution for its full text. #include // IWYU pragma: keep #include #include +#include // IWYU pragma: keep + #ifndef MINIMUM #define MINIMUM(a, b) ((a) < (b) ? (a) : (b)) diff --git a/MainPanel.c b/MainPanel.c index 05093f12..83490236 100644 --- a/MainPanel.c +++ b/MainPanel.c @@ -12,12 +12,15 @@ in the source distribution for its full text. #include #include +#include #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 19229d59..5f5a5ca4 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 -#include #include "Action.h" +#include "FunctionBar.h" #include "IncSet.h" #include "Object.h" #include "Panel.h" diff --git a/MemoryMeter.c b/MemoryMeter.c index 6483e95f..9e0d7d5c 100644 --- a/MemoryMeter.c +++ b/MemoryMeter.c @@ -7,6 +7,7 @@ in the source distribution for its full text. #include "MemoryMeter.h" +#include #include #include diff --git a/MemorySwapMeter.c b/MemorySwapMeter.c index 0d89ced6..82eddee2 100644 --- a/MemorySwapMeter.c +++ b/MemorySwapMeter.c @@ -10,6 +10,7 @@ in the source distribution for its full text. #include "MemorySwapMeter.h" #include +#include #include #include diff --git a/Meter.c b/Meter.c index a52082ac..86f88856 100644 --- a/Meter.c +++ b/Meter.c @@ -10,9 +10,7 @@ in the source distribution for its full text. #include "Meter.h" #include -#include #include -#include #include #include @@ -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 1ab3a37e..6bc2d082 100644 --- a/NetworkIOMeter.c +++ b/NetworkIOMeter.c @@ -10,16 +10,15 @@ in the source distribution for its full text. #include "NetworkIOMeter.h" #include -#include #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 d112a745..355b815b 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 + #include "Meter.h" diff --git a/OpenFilesScreen.c b/OpenFilesScreen.c index bb1c70c4..29540247 100644 --- a/OpenFilesScreen.c +++ b/OpenFilesScreen.c @@ -12,9 +12,9 @@ in the source distribution for its full text. #include #include #include +#include #include #include -#include #include #include #include diff --git a/Process.c b/Process.c index ea432be0..a36ab6c7 100644 --- a/Process.c +++ b/Process.c @@ -11,7 +11,6 @@ in the source distribution for its full text. #include "Process.h" #include -#include #include #include #include @@ -19,17 +18,18 @@ in the source distribution for its full text. #include #include #include -#include #include #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 0c3562ac..bcafc81a 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 39e3eb87..05839455 100644 --- a/ProcessTable.c +++ b/ProcessTable.c @@ -9,15 +9,11 @@ in the source distribution for its full text. #include #include -#include -#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 ceaabc79..3b35c103 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 #include -#include -#include #include #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 f43c8203..e268837d 100644 --- a/Row.c +++ b/Row.c @@ -10,21 +10,22 @@ in the source distribution for its full text. #include "Row.h" +#include +#include #include #include #include #include #include -#include -#include #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 42524073..d5c4b8a6 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 +#include +#include #include "FunctionBar.h" #include "ListItem.h" diff --git a/Scheduling.h b/Scheduling.h index e5952b00..4e4a3455 100644 --- a/Scheduling.h +++ b/Scheduling.h @@ -12,8 +12,10 @@ in the source distribution for its full text. #include #include +#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 bfecd2c7..e7e82e1d 100644 --- a/ScreenManager.c +++ b/ScreenManager.c @@ -12,6 +12,7 @@ in the source distribution for its full text. #include #include #include +#include #include #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 fdb84248..e48e5fb8 100644 --- a/ScreenTabsPanel.c +++ b/ScreenTabsPanel.c @@ -9,13 +9,16 @@ in the source distribution for its full text. #include "ScreenTabsPanel.h" +#include #include +#include #include #include #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 3b89ffc2..fe1a313c 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 bf08f2e6..4138066b 100644 --- a/ScreensPanel.c +++ b/ScreensPanel.c @@ -10,8 +10,9 @@ in the source distribution for its full text. #include "ScreensPanel.h" -#include +#include #include +#include #include #include "AvailableColumnsPanel.h" diff --git a/Settings.c b/Settings.c index 4e0aa21d..a7787d30 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 0c202f8a..d3ee57a2 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 +#include #include #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 c31e8254..17750d56 100644 --- a/Table.c +++ b/Table.c @@ -9,17 +9,16 @@ in the source distribution for its full text. #include "Table.h" #include +#include #include -#include #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 d16e47da..aec66c49 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 #include -#include -#include -#include #include "Hashtable.h" #include "Object.h" diff --git a/TasksMeter.c b/TasksMeter.c index 04b1f938..aa41e631 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 1babb86e..68b94836 100644 --- a/XUtils.h +++ b/XUtils.h @@ -15,6 +15,7 @@ in the source distribution for its full text. #endif #include +#include // IWYU pragma: keep #include #include // IWYU pragma: keep #include // IWYU pragma: keep 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 +#include +#include +#include + +#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 -#include - 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 #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 -#include #include #include #include -#include +#include #include #include -#include #include #include #include #include #include -#include #include #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 -#include #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 #include +#include #include #include #include @@ -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 -#include #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 #include #include -#include #include #include #include #include #include -#include #include #include #include -#include -#include #include #include -#include #ifdef HAVE_DELAYACCT #include @@ -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 -#include -#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 -#include #include #include #include @@ -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" diff --git a/pcp/InDomTable.c b/pcp/InDomTable.c index 68563fb9..2f9a5008 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 #include -- cgit v1.2.3