From 7cf527759481a760b0f08da16add3a5120048572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Wed, 18 Nov 2020 14:26:30 +0100
Subject: [PATCH] IWYU update (Linux)

---
 Action.c             |  3 ++-
 CPUMeter.c           |  3 +++
 ColumnsPanel.c       |  1 -
 Compat.c             | 13 +++++++------
 DiskIOMeter.c        |  1 +
 Hashtable.c          |  7 ++++++-
 Meter.h              |  1 +
 NetworkIOMeter.c     |  1 +
 Process.c            |  3 ++-
 Process.h            |  1 -
 ProcessLocksScreen.c | 17 +++--------------
 ProcessLocksScreen.h |  8 ++++++--
 htop.c               |  1 -
 linux/LinuxProcess.c |  3 ++-
 linux/LinuxProcess.h |  2 +-
 linux/Platform.c     |  7 ++++++-
 linux/SystemdMeter.c |  8 ++++++--
 linux/ZramMeter.c    |  3 +++
 18 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/Action.c b/Action.c
index 822c9174..edaebc66 100644
--- a/Action.c
+++ b/Action.c
@@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "config.h"
+#include "config.h" // IWYU pragma: keep
 
 #include "Action.h"
 
@@ -20,6 +20,7 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "EnvScreen.h"
 #include "FunctionBar.h"
+#include "Hashtable.h"
 #include "IncSet.h"
 #include "InfoScreen.h"
 #include "ListItem.h"
diff --git a/CPUMeter.c b/CPUMeter.c
index e371c202..cb5a5e74 100644
--- a/CPUMeter.c
+++ b/CPUMeter.c
@@ -5,9 +5,12 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h"
+
 #include "CPUMeter.h"
 
 #include <math.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/ColumnsPanel.c b/ColumnsPanel.c
