Add includes for config.h as per the discussion in PR #1337

Many thanks to @Explorer09 Kang-Che Sung (宋岡哲).

Also add a #error stanza to XUtils.h in case somebody forgets the beautiful mess GNU forces on us.

AvailableColumnsPanel.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "AvailableColumnsPanel.h"
 
 #include <assert.h>

AvailableMetersPanel.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "AvailableMetersPanel.h"
 
 #include <assert.h>

BatteryMeter.c

@@ -7,6 +7,8 @@ in the source distribution for its full text.
 This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "BatteryMeter.h"
 
 #include <math.h>

CategoriesPanel.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "CategoriesPanel.h"
 
 #include <ctype.h>

ColumnsPanel.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "ColumnsPanel.h"
 
 #include <assert.h>

DiskIOMeter.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "DiskIOMeter.h"
 
 #include <stdbool.h>

DynamicScreen.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "DynamicScreen.h"
 
 #include <stdbool.h>

FileDescriptorMeter.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "FileDescriptorMeter.h"
 
 #include <math.h>

Header.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "Header.h"
 
 #include <assert.h>

LoadAverageMeter.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "LoadAverageMeter.h"
 
 #include "CRT.h"

Machine.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "Machine.h"
 
 #include <stdlib.h>

MainPanel.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "MainPanel.h"
 
 #include <ctype.h>

MemorySwapMeter.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "MemorySwapMeter.h"
 
 #include <assert.h>

NetworkIOMeter.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "NetworkIOMeter.h"
 
 #include <stdbool.h>

OptionItem.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "OptionItem.h"
 
 #include <assert.h>

Panel.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "Panel.h"
 
 #include <assert.h>

RichString.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "RichString.h"
 
 #include <ctype.h>

Scheduling.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "Scheduling.h"
 #include "EnvScreen.h"
 

ScreenTabsPanel.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "ScreenTabsPanel.h"
 
 #include <ctype.h>

ScreensPanel.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "ScreensPanel.h"
 
 #include <stdlib.h>

Settings.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "Settings.h"
 
 #include <ctype.h>

SignalsPanel.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "SignalsPanel.h"
 // the above contains #include <signal.h> so do not add that here again (breaks Solaris build)
 

TasksMeter.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "TasksMeter.h"
 
 #include "CRT.h"

UptimeMeter.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "UptimeMeter.h"
 
 #include "CRT.h"

Vector.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "Vector.h"
 
 #include <assert.h>

XUtils.h

@@ -3,11 +3,16 @@
 /*
 htop - StringUtils.h
 (C) 2004-2011 Hisham H. Muhammad
+(C) 2020-2023 htop dev team
 Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "config.h" // IWYU pragma: keep
+// IWYU pragma: no_include "config.h"
+#ifndef PACKAGE
+// strchrnul() needs _GNU_SOURCE defined, see PR #1337 for details
+#error "Must have #include \"config.h\" line at the top of the file that includes these XUtils helper functions"
+#endif
 
 #include <stdbool.h>
 #include <stdio.h>

dragonflybsd/Platform.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "dragonflybsd/Platform.h"
 
 #include <math.h>

freebsd/FreeBSDProcess.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "freebsd/FreeBSDProcess.h"
 
 #include <stdlib.h>

linux/CGroupUtils.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "linux/CGroupUtils.h"
 
 #include "XUtils.h"

linux/IOPriorityPanel.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "linux/IOPriorityPanel.h"
 
 #include <stdbool.h>

linux/LinuxProcess.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "linux/LinuxProcess.h"
 
 #include <math.h>

linux/PressureStallMeter.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "linux/PressureStallMeter.h"
 
 #include <stdbool.h>

linux/SELinuxMeter.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "linux/SELinuxMeter.h"
 
 #include "CRT.h"

linux/SystemdMeter.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "linux/SystemdMeter.h"
 
 #include <dlfcn.h>

netbsd/NetBSDMachine.c

@@ -8,6 +8,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "netbsd/NetBSDMachine.h"
 
 #include <kvm.h>

netbsd/NetBSDProcess.c

@@ -8,6 +8,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "netbsd/NetBSDProcess.h"
 
 #include <stdlib.h>

netbsd/NetBSDProcessTable.c

@@ -8,6 +8,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "netbsd/NetBSDProcessTable.h"
 
 #include <kvm.h>

netbsd/Platform.c

@@ -9,6 +9,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "netbsd/Platform.h"
 
 #include <errno.h>

openbsd/OpenBSDMachine.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "openbsd/OpenBSDMachine.h"
 
 #include <kvm.h>

openbsd/OpenBSDProcess.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "openbsd/OpenBSDProcess.h"
 
 #include <stdlib.h>

openbsd/OpenBSDProcessTable.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "openbsd/OpenBSDProcessTable.h"
 
 #include <kvm.h>

openbsd/Platform.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "openbsd/Platform.h"
 
 #include <errno.h>

pcp/InDomTable.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "InDomTable.h"
 
 #include <assert.h>

pcp/PCPDynamicScreen.c

@@ -6,6 +6,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "pcp/PCPDynamicScreen.h"
 
 #include <ctype.h>

pcp/PCPProcess.c

@@ -7,6 +7,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "pcp/PCPProcess.h"
 
 #include <math.h>

solaris/Platform.c

@@ -7,6 +7,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "solaris/Platform.h"
 
 #include <kstat.h>

zfs/ZfsCompressedArcMeter.c

@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "zfs/ZfsCompressedArcMeter.h"
 
 #include <stddef.h>