From fa78a7101c3f19aa0ac148f7184aafb1d32bb701 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 23 Jun 2016 17:24:19 -0700
Subject: [PATCH] Make IWYU output in lint.cpp less messy

And re-run IWYU, adjust #includes.
---
 build_tools/lint.fish        | 12 ++++++------
 src/autoload.cpp             |  2 +-
 src/autoload.h               |  1 -
 src/builtin.cpp              |  3 +--
 src/builtin_commandline.cpp  |  1 -
 src/builtin_complete.cpp     |  3 +--
 src/builtin_jobs.cpp         |  1 -
 src/builtin_printf.cpp       |  1 -
 src/builtin_set.cpp          |  1 -
 src/builtin_set_color.cpp    |  1 -
 src/builtin_string.cpp       |  1 -
 src/builtin_test.cpp         |  1 -
 src/color.h                  |  1 -
 src/common.cpp               |  2 --
 src/common.h                 |  3 +--
 src/complete.cpp             |  2 +-
 src/complete.h               |  1 -
 src/env.cpp                  |  1 -
 src/env.h                    |  1 -
 src/env_universal_common.cpp |  1 -
 src/env_universal_common.h   |  1 -
 src/event.cpp                |  1 -
 src/event.h                  |  1 -
 src/exec.cpp                 |  1 -
 src/exec.h                   |  1 -
 src/expand.h                 |  1 -
 src/fish.cpp                 |  1 -
 src/fish_indent.cpp          |  1 -
 src/fish_key_reader.cpp      |  1 +
 src/fish_tests.cpp           |  9 +++++----
 src/function.cpp             |  1 +
 src/function.h               |  1 -
 src/highlight.h              |  1 -
 src/history.h                |  1 -
 src/input.h                  |  1 -
 src/input_common.cpp         |  1 -
 src/intern.cpp               |  1 -
 src/io.h                     |  1 -
 src/iothread.cpp             |  2 +-
 src/output.h                 |  1 -
 src/pager.cpp                |  1 +
 src/pager.h                  |  1 -
 src/parse_execution.cpp      |  1 -
 src/parse_execution.h        |  1 -
 src/parse_productions.h      |  1 -
 src/parse_tree.cpp           |  4 ++--
 src/parse_tree.h             |  1 -
 src/parse_util.cpp           |  1 -
 src/parse_util.h             |  1 -
 src/parser.cpp               |  1 -
 src/parser.h                 |  1 -
 src/parser_keywords.h        |  2 --
 src/path.h                   |  1 -
 src/postfork.h               |  1 -
 src/proc.cpp                 |  1 -
 src/proc.h                   |  1 -
 src/reader.h                 |  1 -
 src/screen.h                 |  1 -
 src/signal.cpp               |  1 -
 src/signal.h                 |  1 -
 src/tokenizer.h              |  1 -
 src/wildcard.cpp             |  1 -
 src/wildcard.h               |  1 -
 src/wutil.h                  |  1 -
 64 files changed, 22 insertions(+), 75 deletions(-)

diff --git a/build_tools/lint.fish b/build_tools/lint.fish
index f3350aee4..5d9e4443d 100755
--- a/build_tools/lint.fish
+++ b/build_tools/lint.fish
@@ -65,17 +65,17 @@ end
 # We now have a list of files to check so run the linters.
 if set -q c_files[1]
     if type -q iwyu
+        echo
+        echo ========================================
+        echo Running IWYU
+        echo ========================================
         # The stderr to stdout redirection is because cppcheck, incorrectly IMHO, writes its
         # diagnostic messages to stderr. Anyone running this who wants to capture its output will
         # expect those messages to be written to stdout.
         for c_file in $c_files
-            echo
-            echo ========================================
-            echo Running IWYU on $c_file
-            echo ========================================
             switch $kernel_name
                 case Darwin