index ffd4d0bb..63348ec5 100644
--- a/ColumnsPanel.c
+++ b/ColumnsPanel.c
@@ -14,7 +14,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/Compat.c b/Compat.c
index 6401f696..096b938a 100644
--- a/Compat.c
+++ b/Compat.c
@@ -7,13 +7,14 @@ in the source distribution for its full text.
 
 #include "config.h" // IWYU pragma: keep
 
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include "Compat.h"
-#include "XUtils.h"
+
+#include <fcntl.h> // IWYU pragma: keep
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h> // IWYU pragma: keep
+
+#include "XUtils.h" // IWYU pragma: keep
 
 
 int Compat_fstatat(int dirfd,
diff --git a/DiskIOMeter.c b/DiskIOMeter.c
index e2d02524..b94af6de 100644
--- a/DiskIOMeter.c
+++ b/DiskIOMeter.c
@@ -7,6 +7,7 @@ in the source distribution for its full text.
 
 #include "DiskIOMeter.h"
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <sys/time.h>
 
diff --git a/Hashtable.c b/Hashtable.c
index cdfb4ec3..c03723a1 100644
--- a/Hashtable.c
+++ b/Hashtable.c
@@ -5,13 +5,18 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "Hashtable.h"
-#include "XUtils.h"
 
 #include <assert.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 
+#include "Macros.h"
+#include "XUtils.h"
+
 
 #ifndef NDEBUG
 
diff --git a/Meter.h b/Meter.h
index 125c0cd5..8b0715c5 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 <stdint.h>
 #include <sys/time.h>
 
 #include "ListItem.h"
diff --git a/NetworkIOMeter.c b/NetworkIOMeter.c
index a13e3f1c..c332aa87 100644
--- a/NetworkIOMeter.c
+++ b/NetworkIOMeter.c
@@ -1,5 +1,6 @@
 #include "NetworkIOMeter.h"
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <sys/time.h>
 
diff --git a/Process.c b/Process.c
index b24e3a2f..eb080f03 100644
--- a/Process.c
+++ b/Process.c
@@ -17,13 +17,14 @@ 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>
 
 #include "CRT.h"
+#include "Macros.h"
 #include "Platform.h"
+#include "ProcessList.h"
 #include "RichString.h"
 #include "Settings.h"
 #include "XUtils.h"
diff --git a/Process.h b/Process.h
index 631eba74..a76161d8 100644
--- a/Process.h
+++ b/Process.h
@@ -9,7 +9,6 @@ in the source distribution for its full text.
 */
 
 #include <stdbool.h>
-#include <time.h>
 #include <sys/types.h>
 
 #include "Object.h"
diff --git a/ProcessLocksScreen.c b/ProcessLocksScreen.c
index 67743c94..6dc3c109 100644
--- a/ProcessLocksScreen.c
+++ b/ProcessLocksScreen.c
@@ -9,25 +9,14 @@ in the source distribution for its full text.
 
 #include "ProcessLocksScreen.h"
 
-#include <dirent.h>
-#include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <stdbool.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 
-#include "CRT.h"
-#include "Compat.h"
-#include "FunctionBar.h"
-#include "IncSet.h"
+#include "Panel.h"
 #include "Platform.h"
-#include "ProcessList.h"
+#include "ProvideCurses.h"
+#include "Vector.h"
 #include "XUtils.h"
 
 
diff --git a/ProcessLocksScreen.h b/ProcessLocksScreen.h
index daffd629..c8482286 100644
--- a/ProcessLocksScreen.h
+++ b/ProcessLocksScreen.h
@@ -7,9 +7,13 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "InfoScreen.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/types.h>
 
-#include <stdlib.h>
+#include "InfoScreen.h"
+#include "Object.h"
+#include "Process.h"
 
 
 typedef struct ProcessLocksScreen_ {
diff --git a/htop.c b/htop.c
index 49b22b4b..a908c2a3 100644
--- a/htop.c
+++ b/htop.c
@@ -18,7 +18,6 @@ in the source distribution for its full text.
 #include <unistd.h>
 
 #include "Action.h"
-#include "ColumnsPanel.h"
 #include "CRT.h"
 #include "Hashtable.h"
 #include "Header.h"
diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c
index 5868ea29..045d3153 100644
--- a/linux/LinuxProcess.c
+++ b/linux/LinuxProcess.c
@@ -11,13 +11,14 @@ in the source distribution for its full text.
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <syscall.h>
 #include <unistd.h>
 
 #include "CRT.h"
+#include "Macros.h"
 #include "Process.h"
 #include "ProvideCurses.h"
+#include "RichString.h"
 #include "XUtils.h"
 
 
diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
index 856b7bee..d4085963 100644
--- a/linux/LinuxProcess.h
+++ b/linux/LinuxProcess.h
@@ -16,9 +16,9 @@ in the source distribution for its full text.
 #include "IOPriority.h"
 #include "Object.h"
 #include "Process.h"
-#include "RichString.h"
 #include "Settings.h"
 
+
 #define PROCESS_FLAG_LINUX_IOPRIO   0x0100
 #define PROCESS_FLAG_LINUX_OPENVZ   0x0200
 #define PROCESS_FLAG_LINUX_VSERVER  0x0400
diff --git a/linux/Platform.c b/linux/Platform.c
index 7c58d3a8..21d65156 100644
--- a/linux/Platform.c
+++ b/linux/Platform.c
@@ -12,12 +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 <stdint.h>
 #include <stdio.h>
-#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "BatteryMeter.h"
@@ -51,6 +55,7 @@ in the source distribution for its full text.
 #include "UptimeMeter.h"
 #include "XUtils.h"
 #include "ZramMeter.h"
+#include "ZramStats.h"
 
 #include "zfs/ZfsArcMeter.h"
 #include "zfs/ZfsArcStats.h"
diff --git a/linux/SystemdMeter.c b/linux/SystemdMeter.c
index ef88275f..95b0cb39 100644
--- a/linux/SystemdMeter.c
+++ b/linux/SystemdMeter.c
@@ -9,12 +9,16 @@ in the source distribution for its full text.
 
 #include <dlfcn.h>
 #include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 
 #include "CRT.h"
+#include "Macros.h"
+#include "Object.h"
+#include "RichString.h"
 #include "XUtils.h"
 
 
diff --git a/linux/ZramMeter.c b/linux/ZramMeter.c
index 30d78eaa..cee70586 100644
--- a/linux/ZramMeter.c
+++ b/linux/ZramMeter.c
@@ -2,7 +2,10 @@
 
 #include "CRT.h"
 #include "Meter.h"
+#include "Object.h"
 #include "Platform.h"
+#include "RichString.h"
+
 
 static const int ZramMeter_attributes[] = {
    ZRAM