aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Aaron Gyes <me@aaron.gy>2016-06-23 17:24:19 -0700
committerGravatar Aaron Gyes <me@aaron.gy>2016-06-23 17:26:08 -0700
commitfa78a7101c3f19aa0ac148f7184aafb1d32bb701 (patch)
tree3a7af19985c9908418cb7c91694f077b50ed41d4
parent5d680f6dbc86e69990b3b2e8ab8027f785ef4720 (diff)
Make IWYU output in lint.cpp less messy
And re-run IWYU, adjust #includes.
-rwxr-xr-xbuild_tools/lint.fish12
-rw-r--r--src/autoload.cpp2
-rw-r--r--src/autoload.h1
-rw-r--r--src/builtin.cpp3
-rw-r--r--src/builtin_commandline.cpp1
-rw-r--r--src/builtin_complete.cpp3
-rw-r--r--src/builtin_jobs.cpp1
-rw-r--r--src/builtin_printf.cpp1
-rw-r--r--src/builtin_set.cpp1
-rw-r--r--src/builtin_set_color.cpp1
-rw-r--r--src/builtin_string.cpp1
-rw-r--r--src/builtin_test.cpp1
-rw-r--r--src/color.h1
-rw-r--r--src/common.cpp2
-rw-r--r--src/common.h3
-rw-r--r--src/complete.cpp2
-rw-r--r--src/complete.h1
-rw-r--r--src/env.cpp1
-rw-r--r--src/env.h1
-rw-r--r--src/env_universal_common.cpp1
-rw-r--r--src/env_universal_common.h1
-rw-r--r--src/event.cpp1
-rw-r--r--src/event.h1
-rw-r--r--src/exec.cpp1
-rw-r--r--src/exec.h1
-rw-r--r--src/expand.h1
-rw-r--r--src/fish.cpp1
-rw-r--r--src/fish_indent.cpp1
-rw-r--r--src/fish_key_reader.cpp1
-rw-r--r--src/fish_tests.cpp9
-rw-r--r--src/function.cpp1
-rw-r--r--src/function.h1
-rw-r--r--src/highlight.h1
-rw-r--r--src/history.h1
-rw-r--r--src/input.h1
-rw-r--r--src/input_common.cpp1
-rw-r--r--src/intern.cpp1
-rw-r--r--src/io.h1
-rw-r--r--src/iothread.cpp2
-rw-r--r--src/output.h1
-rw-r--r--src/pager.cpp1
-rw-r--r--src/pager.h1
-rw-r--r--src/parse_execution.cpp1
-rw-r--r--src/parse_execution.h1
-rw-r--r--src/parse_productions.h1
-rw-r--r--src/parse_tree.cpp4
-rw-r--r--src/parse_tree.h1
-rw-r--r--src/parse_util.cpp1
-rw-r--r--src/parse_util.h1
-rw-r--r--src/parser.cpp1
-rw-r--r--src/parser.h1
-rw-r--r--src/parser_keywords.h2
-rw-r--r--src/path.h1
-rw-r--r--src/postfork.h1
-rw-r--r--src/proc.cpp1
-rw-r--r--src/proc.h1
-rw-r--r--src/reader.h1
-rw-r--r--src/screen.h1
-rw-r--r--src/signal.cpp1
-rw-r--r--src/signal.h1
-rw-r--r--src/tokenizer.h1
-rw-r--r--src/wildcard.cpp1
-rw-r--r--src/wildcard.h1
-rw-r--r--src/wutil.h1
64 files changed, 22 insertions, 75 deletions
diff --git a/build_tools/lint.fish b/build_tools/lint.fish
index f3350aee..5d9e4443 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 56292fc6..9ccd304c 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 efa8c16d..a5bd206c 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 248ca323..5033ca5d 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 0a76ef84..e22f8d9e 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 f4e3b36f..a3e14fde 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 f5f7a059..72765cb8 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 d3d971ac..9f3ea7bc 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 cbd0a871..a7f1ddb8 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 659e6536..e6679562 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 a2ac0244..0f01096d 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 da63270d..09d7337b 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 2466e9e8..fd756d0a 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 b0e96789..146f0780 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 0c1b77d4..85b2dcc6 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 e23e9ce1..43d36290 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 4fd8dbed..e573ad3d 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 0ec45448..606a094f 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 e758a594..6f783312 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 6808558f..8f55ca26 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 658f3f41..0675cbe5 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 3da57dfa..84a4d31e 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 1e48efd4..077731c7 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 a5bdbc0b..d79b1e7f 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 1c402a6f..5a7fa78c 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 2f1dd2a6..bf4c1233 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 9482bd3f..12688cee 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 06a0e0e4..ee2a4f80 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 8755d2d1..3d1502d0 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 d753ac78..c78e6c82 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 21f7d963..ab2a5a43 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 59b37051..bd193104 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 c503e97a..e708733d 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 114df957..939dec3f 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 9e6b7523..13ed5bea 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 405e0d6e..cf5421a8 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 9030ef8a..cc807e49 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 a105e67f..f8149a81 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 be08e451..f79910e2 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 2ecebfbf..a7f87fab 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 386bd664..8867c5e3 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 7694398f..c0b32252 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 ee2da50d..7a64f627 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 5c1ee101..23d27e50 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 38a505d2..3be0cbaf 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 edfdc89c..9939d81b 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 4ec98ae8..a5245aca 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 48ff6981..bb8f08fd 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 98caaea8..a4d4e29e 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 6b19f349..5b9b6a08 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 653ca8c6..36f01563 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 f922b826..cab823e5 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 1415859a..338b6144 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 ed441de3..c1205320 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 ec1d86d5..1f1dd3ae 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 704f8719..9649950a 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 df667e9e..61d75716 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 74cda3be..abe76df2 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 60066d3d..213b2ffb 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 fa24cc2b..2800caf6 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 c223e438..c87a696b 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 9438ea29..cb11e6a5 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 1ed7cc89..5229ee02 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 b5c77870..ba3854cb 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>