-                    include-what-you-use -Xiwyu --no_default_mappings -Xiwyu --mapping_file=build_tools/iwyu.osx.imp $cppcheck_args $c_file 2>&1
+                    include-what-you-use -Xiwyu --no_default_mappings -Xiwyu --mapping_file=build_tools/iwyu.osx.imp $cppcheck_args --std=c++11 $c_file 2>&1
                 case Linux
                     include-what-you-use -Xiwyu --mapping_file=build_tools/iwyu.linux.imp $cppcheck_args $c_file 2>&1
                 case '*' # hope for the best
@@ -92,7 +92,7 @@ if set -q c_files[1]
         # The stderr to stdout redirection is because cppcheck, incorrectly IMHO, writes its
         # diagnostic messages to stderr. Anyone running this who wants to capture its output will
         # expect those messages to be written to stdout.
-        cppcheck -q --verbose --std=posix --std=c11 --language=c++ --template "[{file}:{line}]: {severity} ({id}): {message}" --suppress=missingIncludeSystem --inline-suppr --enable=$cppchecks --rule-file=.cppcheck.rule $cppcheck_args $c_files 2>&1
+        cppcheck -q --verbose --std=posix --language=c++ --template "[{file}:{line}]: {severity} ({id}): {message}" --suppress=missingIncludeSystem --inline-suppr --enable=$cppchecks --rule-file=.cppcheck.rule $cppcheck_args $c_files 2>&1
     end
 
     if type -q oclint
diff --git a/src/autoload.cpp b/src/autoload.cpp
index 56292fc6c..9ccd304cb 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -4,13 +4,13 @@
 #include <assert.h>
 #include <errno.h>
 #include <pthread.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
 #include <wchar.h>
 #include <algorithm>
+#include <memory>
 #include <set>
 #include <string>
 #include <utility>
diff --git a/src/autoload.h b/src/autoload.h
index efa8c16d8..a5bd206ce 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -3,7 +3,6 @@
 #define FISH_AUTOLOAD_H
 
 #include <pthread.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <time.h>
 #include <set>
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 248ca323b..5033ca5da 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -21,7 +21,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,7 +31,7 @@
 #include <wctype.h>
 #include <algorithm>
 #include <map>
-#include <memory>  // IWYU pragma: keep
+#include <memory>
 #include <string>
 #include <utility>
 
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index 0a76ef845..e22f8d9e0 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -4,7 +4,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <pthread.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <wchar.h>
 #include <cstring>
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index f4e3b36f3..a3e14fdea 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -1,10 +1,9 @@
 // Functions used for implementing the complete builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <stdbool.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include <memory>  // IWYU pragma: keep
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index f5f7a0592..72765cb82 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -2,7 +2,6 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <errno.h>
-#include <stdbool.h>
 #ifdef HAVE__PROC_SELF_STAT
 #include <sys/time.h>
 #endif
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index d3d971ac2..9f3ea7bc5 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -54,7 +54,6 @@
 #include <limits.h>
 #include <locale.h>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index cbd0a871b..a7f1ddb84 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -2,7 +2,6 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <errno.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <wchar.h>
diff --git a/src/builtin_set_color.cpp b/src/builtin_set_color.cpp
index 659e6536b..e6679562f 100644
--- a/src/builtin_set_color.cpp
+++ b/src/builtin_set_color.cpp
@@ -14,7 +14,6 @@
 #include <ncurses/term.h>
 #endif
 #include <assert.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory>
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index a2ac02443..0f01096df 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -9,7 +9,6 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <wchar.h>
diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index da63270d7..09d7337b4 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -5,7 +5,6 @@
 
 #include <assert.h>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/color.h b/src/color.h
index 2466e9e88..fd756d0a2 100644
--- a/src/color.h
+++ b/src/color.h
@@ -2,7 +2,6 @@
 #ifndef FISH_COLOR_H
 #define FISH_COLOR_H
 
-#include <stdbool.h>
 #include <string.h>
 #include <string>
 
diff --git a/src/common.cpp b/src/common.cpp
index b0e967898..146f0780b 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -9,7 +9,6 @@
 #include <math.h>
 #include <signal.h>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -17,7 +16,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <termios.h>
 #include <unistd.h>
 #include <wchar.h>
diff --git a/src/common.h b/src/common.h
index 0c1b77d4b..85b2dcc65 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,14 +6,13 @@
 #include <errno.h>
 #include <pthread.h>
 #include <stdarg.h>  // IWYU pragma: keep
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <termios.h>
 #include <wchar.h>
-#include <memory>  // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <string>
 #include <vector>
diff --git a/src/complete.cpp b/src/complete.cpp
index e23e9ce13..43d362903 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -8,7 +8,6 @@
 #include <assert.h>
 #include <pthread.h>
 #include <pwd.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <wchar.h>
 #include <wctype.h>
@@ -20,6 +19,7 @@
 #include <string>
 #include <utility>
 
+
 #include "autoload.h"
 #include "builtin.h"
 #include "common.h"
diff --git a/src/complete.h b/src/complete.h
index 4fd8dbedf..e573ad3d6 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -5,7 +5,6 @@
 #ifndef FISH_COMPLETE_H
 #define FISH_COMPLETE_H
 
-#include <stdbool.h>
 #include <stdint.h>
 #include <vector>
 
diff --git a/src/env.cpp b/src/env.cpp
index 0ec454482..606a094f8 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -6,7 +6,6 @@
 #include <locale.h>
 #include <pthread.h>
 #include <pwd.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
 #ifdef HAVE__NL_MSG_CAT_CNTR
diff --git a/src/env.h b/src/env.h
index e758a594b..6f783312c 100644
--- a/src/env.h
+++ b/src/env.h
@@ -2,7 +2,6 @@
 #ifndef FISH_ENV_H
 #define FISH_ENV_H
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <map>
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 6808558fe..8f55ca261 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -8,7 +8,6 @@
 #include <limits.h>
 #include <pwd.h>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
diff --git a/src/env_universal_common.h b/src/env_universal_common.h
index 658f3f412..0675cbe52 100644
--- a/src/env_universal_common.h
+++ b/src/env_universal_common.h
@@ -2,7 +2,6 @@
 #define FISH_ENV_UNIVERSAL_COMMON_H
 
 #include <pthread.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <memory>
 #include <set>
diff --git a/src/event.cpp b/src/event.cpp
index 3da57dfa6..84a4d31e6 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -3,7 +3,6 @@
 
 #include <assert.h>
 #include <signal.h>
-#include <stdbool.h>
 #include <unistd.h>
 #include <algorithm>
 #include <memory>
diff --git a/src/event.h b/src/event.h
index 1e48efd46..077731c7a 100644
--- a/src/event.h
+++ b/src/event.h
@@ -6,7 +6,6 @@
 #ifndef FISH_EVENT_H
 #define FISH_EVENT_H
 
-#include <stdbool.h>
 #include <unistd.h>
 #include <vector>
 
diff --git a/src/exec.cpp b/src/exec.cpp
index a5bdbc0be..d79b1e7f4 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -25,7 +25,6 @@
 #ifdef HAVE_SIGINFO_H
 #include <siginfo.h>
 #endif
-#include <stdbool.h>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/exec.h b/src/exec.h
index 1c402a6f5..5a7fa78cd 100644
--- a/src/exec.h
+++ b/src/exec.h
@@ -2,7 +2,6 @@
 #ifndef FISH_EXEC_H
 #define FISH_EXEC_H
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <vector>
 
diff --git a/src/expand.h b/src/expand.h
index 2f1dd2a65..bf4c1233a 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -7,7 +7,6 @@
 
 #include "config.h"
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <string>
 #include <vector>
diff --git a/src/fish.cpp b/src/fish.cpp
index 9482bd3f9..12688ceeb 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include <limits.h>
 #include <locale.h>
 #include <pwd.h>
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 06a0e0e4d..ee2a4f800 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include <errno.h>
 #include <getopt.h>
 #include <locale.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 8755d2d15..3d1502d09 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -9,6 +9,7 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <getopt.h>
+#include <locale.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index d753ac78d..c78e6c821 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -9,7 +9,6 @@
 #include <pthread.h>
 #include <signal.h>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -2256,7 +2255,8 @@ static int test_universal_helper(int *x) {
 
 static void test_universal() {
     say(L"Testing universal variables");
-    if (system("mkdir -p /tmp/fish_uvars_test/")) err(L"mkdir failed");
+
+    if (system("mkdir -p " "/tmp/fish_uvars_test/")) err(L"mkdir failed");
 
     const int threads = 16;
     static int ctx[threads];
@@ -2293,7 +2293,7 @@ static void test_universal() {
         }
     }
 
-    if (system("rm -Rf /tmp/fish_uvars_test")) err(L"rm failed");
+    if (system("rm -d /tmp/fish_uvars_test")) err(L"rm failed");
     putc('\n', stderr);
 }
 
@@ -3807,9 +3807,10 @@ int main(int argc, char **argv) {
     event_init();
     function_init();
     builtin_init();
-    reader_init();
     env_init();
 
+    reader_init();
+
     // Set default signal handlers, so we can ctrl-C out of this.
     signal_reset_handlers();
 
diff --git a/src/function.cpp b/src/function.cpp
index 21f7d9635..ab2a5a431 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -6,6 +6,7 @@
 
 // IWYU pragma: no_include <type_traits>
 #include <dirent.h>
+#include <errno.h>
 #include <pthread.h>
 #include <stddef.h>
 #include <wchar.h>
diff --git a/src/function.h b/src/function.h
index 59b37051d..bd193104c 100644
--- a/src/function.h
+++ b/src/function.h
@@ -4,7 +4,6 @@
 #ifndef FISH_FUNCTION_H
 #define FISH_FUNCTION_H
 
-#include <stdbool.h>
 #include <map>
 #include <vector>
 
diff --git a/src/highlight.h b/src/highlight.h
index c503e97aa..e708733de 100644
--- a/src/highlight.h
+++ b/src/highlight.h
@@ -3,7 +3,6 @@
 #define FISH_HIGHLIGHT_H
 
 #include <assert.h>
-#include <stdbool.h>
 #include <stdint.h>
 #include <vector>
 
diff --git a/src/history.h b/src/history.h
index 114df9571..939dec3f0 100644
--- a/src/history.h
+++ b/src/history.h
@@ -4,7 +4,6 @@
 
 // IWYU pragma: no_include <cstddef>
 #include <pthread.h>
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <time.h>
diff --git a/src/input.h b/src/input.h
index 9e6b75239..13ed5bea9 100644
--- a/src/input.h
+++ b/src/input.h
@@ -3,7 +3,6 @@
 #ifndef FISH_INPUT_H
 #define FISH_INPUT_H
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <vector>
 
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 405e0d6e4..cf5421a88 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -11,7 +11,6 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
diff --git a/src/intern.cpp b/src/intern.cpp
index 9030ef8a7..cc807e49c 100644
--- a/src/intern.cpp
+++ b/src/intern.cpp
@@ -2,7 +2,6 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <pthread.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <wchar.h>
 #include <algorithm>
diff --git a/src/io.h b/src/io.h
index a105e67fa..f8149a818 100644
--- a/src/io.h
+++ b/src/io.h
@@ -17,7 +17,6 @@ using std::shared_ptr;
 #include <tr1/memory>
 using std::tr1::shared_ptr;
 #endif
-#include <stdbool.h>
 
 #include "common.h"
 
diff --git a/src/iothread.cpp b/src/iothread.cpp
index be08e4515..f79910e24 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -1,11 +1,11 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <assert.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <pthread.h>
 #include <signal.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <sys/select.h>
 #include <sys/time.h>
diff --git a/src/output.h b/src/output.h
index 2ecebfbf9..a7f87fab4 100644
--- a/src/output.h
+++ b/src/output.h
@@ -5,7 +5,6 @@
 #ifndef FISH_OUTPUT_H
 #define FISH_OUTPUT_H
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <vector>
 
diff --git a/src/pager.cpp b/src/pager.cpp
index 386bd6644..8867c5e32 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -10,6 +10,7 @@
 
 #include "common.h"
 #include "complete.h"
+#include "fallback.h" 
 #include "highlight.h"
 #include "pager.h"
 #include "reader.h"
diff --git a/src/pager.h b/src/pager.h
index 7694398f4..c0b322522 100644
--- a/src/pager.h
+++ b/src/pager.h
@@ -2,7 +2,6 @@
 #ifndef FISH_PAGER_H
 #define FISH_PAGER_H
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <memory>
 #include <string>
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index ee2da50d6..7a64f6279 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -11,7 +11,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <termios.h>
diff --git a/src/parse_execution.h b/src/parse_execution.h
index 5c1ee1013..23d27e506 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -4,7 +4,6 @@
 
 #include <stddef.h>
 
-#include <stdbool.h>
 #include "common.h"
 #include "io.h"
 #include "parse_constants.h"
diff --git a/src/parse_productions.h b/src/parse_productions.h
index 38a505d2c..3be0cbaf4 100644
--- a/src/parse_productions.h
+++ b/src/parse_productions.h
@@ -2,7 +2,6 @@
 #ifndef FISH_PARSE_TREE_CONSTRUCTION_H
 #define FISH_PARSE_TREE_CONSTRUCTION_H
 
-#include <stdbool.h>
 #include <sys/types.h>
 
 #include "parse_constants.h"
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index edfdc89ce..9939d81b9 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -12,13 +12,13 @@
 #include <vector>
 
 #include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
+#include "fallback.h" 
 #include "parse_constants.h"
 #include "parse_productions.h"
 #include "parse_tree.h"
 #include "proc.h"
 #include "tokenizer.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "wutil.h" // IWYU pragma: keep
 
 // This array provides strings for each symbol in enum parse_token_type_t in parse_constants.h.
 const wchar_t *const token_type_map[] = {
diff --git a/src/parse_tree.h b/src/parse_tree.h
index 4ec98ae83..a5245aca6 100644
--- a/src/parse_tree.h
+++ b/src/parse_tree.h
@@ -3,7 +3,6 @@
 #define FISH_PARSE_PRODUCTIONS_H
 
 #include <assert.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <memory>
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 48ff69816..bb8f08fdc 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -6,7 +6,6 @@
 
 #include <assert.h>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/src/parse_util.h b/src/parse_util.h
index 98caaea8d..a4d4e29ef 100644
--- a/src/parse_util.h
+++ b/src/parse_util.h
@@ -2,7 +2,6 @@
 #ifndef FISH_PARSE_UTIL_H
 #define FISH_PARSE_UTIL_H
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <vector>
 
diff --git a/src/parser.cpp b/src/parser.cpp
index 6b19f3496..5b9b6a08e 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -2,7 +2,6 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <assert.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <wchar.h>
 #include <algorithm>
diff --git a/src/parser.h b/src/parser.h
index 653ca8c6d..36f01563f 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -2,7 +2,6 @@
 #ifndef FISH_PARSER_H
 #define FISH_PARSER_H
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <list>
 #include <vector>
diff --git a/src/parser_keywords.h b/src/parser_keywords.h
index f922b8262..cab823e58 100644
--- a/src/parser_keywords.h
+++ b/src/parser_keywords.h
@@ -2,8 +2,6 @@
 #ifndef FISH_PARSER_KEYWORD_H
 #define FISH_PARSER_KEYWORD_H
 
-#include <stdbool.h>
-
 #include "common.h"
 
 /// Tests if the specified commands parameters should be interpreted as another command, which will
diff --git a/src/path.h b/src/path.h
index 1415859a2..338b6144e 100644
--- a/src/path.h
+++ b/src/path.h
@@ -4,7 +4,6 @@
 #ifndef FISH_PATH_H
 #define FISH_PATH_H
 
-#include <stdbool.h>
 #include <stddef.h>
 
 #include "common.h"
diff --git a/src/postfork.h b/src/postfork.h
index ed441de39..c12053200 100644
--- a/src/postfork.h
+++ b/src/postfork.h
@@ -12,7 +12,6 @@
 #ifndef FISH_USE_POSIX_SPAWN
 #define FISH_USE_POSIX_SPAWN HAVE_SPAWN_H
 #endif
-#include <stdbool.h>
 
 class io_chain_t;
 class job_t;
diff --git a/src/proc.cpp b/src/proc.cpp
index ec1d86d50..1f1dd3ae5 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -28,7 +28,6 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#include <stdbool.h>
 #include <sys/time.h>  // IWYU pragma: keep
 #include <sys/types.h>
 #include <algorithm>  // IWYU pragma: keep
diff --git a/src/proc.h b/src/proc.h
index 704f87195..9649950aa 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -7,7 +7,6 @@
 
 #include <assert.h>
 #include <signal.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <sys/time.h>  // IWYU pragma: keep
 #include <termios.h>
diff --git a/src/reader.h b/src/reader.h
index df667e9ef..61d757167 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -4,7 +4,6 @@
 #ifndef FISH_READER_H
 #define FISH_READER_H
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <string>
 #include <vector>
diff --git a/src/screen.h b/src/screen.h
index 74cda3beb..abe76df20 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -10,7 +10,6 @@
 #define FISH_SCREEN_H
 
 #include <assert.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <sys/stat.h>
 #include <memory>
diff --git a/src/signal.cpp b/src/signal.cpp
index 60066d3d2..213b2ffb7 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -8,7 +8,6 @@
 #include <siginfo.h>
 #endif
 #include <pthread.h>
-#include <stdbool.h>
 
 #include "common.h"
 #include "event.h"
diff --git a/src/signal.h b/src/signal.h
index fa24cc2b2..2800caf64 100644
--- a/src/signal.h
+++ b/src/signal.h
@@ -3,7 +3,6 @@
 #define FISH_SIGNALH
 
 #include <signal.h>
-#include <stdbool.h>
 
 /// Get the integer signal value representing the specified signal, or -1 of no signal was found.
 int wcs2sig(const wchar_t *str);
diff --git a/src/tokenizer.h b/src/tokenizer.h
index c223e438a..c87a696b2 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -3,7 +3,6 @@
 #ifndef FISH_TOKENIZER_H
 #define FISH_TOKENIZER_H
 
-#include <stdbool.h>
 #include <stddef.h>
 
 #include "common.h"
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 9438ea291..cb11e6a5f 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -5,7 +5,6 @@
 #include <assert.h>
 #include <dirent.h>
 #include <errno.h>
-#include <stdbool.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/wildcard.h b/src/wildcard.h
index 1ed7cc893..5229ee027 100644
--- a/src/wildcard.h
+++ b/src/wildcard.h
@@ -3,7 +3,6 @@
 #ifndef FISH_WILDCARD_H
 #define FISH_WILDCARD_H
 
-#include <stdbool.h>
 #include <vector>
 
 #include "common.h"
diff --git a/src/wutil.h b/src/wutil.h
index b5c77870d..ba3854cbf 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -3,7 +3,6 @@
 #define FISH_WUTIL_H
 
 #include <dirent.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>