From eb990c07c8f575b954acf43ac622050cac49e840 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <var.log@icloud.com>
Date: Tue, 9 Nov 2021 17:07:15 -0800
Subject: [PATCH] Let's make src/ easier to grok, move builins to src/builtins

+ No functional change here, just renames and #include changes.
+ CMake can't have slashes in the target names. I'm suspciious of
  that weird machinery for test, but I made it work.
+ A couple of builtins did not include their own headers, that
  is no longer the case.
---
 CMakeLists.txt                                | 32 ++++-----
 cmake/Tests.cmake                             |  8 +--
 src/builtin.cpp                               | 70 +++++++++----------
 .../argparse.cpp}                             | 22 +++---
 .../argparse.h}                               |  2 +-
 src/{builtin_bg.cpp => builtins/bg.cpp}       | 18 ++---
 src/{builtin_bg.h => builtins/bg.h}           |  2 +-
 src/{builtin_bind.cpp => builtins/bind.cpp}   | 16 ++---
 src/{builtin_bind.h => builtins/bind.h}       |  2 +-
 src/{builtin_block.cpp => builtins/block.cpp} | 18 ++---
 src/{builtin_block.h => builtins/block.h}     |  2 +-
 .../builtin.cpp}                              | 12 ++--
 src/{builtin_builtin.h => builtins/builtin.h} |  2 +-
 src/{builtin_cd.cpp => builtins/cd.cpp}       | 20 +++---
 src/{builtin_cd.h => builtins/cd.h}           |  2 +-
 .../command.cpp}                              | 18 ++---
 src/{builtin_command.h => builtins/command.h} |  2 +-
 .../commandline.cpp}                          | 25 +++----
 .../commandline.h}                            |  4 +-
 .../complete.cpp}                             | 31 ++++----
 .../complete.h}                               |  4 +-
 .../contains.cpp}                             | 14 ++--
 .../contains.h}                               |  2 +-
 .../disown.cpp}                               | 16 ++---
 src/{builtin_disown.h => builtins/disown.h}   |  2 +-
 src/{builtin_echo.cpp => builtins/echo.cpp}   | 14 ++--
 src/{builtin_echo.h => builtins/echo.h}       |  2 +-
 src/{builtin_emit.cpp => builtins/emit.cpp}   | 14 ++--
 src/{builtin_emit.h => builtins/emit.h}       |  2 +-
 src/{builtin_eval.cpp => builtins/eval.cpp}   | 18 ++---
 src/{builtin_eval.h => builtins/eval.h}       |  2 +-
 src/{builtin_exit.cpp => builtins/exit.cpp}   | 20 +++---
 src/{builtin_exit.h => builtins/exit.h}       |  2 +-
 src/{builtin_fg.cpp => builtins/fg.cpp}       | 24 +++----
 src/{builtin_fg.h => builtins/fg.h}           |  2 +-
 .../function.cpp}                             | 28 ++++----
 .../function.h}                               |  4 +-
 .../functions.cpp}                            | 36 +++++-----
 .../functions.h}                              |  2 +-
 .../history.cpp}                              | 22 +++---
 src/{builtin_history.h => builtins/history.h} |  2 +-
 src/{builtin_jobs.cpp => builtins/jobs.cpp}   | 16 ++---
 src/{builtin_jobs.h => builtins/jobs.h}       |  4 +-
 src/{builtin_math.cpp => builtins/math.cpp}   | 16 ++---
 src/{builtin_math.h => builtins/math.h}       |  2 +-
 .../printf.cpp}                               | 11 +--
 src/{builtin_printf.h => builtins/printf.h}   |  4 +-
 src/{builtin_pwd.cpp => builtins/pwd.cpp}     | 16 ++---
 src/{builtin_pwd.h => builtins/pwd.h}         |  2 +-
 .../random.cpp}                               | 12 ++--
 src/{builtin_random.h => builtins/random.h}   |  2 +-
 src/{builtin_read.cpp => builtins/read.cpp}   | 32 ++++-----
 src/{builtin_read.h => builtins/read.h}       |  2 +-
 .../realpath.cpp}                             | 16 ++---
 .../realpath.h}                               |  2 +-
 .../return.cpp}                               | 18 ++---
 src/{builtin_return.h => builtins/return.h}   |  2 +-
 src/{builtin_set.cpp => builtins/set.cpp}     | 26 +++----
 src/{builtin_set.h => builtins/set.h}         |  2 +-
 .../set_color.cpp}                            | 19 ++---
 .../set_color.h}                              |  4 +-
 .../source.cpp}                               | 22 +++---
 src/{builtin_source.h => builtins/source.h}   |  2 +-
 .../status.cpp}                               | 22 +++---
 src/{builtin_status.h => builtins/status.h}   |  2 +-
 .../string.cpp}                               | 25 ++++---
 src/{builtin_string.h => builtins/string.h}   |  4 +-
 src/{builtin_test.cpp => builtins/test.cpp}   | 11 +--
 src/{builtin_test.h => builtins/test.h}       |  2 +-
 src/{builtin_type.cpp => builtins/type.cpp}   | 28 ++++----
 src/{builtin_type.h => builtins/type.h}       |  2 +-
 .../ulimit.cpp}                               | 14 ++--
 src/{builtin_ulimit.h => builtins/ulimit.h}   |  2 +-
 src/{builtin_wait.cpp => builtins/wait.cpp}   | 22 +++---
 src/{builtin_wait.h => builtins/wait.h}       |  2 +-
 src/env.cpp                                   |  2 +-
 src/fish_tests.cpp                            |  2 +-
 src/parse_execution.cpp                       |  2 +-
 78 files changed, 460 insertions(+), 454 deletions(-)
 rename src/{builtin_argparse.cpp => builtins/argparse.cpp} (98%)
 rename src/{builtin_argparse.h => builtins/argparse.h} (92%)
 rename src/{builtin_bg.cpp => builtins/bg.cpp} (92%)
 rename src/{builtin_bg.h => builtins/bg.h} (91%)
 rename src/{builtin_bind.cpp => builtins/bind.cpp} (98%)
 rename src/{builtin_bind.h => builtins/bind.h} (92%)
 rename src/{builtin_block.cpp => builtins/block.cpp} (94%)
 rename src/{builtin_block.h => builtins/block.h} (91%)
 rename src/{builtin_builtin.cpp => builtins/builtin.cpp} (94%)
 rename src/{builtin_builtin.h => builtins/builtin.h} (92%)
 rename src/{builtin_cd.cpp => builtins/cd.cpp} (94%)
 rename src/{builtin_cd.h => builtins/cd.h} (91%)
 rename src/{builtin_command.cpp => builtins/command.cpp} (93%)
 rename src/{builtin_command.h => builtins/command.h} (92%)
 rename src/{builtin_commandline.cpp => builtins/commandline.cpp} (98%)
 rename src/{builtin_commandline.h => builtins/commandline.h} (88%)
 rename src/{builtin_complete.cpp => builtins/complete.cpp} (97%)
 rename src/{builtin_complete.h => builtins/complete.h} (87%)
 rename src/{builtin_contains.cpp => builtins/contains.cpp} (92%)
 rename src/{builtin_contains.h => builtins/contains.h} (92%)
 rename src/{builtin_disown.cpp => builtins/disown.cpp} (94%)
 rename src/{builtin_disown.h => builtins/disown.h} (91%)
 rename src/{builtin_echo.cpp => builtins/echo.cpp} (97%)
 rename src/{builtin_echo.h => builtins/echo.h} (91%)
 rename src/{builtin_emit.cpp => builtins/emit.cpp} (82%)
 rename src/{builtin_emit.h => builtins/emit.h} (91%)
 rename src/{builtin_eval.cpp => builtins/eval.cpp} (91%)
 rename src/{builtin_eval.h => builtins/eval.h} (91%)
 rename src/{builtin_exit.cpp => builtins/exit.cpp} (91%)
 rename src/{builtin_exit.h => builtins/exit.h} (91%)
 rename src/{builtin_fg.cpp => builtins/fg.cpp} (92%)
 rename src/{builtin_fg.h => builtins/fg.h} (91%)
 rename src/{builtin_function.cpp => builtins/function.cpp} (97%)
 rename src/{builtin_function.h => builtins/function.h} (90%)
 rename src/{builtin_functions.cpp => builtins/functions.cpp} (96%)
 rename src/{builtin_functions.h => builtins/functions.h} (92%)
 rename src/{builtin_history.cpp => builtins/history.cpp} (97%)
 rename src/{builtin_history.h => builtins/history.h} (92%)
 rename src/{builtin_jobs.cpp => builtins/jobs.cpp} (97%)
 rename src/{builtin_jobs.h => builtins/jobs.h} (87%)
 rename src/{builtin_math.cpp => builtins/math.cpp} (97%)
 rename src/{builtin_math.h => builtins/math.h} (91%)
 rename src/{builtin_printf.cpp => builtins/printf.cpp} (99%)
 rename src/{builtin_printf.h => builtins/printf.h} (87%)
 rename src/{builtin_pwd.cpp => builtins/pwd.cpp} (91%)
 rename src/{builtin_pwd.h => builtins/pwd.h} (91%)
 rename src/{builtin_random.cpp => builtins/random.cpp} (96%)
 rename src/{builtin_random.h => builtins/random.h} (91%)
 rename src/{builtin_read.cpp => builtins/read.cpp} (98%)
 rename src/{builtin_read.h => builtins/read.h} (91%)
 rename src/{builtin_realpath.cpp => builtins/realpath.cpp} (94%)
 rename src/{builtin_realpath.h => builtins/realpath.h} (92%)
 rename src/{builtin_return.cpp => builtins/return.cpp} (92%)
 rename src/{builtin_return.h => builtins/return.h} (91%)
 rename src/{builtin_set.cpp => builtins/set.cpp} (98%)
 rename src/{builtin_set.h => builtins/set.h} (92%)
 rename src/{builtin_set_color.cpp => builtins/set_color.cpp} (97%)
 rename src/{builtin_set_color.h => builtins/set_color.h} (87%)
 rename src/{builtin_source.cpp => builtins/source.cpp} (93%)
 rename src/{builtin_source.h => builtins/source.h} (91%)
 rename src/{builtin_status.cpp => builtins/status.cpp} (98%)
 rename src/{builtin_status.h => builtins/status.h} (91%)
 rename src/{builtin_string.cpp => builtins/string.cpp} (99%)
 rename src/{builtin_string.h => builtins/string.h} (87%)
 rename src/{builtin_test.cpp => builtins/test.cpp} (99%)
 rename src/{builtin_test.h => builtins/test.h} (92%)
 rename src/{builtin_type.cpp => builtins/type.cpp} (95%)
 rename src/{builtin_type.h => builtins/type.h} (91%)
 rename src/{builtin_ulimit.cpp => builtins/ulimit.cpp} (97%)
 rename src/{builtin_ulimit.h => builtins/ulimit.h} (93%)
 rename src/{builtin_wait.cpp => builtins/wait.cpp} (95%)
 rename src/{builtin_wait.h => builtins/wait.h} (91%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 063ef3906..3447bb8fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,9 +57,9 @@ add_definitions(-UNDEBUG)
 source_group("CMake Rules" REGULAR_EXPRESSION "^$")
 
 # Put source and header files at top level under targets.
-source_group("Source Files" REGULAR_EXPRESSION "^$")
-source_group("Header Files" REGULAR_EXPRESSION "^$")
-source_group("Builtins" REGULAR_EXPRESSION "builtin_.*")
+source_group("Source Files" REGULAR_EXPRESSION ".*\\.cpp")
+source_group("Header Files" REGULAR_EXPRESSION ".*\\.h")
+source_group("Builtins" "builtins/")
 
 # Support folders.
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -85,19 +85,19 @@ endif()
 
 # All objects that the system needs to build fish, except fish.cpp
 set(FISH_SRCS
-    src/ast.cpp src/autoload.cpp src/builtin.cpp src/builtin_argparse.cpp
-    src/builtin_bg.cpp src/builtin_bind.cpp src/builtin_block.cpp
-    src/builtin_builtin.cpp src/builtin_cd.cpp src/builtin_command.cpp
-    src/builtin_commandline.cpp src/builtin_complete.cpp src/builtin_contains.cpp
-    src/builtin_disown.cpp src/builtin_echo.cpp src/builtin_emit.cpp
-    src/builtin_eval.cpp src/builtin_exit.cpp src/builtin_fg.cpp
-    src/builtin_function.cpp src/builtin_functions.cpp src/builtin_history.cpp
-    src/builtin_jobs.cpp src/builtin_math.cpp src/builtin_printf.cpp
-    src/builtin_pwd.cpp src/builtin_random.cpp src/builtin_read.cpp
-    src/builtin_realpath.cpp src/builtin_return.cpp src/builtin_set.cpp
-    src/builtin_set_color.cpp src/builtin_source.cpp src/builtin_status.cpp
-    src/builtin_string.cpp src/builtin_test.cpp src/builtin_type.cpp src/builtin_ulimit.cpp
-    src/builtin_wait.cpp src/color.cpp src/common.cpp src/complete.cpp src/env.cpp
+    src/ast.cpp src/autoload.cpp src/builtin.cpp src/builtins/argparse.cpp
+    src/builtins/bg.cpp src/builtins/bind.cpp src/builtins/block.cpp
+    src/builtins/builtin.cpp src/builtins/cd.cpp src/builtins/command.cpp
+    src/builtins/commandline.cpp src/builtins/complete.cpp src/builtins/contains.cpp
+    src/builtins/disown.cpp src/builtins/echo.cpp src/builtins/emit.cpp
+    src/builtins/eval.cpp src/builtins/exit.cpp src/builtins/fg.cpp
+    src/builtins/function.cpp src/builtins/functions.cpp src/builtins/history.cpp
+    src/builtins/jobs.cpp src/builtins/math.cpp src/builtins/printf.cpp
+    src/builtins/pwd.cpp src/builtins/random.cpp src/builtins/read.cpp
+    src/builtins/realpath.cpp src/builtins/return.cpp src/builtins/set.cpp
+    src/builtins/set_color.cpp src/builtins/source.cpp src/builtins/status.cpp
+    src/builtins/string.cpp src/builtins/test.cpp src/builtins/type.cpp src/builtins/ulimit.cpp
+    src/builtins/wait.cpp src/color.cpp src/common.cpp src/complete.cpp src/env.cpp
     src/env_dispatch.cpp src/env_universal_common.cpp src/event.cpp src/exec.cpp
     src/expand.cpp src/fallback.cpp src/fd_monitor.cpp src/fish_version.cpp
     src/flog.cpp src/function.cpp src/future_feature_flags.cpp src/highlight.cpp
diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
index 5c28fdf2d..9a57da46b 100644
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -107,11 +107,9 @@ set(CMAKE_XCODE_GENERATE_SCHEME 0)
 # and the only dependency a test can have is on another test. So we make building fish and
 # `fish_tests` prerequisites to our entire top-level `test` target.
 function(add_test_target NAME)
-  add_custom_target("test_${NAME}"
-    COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -R "^${NAME}$$"
-    DEPENDS fish_tests tests_buildroot_target
-    USES_TERMINAL
-  )
+  string(REPLACE "/" "-" NAME ${NAME})
+  add_custom_target("test_${NAME}" COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -R "^${NAME}$$"
+    DEPENDS fish_tests tests_buildroot_target USES_TERMINAL )
 endfunction()
 
 add_custom_target(tests_buildroot_target
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 185ab7f76..30f08af91 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -30,41 +30,41 @@
 #include <memory>
 #include <string>
 
-#include "builtin_argparse.h"
-#include "builtin_bg.h"
-#include "builtin_bind.h"
-#include "builtin_block.h"
-#include "builtin_builtin.h"
-#include "builtin_cd.h"
-#include "builtin_command.h"
-#include "builtin_commandline.h"
-#include "builtin_complete.h"
-#include "builtin_contains.h"
-#include "builtin_disown.h"
-#include "builtin_echo.h"
-#include "builtin_emit.h"
-#include "builtin_eval.h"
-#include "builtin_exit.h"
-#include "builtin_fg.h"
-#include "builtin_functions.h"
-#include "builtin_history.h"
-#include "builtin_jobs.h"
-#include "builtin_math.h"
-#include "builtin_printf.h"
-#include "builtin_pwd.h"
-#include "builtin_random.h"
-#include "builtin_read.h"
-#include "builtin_realpath.h"
-#include "builtin_return.h"
-#include "builtin_set.h"
-#include "builtin_set_color.h"
-#include "builtin_source.h"
-#include "builtin_status.h"
-#include "builtin_string.h"
-#include "builtin_test.h"
-#include "builtin_type.h"
-#include "builtin_ulimit.h"
-#include "builtin_wait.h"
+#include "builtins/argparse.h"
+#include "builtins/bg.h"
+#include "builtins/bind.h"
+#include "builtins/block.h"
+#include "builtins/builtin.h"
+#include "builtins/cd.h"
+#include "builtins/command.h"
+#include "builtins/commandline.h"
+#include "builtins/complete.h"
+#include "builtins/contains.h"
+#include "builtins/disown.h"
+#include "builtins/echo.h"
+#include "builtins/emit.h"
+#include "builtins/eval.h"
+#include "builtins/exit.h"
+#include "builtins/fg.h"
+#include "builtins/functions.h"
+#include "builtins/history.h"
+#include "builtins/jobs.h"
+#include "builtins/math.h"
+#include "builtins/printf.h"
+#include "builtins/pwd.h"
+#include "builtins/random.h"
+#include "builtins/read.h"
+#include "builtins/realpath.h"
+#include "builtins/return.h"
+#include "builtins/set.h"
+#include "builtins/set_color.h"
+#include "builtins/source.h"
+#include "builtins/status.h"
+#include "builtins/string.h"
+#include "builtins/test.h"
+#include "builtins/type.h"
+#include "builtins/ulimit.h"
+#include "builtins/wait.h"
 #include "common.h"
 #include "complete.h"
 #include "exec.h"
diff --git a/src/builtin_argparse.cpp b/src/builtins/argparse.cpp
similarity index 98%
rename from src/builtin_argparse.cpp
rename to src/builtins/argparse.cpp
index 66df15a73..53824abc3 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtins/argparse.cpp
@@ -3,7 +3,7 @@
 // See issue #4190 for the rationale behind the original behavior of this builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_argparse.h"
+#include "argparse.h"
 
 #include <algorithm>
 #include <cerrno>
@@ -16,16 +16,16 @@
 #include <utility>
 #include <vector>
 
-#include "builtin.h"
-#include "common.h"
-#include "env.h"
-#include "exec.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "parser.h"
-#include "wcstringutil.h"
-#include "wgetopt.h"  // IWYU pragma: keep
-#include "wutil.h"    // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../env.h"
+#include "../exec.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../parser.h"
+#include "../wcstringutil.h"
+#include "../wgetopt.h"  // IWYU pragma: keep
+#include "../wutil.h"    // IWYU pragma: keep
 
 static const wcstring var_name_prefix = L"_flag_";
 
diff --git a/src/builtin_argparse.h b/src/builtins/argparse.h
similarity index 92%
rename from src/builtin_argparse.h
rename to src/builtins/argparse.h
index 8d0422adc..97272b380 100644
--- a/src/builtin_argparse.h
+++ b/src/builtins/argparse.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_ARGPARSE_H
 #define FISH_BUILTIN_ARGPARSE_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_bg.cpp b/src/builtins/bg.cpp
similarity index 92%
rename from src/builtin_bg.cpp
rename to src/builtins/bg.cpp
index 591456844..804b8aaa9 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtins/bg.cpp
@@ -1,21 +1,21 @@
 // Implementation of the bg builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_bg.h"
+#include "bg.h"
 
 #include <cerrno>
 #include <cstdlib>
 #include <memory>
 #include <vector>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "job_group.h"
-#include "parser.h"
-#include "proc.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../job_group.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 /// Helper function for builtin_bg().
 static int send_to_bg(parser_t &parser, io_streams_t &streams, job_t *j) {
diff --git a/src/builtin_bg.h b/src/builtins/bg.h
similarity index 91%
rename from src/builtin_bg.h
rename to src/builtins/bg.h
index 133c2cb57..cc4e857bd 100644
--- a/src/builtin_bg.h
+++ b/src/builtins/bg.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_BG_H
 #define FISH_BUILTIN_BG_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_bind.cpp b/src/builtins/bind.cpp
similarity index 98%
rename from src/builtin_bind.cpp
rename to src/builtins/bind.cpp
index 8b91e9b2d..555c7e619 100644
--- a/src/builtin_bind.cpp
+++ b/src/builtins/bind.cpp
@@ -1,7 +1,7 @@
 // Implementation of the bind builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_bind.h"
+#include "bind.h"
 
 #include <cerrno>
 #include <cstddef>
@@ -10,13 +10,13 @@
 #include <string>
 #include <vector>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "input.h"     // IWYU pragma: keep
-#include "io.h"        // IWYU pragma: keep
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../input.h"     // IWYU pragma: keep
+#include "../io.h"        // IWYU pragma: keep
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 enum { BIND_INSERT, BIND_ERASE, BIND_KEY_NAMES, BIND_FUNCTION_NAMES };
 struct bind_cmd_opts_t {
diff --git a/src/builtin_bind.h b/src/builtins/bind.h
similarity index 92%
rename from src/builtin_bind.h
rename to src/builtins/bind.h
index 8539aff9b..bbb25df45 100644
--- a/src/builtin_bind.h
+++ b/src/builtins/bind.h
@@ -4,7 +4,7 @@
 
 #include <cwchar>
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_block.cpp b/src/builtins/block.cpp
similarity index 94%
rename from src/builtin_block.cpp
rename to src/builtins/block.cpp
index 6b9491a5c..f9851bf5e 100644
--- a/src/builtin_block.cpp
+++ b/src/builtins/block.cpp
@@ -1,18 +1,18 @@
 // Implementation of the bind builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_block.h"
+#include "block.h"
 
 #include <cstddef>
 
-#include "builtin.h"
-#include "common.h"
-#include "event.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "parser.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../event.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../parser.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 enum { UNSET, GLOBAL, LOCAL };
 struct block_cmd_opts_t {
diff --git a/src/builtin_block.h b/src/builtins/block.h
similarity index 91%
rename from src/builtin_block.h
rename to src/builtins/block.h
index 5b7b4234b..5a6897258 100644
--- a/src/builtin_block.h
+++ b/src/builtins/block.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_BLOCK_H
 #define FISH_BUILTIN_BLOCK_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_builtin.cpp b/src/builtins/builtin.cpp
similarity index 94%
rename from src/builtin_builtin.cpp
rename to src/builtins/builtin.cpp
index 7096a6cdd..d2bd331a6 100644
--- a/src/builtin_builtin.cpp
+++ b/src/builtins/builtin.cpp
@@ -7,12 +7,12 @@
 #include <cstddef>
 #include <string>
 
-#include "builtin_builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 struct builtin_cmd_opts_t {
     bool print_help = false;
diff --git a/src/builtin_builtin.h b/src/builtins/builtin.h
similarity index 92%
rename from src/builtin_builtin.h
rename to src/builtins/builtin.h
index ec247fcac..355320cb2 100644
--- a/src/builtin_builtin.h
+++ b/src/builtins/builtin.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_BUILTIN_H
 #define FISH_BUILTIN_BUILTIN_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_cd.cpp b/src/builtins/cd.cpp
similarity index 94%
rename from src/builtin_cd.cpp
rename to src/builtins/cd.cpp
index 23da07483..9e7847d02 100644
--- a/src/builtin_cd.cpp
+++ b/src/builtins/cd.cpp
@@ -1,22 +1,22 @@
 // Implementation of the cd builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_cd.h"
+#include "cd.h"
 
 #include <fcntl.h>
 #include <sys/stat.h>
 
 #include <cerrno>
 
-#include "builtin.h"
-#include "common.h"
-#include "env.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "parser.h"
-#include "path.h"
-#include "proc.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../env.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../parser.h"
+#include "../path.h"
+#include "../proc.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 /// The cd builtin. Changes the current directory to the one specified or to $HOME if none is
 /// specified. The directory can be relative to any directory in the CDPATH variable.
diff --git a/src/builtin_cd.h b/src/builtins/cd.h
similarity index 91%
rename from src/builtin_cd.h
rename to src/builtins/cd.h
index 26070e6c7..0573ed08f 100644
--- a/src/builtin_cd.h
+++ b/src/builtins/cd.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_CD_H
 #define FISH_BUILTIN_CD_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_command.cpp b/src/builtins/command.cpp
similarity index 93%
rename from src/builtin_command.cpp
rename to src/builtins/command.cpp
index 53d826a3c..71b0e0530 100644
--- a/src/builtin_command.cpp
+++ b/src/builtins/command.cpp
@@ -1,20 +1,20 @@
 // Implementation of the command builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_command.h"
+#include "command.h"
 
 #include <unistd.h>
 
 #include <string>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "parser.h"
-#include "path.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../parser.h"
+#include "../path.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 struct command_cmd_opts_t {
     bool print_help = false;
diff --git a/src/builtin_command.h b/src/builtins/command.h
similarity index 92%
rename from src/builtin_command.h
rename to src/builtins/command.h
index 84c7a7672..833363304 100644
--- a/src/builtin_command.h
+++ b/src/builtins/command.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_COMMAND_H
 #define FISH_BUILTIN_COMMAND_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_commandline.cpp b/src/builtins/commandline.cpp
similarity index 98%
rename from src/builtin_commandline.cpp
rename to src/builtins/commandline.cpp
index f54606bb1..212558eaa 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtins/commandline.cpp
@@ -1,23 +1,24 @@
 // Functions used for implementing the commandline builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "commandline.h"
+
 #include <cerrno>
 #include <cstddef>
 #include <cstdlib>
 #include <cwchar>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "input.h"
-#include "io.h"
-#include "parse_util.h"
-#include "parser.h"
-#include "proc.h"
-#include "reader.h"
-#include "tokenizer.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../input.h"
+#include "../parse_util.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../reader.h"
+#include "../tokenizer.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 class parser_t;
 
diff --git a/src/builtin_commandline.h b/src/builtins/commandline.h
similarity index 88%
rename from src/builtin_commandline.h
rename to src/builtins/commandline.h
index 38e841b82..45aac048a 100644
--- a/src/builtin_commandline.h
+++ b/src/builtins/commandline.h
@@ -5,8 +5,8 @@
 #include <cstring>
 #include <cwchar>
 
-#include "io.h"
-#include "maybe.h"
+#include "../io.h"
+#include "../maybe.h"
 
 class parser_t;
 
diff --git a/src/builtin_complete.cpp b/src/builtins/complete.cpp
similarity index 97%
rename from src/builtin_complete.cpp
rename to src/builtins/complete.cpp
index dbd6f3506..abbfd347b 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtins/complete.cpp
@@ -1,27 +1,28 @@
 // Functions used for implementing the complete builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "complete.h"
+
 #include <cstddef>
 #include <cwchar>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "builtin.h"
-#include "color.h"
-#include "common.h"
-#include "complete.h"
-#include "env.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "highlight.h"
-#include "io.h"
-#include "parse_constants.h"
-#include "parse_util.h"
-#include "parser.h"
-#include "reader.h"
-#include "wcstringutil.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../color.h"
+#include "../common.h"
+#include "../complete.h"
+#include "../env.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../highlight.h"
+#include "../parse_constants.h"
+#include "../parse_util.h"
+#include "../parser.h"
+#include "../reader.h"
+#include "../wcstringutil.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 // builtin_complete_* are a set of rather silly looping functions that make sure that all the proper
 // combinations of complete_add or complete_remove get called. This is needed since complete allows
diff --git a/src/builtin_complete.h b/src/builtins/complete.h
similarity index 87%
rename from src/builtin_complete.h
rename to src/builtins/complete.h
index 70cc0a7b4..8462ffeb6 100644
--- a/src/builtin_complete.h
+++ b/src/builtins/complete.h
@@ -5,8 +5,8 @@
 #include <cstring>
 #include <cwchar>
 
-#include "io.h"
-#include "maybe.h"
+#include "../io.h"
+#include "../maybe.h"
 
 class parser_t;
 
diff --git a/src/builtin_contains.cpp b/src/builtins/contains.cpp
similarity index 92%
rename from src/builtin_contains.cpp
rename to src/builtins/contains.cpp
index ad91667f7..404f923fd 100644
--- a/src/builtin_contains.cpp
+++ b/src/builtins/contains.cpp
@@ -1,18 +1,18 @@
 // Implementation of the contains builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_contains.h"
+#include "contains.h"
 
 #include <unistd.h>
 
 #include <cwchar>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 struct contains_cmd_opts_t {
     bool print_help = false;
diff --git a/src/builtin_contains.h b/src/builtins/contains.h
similarity index 92%
rename from src/builtin_contains.h
rename to src/builtins/contains.h
index 96f00ded1..ba6292b5c 100644
--- a/src/builtin_contains.h
+++ b/src/builtins/contains.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_CONTAINS_H
 #define FISH_BUILTIN_CONTAINS_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_disown.cpp b/src/builtins/disown.cpp
similarity index 94%
rename from src/builtin_disown.cpp
rename to src/builtins/disown.cpp
index 1e5957af1..7173c4a38 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtins/disown.cpp
@@ -1,19 +1,19 @@
 // Implementation of the disown builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_disown.h"
+#include "disown.h"
 
 #include <cerrno>
 #include <csignal>
 #include <set>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "parser.h"
-#include "proc.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 /// Helper for builtin_disown.
 static void disown_job(const wchar_t *cmd, io_streams_t &streams, job_t *j) {
diff --git a/src/builtin_disown.h b/src/builtins/disown.h
similarity index 91%
rename from src/builtin_disown.h
rename to src/builtins/disown.h
index d0eb2debe..1a9d25a6a 100644
--- a/src/builtin_disown.h
+++ b/src/builtins/disown.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_DISOWN_H
 #define FISH_BUILTIN_DISOWN_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_echo.cpp b/src/builtins/echo.cpp
similarity index 97%
rename from src/builtin_echo.cpp
rename to src/builtins/echo.cpp
index 12ed26c19..716309b56 100644
--- a/src/builtin_echo.cpp
+++ b/src/builtins/echo.cpp
@@ -1,17 +1,17 @@
 // Implementation of the echo builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_echo.h"
+#include "echo.h"
 
 #include <climits>
 #include <cstddef>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 struct echo_cmd_opts_t {
     bool print_newline = true;
diff --git a/src/builtin_echo.h b/src/builtins/echo.h
similarity index 91%
rename from src/builtin_echo.h
rename to src/builtins/echo.h
index 7b9d0ba1a..ed4ae2d13 100644
--- a/src/builtin_echo.h
+++ b/src/builtins/echo.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_ECHO_H
 #define FISH_BUILTIN_ECHO_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_emit.cpp b/src/builtins/emit.cpp
similarity index 82%
rename from src/builtin_emit.cpp
rename to src/builtins/emit.cpp
index 97ad03767..e0bb34d89 100644
--- a/src/builtin_emit.cpp
+++ b/src/builtins/emit.cpp
@@ -1,14 +1,14 @@
 // Implementation of the emit builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_emit.h"
+#include "emit.h"
 
-#include "builtin.h"
-#include "common.h"
-#include "event.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../event.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 /// Implementation of the builtin emit command, used to create events.
 maybe_t<int> builtin_emit(parser_t &parser, io_streams_t &streams, const wchar_t **argv) {
diff --git a/src/builtin_emit.h b/src/builtins/emit.h
similarity index 91%
rename from src/builtin_emit.h
rename to src/builtins/emit.h
index fc1b06e8c..b5a21c6dd 100644
--- a/src/builtin_emit.h
+++ b/src/builtins/emit.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_EMIT_H
 #define FISH_BUILTIN_EMIT_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_eval.cpp b/src/builtins/eval.cpp
similarity index 91%
rename from src/builtin_eval.cpp
rename to src/builtins/eval.cpp
index bd95e1390..612126260 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtins/eval.cpp
@@ -4,15 +4,15 @@
 #include <cerrno>
 #include <cstddef>
 
-#include "builtin.h"
-#include "common.h"
-#include "exec.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "parser.h"
-#include "proc.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../exec.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 /// Implementation of eval builtin.
 maybe_t<int> builtin_eval(parser_t &parser, io_streams_t &streams, const wchar_t **argv) {
diff --git a/src/builtin_eval.h b/src/builtins/eval.h
similarity index 91%
rename from src/builtin_eval.h
rename to src/builtins/eval.h
index 128671b4d..042b2aace 100644
--- a/src/builtin_eval.h
+++ b/src/builtins/eval.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_EVAL_H
 #define FISH_BUILTIN_EVAL_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_exit.cpp b/src/builtins/exit.cpp
similarity index 91%
rename from src/builtin_exit.cpp
rename to src/builtins/exit.cpp
index c1a400fb7..18811dcc6 100644
--- a/src/builtin_exit.cpp
+++ b/src/builtins/exit.cpp
@@ -1,20 +1,20 @@
 // Implementation of the exit builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_exit.h"
+#include "exit.h"
 
 #include <cerrno>
 #include <cstddef>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "parser.h"
-#include "proc.h"
-#include "reader.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../reader.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 struct exit_cmd_opts_t {
     bool print_help = false;
diff --git a/src/builtin_exit.h b/src/builtins/exit.h
similarity index 91%
rename from src/builtin_exit.h
rename to src/builtins/exit.h
index 91822b9a5..cf6bbb6db 100644
--- a/src/builtin_exit.h
+++ b/src/builtins/exit.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_EXIT_H
 #define FISH_BUILTIN_EXIT_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_fg.cpp b/src/builtins/fg.cpp
similarity index 92%
rename from src/builtin_fg.cpp
rename to src/builtins/fg.cpp
index 19f155f54..161a13416 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtins/fg.cpp
@@ -1,24 +1,24 @@
 // Implementation of the fg builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_fg.h"
+#include "fg.h"
 
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
 #include <cwchar>
 
-#include "builtin.h"
-#include "common.h"
-#include "env.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "job_group.h"
-#include "parser.h"
-#include "proc.h"
-#include "reader.h"
-#include "tokenizer.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../env.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../job_group.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../reader.h"
+#include "../tokenizer.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 /// Builtin for putting a job in the foreground.
 maybe_t<int> builtin_fg(parser_t &parser, io_streams_t &streams, const wchar_t **argv) {
diff --git a/src/builtin_fg.h b/src/builtins/fg.h
similarity index 91%
rename from src/builtin_fg.h
rename to src/builtins/fg.h
index 713c431b1..5487c58ee 100644
--- a/src/builtin_fg.h
+++ b/src/builtins/fg.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_FG_H
 #define FISH_BUILTIN_FG_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_function.cpp b/src/builtins/function.cpp
similarity index 97%
rename from src/builtin_function.cpp
rename to src/builtins/function.cpp
index cb49b1dc1..82c15eda0 100644
--- a/src/builtin_function.cpp
+++ b/src/builtins/function.cpp
@@ -1,7 +1,7 @@
 // Implementation of the function builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_function.h"
+#include "function.h"
 
 #include <unistd.h>
 
@@ -12,19 +12,19 @@
 #include <string>
 #include <vector>
 
-#include "builtin.h"
-#include "common.h"
-#include "complete.h"
-#include "event.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "function.h"
-#include "io.h"
-#include "parser.h"
-#include "parser_keywords.h"
-#include "proc.h"
-#include "signal.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../complete.h"
+#include "../event.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../function.h"
+#include "../io.h"
+#include "../parser.h"
+#include "../parser_keywords.h"
+#include "../proc.h"
+#include "../signal.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 namespace {
 struct function_cmd_opts_t {
diff --git a/src/builtin_function.h b/src/builtins/function.h
similarity index 90%
rename from src/builtin_function.h
rename to src/builtins/function.h
index ad467ed9a..9e32c5342 100644
--- a/src/builtin_function.h
+++ b/src/builtins/function.h
@@ -2,8 +2,8 @@
 #ifndef FISH_BUILTIN_FUNCTION_H
 #define FISH_BUILTIN_FUNCTION_H
 
-#include "common.h"
-#include "parse_tree.h"
+#include "../common.h"
+#include "../parse_tree.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_functions.cpp b/src/builtins/functions.cpp
similarity index 96%
rename from src/builtin_functions.cpp
rename to src/builtins/functions.cpp
index 2d52b5145..b8b8275e0 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtins/functions.cpp
@@ -1,7 +1,7 @@
 // Implementation of the functions builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_functions.h"
+#include "functions.h"
 
 #include <unistd.h>
 
@@ -14,23 +14,23 @@
 #include <utility>
 #include <vector>
 
-#include "builtin.h"
-#include "common.h"
-#include "complete.h"
-#include "env.h"
-#include "event.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "function.h"
-#include "highlight.h"
-#include "io.h"
-#include "parser.h"
-#include "parser_keywords.h"
-#include "proc.h"
-#include "signal.h"
-#include "termsize.h"
-#include "wcstringutil.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../complete.h"
+#include "../env.h"
+#include "../event.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../function.h"
+#include "../highlight.h"
+#include "../io.h"
+#include "../parser.h"
+#include "../parser_keywords.h"
+#include "../proc.h"
+#include "../signal.h"
+#include "../termsize.h"
+#include "../wcstringutil.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 struct functions_cmd_opts_t {
     bool print_help = false;
diff --git a/src/builtin_functions.h b/src/builtins/functions.h
similarity index 92%
rename from src/builtin_functions.h
rename to src/builtins/functions.h
index 3378d50ed..33ba623cd 100644
--- a/src/builtin_functions.h
+++ b/src/builtins/functions.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_FUNCTIONS_H
 #define FISH_BUILTIN_FUNCTIONS_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_history.cpp b/src/builtins/history.cpp
similarity index 97%
rename from src/builtin_history.cpp
rename to src/builtins/history.cpp
index d6c207c91..e3648b4bf 100644
--- a/src/builtin_history.cpp
+++ b/src/builtins/history.cpp
@@ -1,7 +1,7 @@
 // Implementation of the history builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_history.h"
+#include "history.h"
 
 #include <cerrno>
 #include <cstddef>
@@ -10,16 +10,16 @@
 #include <string>
 #include <vector>
 
-#include "builtin.h"
-#include "common.h"
-#include "enum_map.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "history.h"
-#include "io.h"
-#include "parser.h"
-#include "reader.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../enum_map.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../history.h"
+#include "../io.h"
+#include "../parser.h"
+#include "../reader.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 enum hist_cmd_t {
     HIST_SEARCH = 1,
diff --git a/src/builtin_history.h b/src/builtins/history.h
similarity index 92%
rename from src/builtin_history.h
rename to src/builtins/history.h
index 7ab35a04f..a1a76295c 100644
--- a/src/builtin_history.h
+++ b/src/builtins/history.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_HISTORY_H
 #define FISH_BUILTIN_HISTORY_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_jobs.cpp b/src/builtins/jobs.cpp
similarity index 97%
rename from src/builtin_jobs.cpp
rename to src/builtins/jobs.cpp
index 4071daec4..ab4280d77 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtins/jobs.cpp
@@ -6,14 +6,14 @@
 #include <cerrno>
 #include <cstddef>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "parser.h"
-#include "proc.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 class parser_t;
 
diff --git a/src/builtin_jobs.h b/src/builtins/jobs.h
similarity index 87%
rename from src/builtin_jobs.h
rename to src/builtins/jobs.h
index 36aadea89..d6d8a245f 100644
--- a/src/builtin_jobs.h
+++ b/src/builtins/jobs.h
@@ -5,8 +5,8 @@
 #include <cstring>
 #include <cwchar>
 
-#include "io.h"
-#include "maybe.h"
+#include "../io.h"
+#include "../maybe.h"
 
 class parser_t;
 
diff --git a/src/builtin_math.cpp b/src/builtins/math.cpp
similarity index 97%
rename from src/builtin_math.cpp
rename to src/builtins/math.cpp
index 59b49f413..60a4fa3e3 100644
--- a/src/builtin_math.cpp
+++ b/src/builtins/math.cpp
@@ -1,7 +1,7 @@
 // Implementation of the math builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_math.h"
+#include "math.h"
 
 #include <algorithm>
 #include <cerrno>
@@ -11,13 +11,13 @@
 #include <limits>
 #include <string>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "tinyexpr.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../tinyexpr.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 // The maximum number of points after the decimal that we'll print.
 static constexpr int kDefaultScale = 6;
diff --git a/src/builtin_math.h b/src/builtins/math.h
similarity index 91%
rename from src/builtin_math.h
rename to src/builtins/math.h
index 7b2566d6a..71ca2b547 100644
--- a/src/builtin_math.h
+++ b/src/builtins/math.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_MATH_H
 #define FISH_BUILTIN_MATH_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_printf.cpp b/src/builtins/printf.cpp
similarity index 99%
rename from src/builtin_printf.cpp
rename to src/builtins/printf.cpp
index 460a06819..dc8c2dfc9 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtins/printf.cpp
@@ -50,6 +50,8 @@
 // This file has been imported from source code of printf command in GNU Coreutils version 6.9.
 #include "config.h"  // IWYU pragma: keep
 
+#include "printf.h"
+
 #include <sys/types.h>
 
 #include <cerrno>
@@ -63,11 +65,10 @@
 #include <cwchar>
 #include <cwctype>
 
-#include "builtin.h"
-#include "common.h"
-#include "io.h"
-#include "wcstringutil.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../wcstringutil.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 class parser_t;
 
diff --git a/src/builtin_printf.h b/src/builtins/printf.h
similarity index 87%
rename from src/builtin_printf.h
rename to src/builtins/printf.h
index 9303cc2cd..e0ffa4e4f 100644
--- a/src/builtin_printf.h
+++ b/src/builtins/printf.h
@@ -5,8 +5,8 @@
 #include <cstring>
 #include <cwchar>
 
-#include "io.h"
-#include "maybe.h"
+#include "../maybe.h"
+#include "../io.h"
 
 class parser_t;
 
diff --git a/src/builtin_pwd.cpp b/src/builtins/pwd.cpp
similarity index 91%
rename from src/builtin_pwd.cpp
rename to src/builtins/pwd.cpp
index 80c8e579e..92add9a2a 100644
--- a/src/builtin_pwd.cpp
+++ b/src/builtins/pwd.cpp
@@ -1,17 +1,17 @@
 // Implementation of the pwd builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_pwd.h"
+#include "pwd.h"
 
 #include <cstring>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "parser.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../parser.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 /// The pwd builtin. Respect -P to resolve symbolic links. Respect -L to not do that (the default).
 static const wchar_t *const short_options = L"LPh";
diff --git a/src/builtin_pwd.h b/src/builtins/pwd.h
similarity index 91%
rename from src/builtin_pwd.h
rename to src/builtins/pwd.h
index 7b90b4156..124d834dc 100644
--- a/src/builtin_pwd.h
+++ b/src/builtins/pwd.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_PWD_H
 #define FISH_BUILTIN_PWD_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_random.cpp b/src/builtins/random.cpp
similarity index 96%
rename from src/builtin_random.cpp
rename to src/builtins/random.cpp
index 8b38694ec..5393da49b 100644
--- a/src/builtin_random.cpp
+++ b/src/builtins/random.cpp
@@ -1,7 +1,7 @@
 // Implementation of the random builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_random.h"
+#include "random.h"
 
 #include <algorithm>
 #include <cerrno>
@@ -9,11 +9,11 @@
 #include <cwchar>
 #include <random>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 /// \return a random-seeded engine.
 static std::minstd_rand get_seeded_engine() {
diff --git a/src/builtin_random.h b/src/builtins/random.h
similarity index 91%
rename from src/builtin_random.h
rename to src/builtins/random.h
index bf852824f..1dc2603c7 100644
--- a/src/builtin_random.h
+++ b/src/builtins/random.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_RANDOM_H
 #define FISH_BUILTIN_RANDOM_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_read.cpp b/src/builtins/read.cpp
similarity index 98%
rename from src/builtin_read.cpp
rename to src/builtins/read.cpp
index e00e7ad0c..3aa3bb3bb 100644
--- a/src/builtin_read.cpp
+++ b/src/builtins/read.cpp
@@ -1,7 +1,7 @@
 // Implementation of the read builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_read.h"
+#include "read.h"
 
 #include <termios.h>
 #include <unistd.h>
@@ -19,21 +19,21 @@
 #include <string>
 #include <vector>
 
-#include "builtin.h"
-#include "common.h"
-#include "complete.h"
-#include "env.h"
-#include "event.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "highlight.h"
-#include "history.h"
-#include "io.h"
-#include "parser.h"
-#include "proc.h"
-#include "reader.h"
-#include "wcstringutil.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../complete.h"
+#include "../env.h"
+#include "../event.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../highlight.h"
+#include "../history.h"
+#include "../io.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../reader.h"
+#include "../wcstringutil.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 namespace {
 struct read_cmd_opts_t {
diff --git a/src/builtin_read.h b/src/builtins/read.h
similarity index 91%
rename from src/builtin_read.h
rename to src/builtins/read.h
index 3093a12af..7ad2b549a 100644
--- a/src/builtin_read.h
+++ b/src/builtins/read.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_READ_H
 #define FISH_BUILTIN_READ_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_realpath.cpp b/src/builtins/realpath.cpp
similarity index 94%
rename from src/builtin_realpath.cpp
rename to src/builtins/realpath.cpp
index d91d9fff4..4cea4fd49 100644
--- a/src/builtin_realpath.cpp
+++ b/src/builtins/realpath.cpp
@@ -1,20 +1,20 @@
 // Implementation of the realpath builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_realpath.h"
+#include "realpath.h"
 
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <cwchar>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "wcstringutil.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../wcstringutil.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 struct realpath_cmd_opts_t {
     bool print_help = false;
diff --git a/src/builtin_realpath.h b/src/builtins/realpath.h
similarity index 92%
rename from src/builtin_realpath.h
rename to src/builtins/realpath.h
index 70d6088db..54cd960d9 100644
--- a/src/builtin_realpath.h
+++ b/src/builtins/realpath.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_REALPATH_H
 #define FISH_BUILTIN_REALPATH_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_return.cpp b/src/builtins/return.cpp
similarity index 92%
rename from src/builtin_return.cpp
rename to src/builtins/return.cpp
index 9f6ea45d3..4a7e6aa1f 100644
--- a/src/builtin_return.cpp
+++ b/src/builtins/return.cpp
@@ -1,19 +1,19 @@
 // Implementation of the return builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_return.h"
+#include "return.h"
 
 #include <cerrno>
 #include <cstddef>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "parser.h"
-#include "proc.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 struct return_cmd_opts_t {
     bool print_help = false;
diff --git a/src/builtin_return.h b/src/builtins/return.h
similarity index 91%
rename from src/builtin_return.h
rename to src/builtins/return.h
index f43c33f71..243c56e1c 100644
--- a/src/builtin_return.h
+++ b/src/builtins/return.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_RETURN_H
 #define FISH_BUILTIN_RETURN_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_set.cpp b/src/builtins/set.cpp
similarity index 98%
rename from src/builtin_set.cpp
rename to src/builtins/set.cpp
index 31839f6bc..19193b097 100644
--- a/src/builtin_set.cpp
+++ b/src/builtins/set.cpp
@@ -1,7 +1,7 @@
 // Functions used for implementing the set builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_set.h"
+#include "set.h"
 
 #include <sys/stat.h>
 #include <unistd.h>
@@ -18,18 +18,18 @@
 #include <string>
 #include <vector>
 
-#include "builtin.h"
-#include "common.h"
-#include "env.h"
-#include "expand.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "history.h"
-#include "io.h"
-#include "parser.h"
-#include "proc.h"
-#include "wcstringutil.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../env.h"
+#include "../expand.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../history.h"
+#include "../io.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../wcstringutil.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 struct set_cmd_opts_t {
     bool print_help = false;
diff --git a/src/builtin_set.h b/src/builtins/set.h
similarity index 92%
rename from src/builtin_set.h
rename to src/builtins/set.h
index 205395d70..797bdbcb2 100644
--- a/src/builtin_set.h
+++ b/src/builtins/set.h
@@ -4,7 +4,7 @@
 
 #include <cwchar>
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_set_color.cpp b/src/builtins/set_color.cpp
similarity index 97%
rename from src/builtin_set_color.cpp
rename to src/builtins/set_color.cpp
index b0d8ead80..214f35b94 100644
--- a/src/builtin_set_color.cpp
+++ b/src/builtins/set_color.cpp
@@ -1,6 +1,8 @@
 // Functions used for implementing the set_color builtin.
 #include "config.h"
 
+#include "set_color.h"
+
 #include <cstddef>
 #include <cstdlib>
 
@@ -21,15 +23,14 @@
 #include <string>
 #include <vector>
 
-#include "builtin.h"
-#include "color.h"
-#include "common.h"
-#include "env.h"
-#include "io.h"
-#include "output.h"
-#include "parser.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../color.h"
+#include "../common.h"
+#include "../env.h"
+#include "../output.h"
+#include "../parser.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 class parser_t;
 
diff --git a/src/builtin_set_color.h b/src/builtins/set_color.h
similarity index 87%
rename from src/builtin_set_color.h
rename to src/builtins/set_color.h
index e2ebea467..632df46a6 100644
--- a/src/builtin_set_color.h
+++ b/src/builtins/set_color.h
@@ -5,8 +5,8 @@
 #include <cstring>
 #include <cwchar>
 
-#include "io.h"
-#include "maybe.h"
+#include "../io.h"
+#include "../maybe.h"
 
 class parser_t;
 
diff --git a/src/builtin_source.cpp b/src/builtins/source.cpp
similarity index 93%
rename from src/builtin_source.cpp
rename to src/builtins/source.cpp
index d8281c16b..4d4066a07 100644
--- a/src/builtin_source.cpp
+++ b/src/builtins/source.cpp
@@ -1,7 +1,7 @@
 // Implementation of the source builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_source.h"
+#include "source.h"
 
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -9,16 +9,16 @@
 
 #include <cwchar>
 
-#include "builtin.h"
-#include "common.h"
-#include "env.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "intern.h"
-#include "io.h"
-#include "parser.h"
-#include "proc.h"
-#include "reader.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../env.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../intern.h"
+#include "../io.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../reader.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 /// The  source builtin, sometimes called `.`. Evaluates the contents of a file in the current
 /// context.
diff --git a/src/builtin_source.h b/src/builtins/source.h
similarity index 91%
rename from src/builtin_source.h
rename to src/builtins/source.h
index df6c6566d..7cb5dc5db 100644
--- a/src/builtin_source.h
+++ b/src/builtins/source.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_SOURCE_H
 #define FISH_BUILTIN_SOURCE_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_status.cpp b/src/builtins/status.cpp
similarity index 98%
rename from src/builtin_status.cpp
rename to src/builtins/status.cpp
index ec3013a26..60de64c40 100644
--- a/src/builtin_status.cpp
+++ b/src/builtins/status.cpp
@@ -1,22 +1,22 @@
 // Implementation of the status builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_status.h"
+#include "status.h"
 
 #include <cstddef>
 #include <cwchar>
 #include <string>
 
-#include "builtin.h"
-#include "common.h"
-#include "enum_map.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "future_feature_flags.h"
-#include "io.h"
-#include "parser.h"
-#include "proc.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../enum_map.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../future_feature_flags.h"
+#include "../io.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 enum status_cmd_t {
     STATUS_CURRENT_CMD = 1,
diff --git a/src/builtin_status.h b/src/builtins/status.h
similarity index 91%
rename from src/builtin_status.h
rename to src/builtins/status.h
index 72e4a4b1b..c10bb7279 100644
--- a/src/builtin_status.h
+++ b/src/builtins/status.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_STATUS_H
 #define FISH_BUILTIN_STATUS_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_string.cpp b/src/builtins/string.cpp
similarity index 99%
rename from src/builtin_string.cpp
rename to src/builtins/string.cpp
index c7a93e876..c4c1a138c 100644
--- a/src/builtin_string.cpp
+++ b/src/builtins/string.cpp
@@ -22,20 +22,19 @@
 #include <utility>
 #include <vector>
 
-#include "builtin.h"
-#include "common.h"
-#include "env.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "future_feature_flags.h"
-#include "io.h"
-#include "parse_util.h"
-#include "parser.h"
 #include "pcre2.h"
-#include "screen.h"
-#include "wcstringutil.h"
-#include "wgetopt.h"
-#include "wildcard.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../env.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../future_feature_flags.h"
+#include "../parse_util.h"
+#include "../parser.h"
+#include "../screen.h"
+#include "../wcstringutil.h"
+#include "../wgetopt.h"
+#include "../wildcard.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 // How many bytes we read() at once.
 // Bash uses 128 here, so we do too (see READ_CHUNK_SIZE).
diff --git a/src/builtin_string.h b/src/builtins/string.h
similarity index 87%
rename from src/builtin_string.h
rename to src/builtins/string.h
index 4c4765a55..cdb933e65 100644
--- a/src/builtin_string.h
+++ b/src/builtins/string.h
@@ -5,8 +5,8 @@
 #include <cstring>
 #include <cwchar>
 
-#include "io.h"
-#include "maybe.h"
+#include "../io.h"
+#include "../maybe.h"
 
 class parser_t;
 
diff --git a/src/builtin_test.cpp b/src/builtins/test.cpp
similarity index 99%
rename from src/builtin_test.cpp
rename to src/builtins/test.cpp
index be20ffddf..cde90430e 100644
--- a/src/builtin_test.cpp
+++ b/src/builtins/test.cpp
@@ -3,7 +3,7 @@
 // Implemented from scratch (yes, really) by way of IEEE 1003.1 as reference.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin.h"
+#include "test.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -20,10 +20,11 @@
 #include <type_traits>
 #include <utility>
 
-#include "common.h"
-#include "io.h"
-#include "parser.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../io.h"
+#include "../parser.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 using std::move;
 using std::unique_ptr;
diff --git a/src/builtin_test.h b/src/builtins/test.h
similarity index 92%
rename from src/builtin_test.h
rename to src/builtins/test.h
index 9fadeadbf..0feb62f7a 100644
--- a/src/builtin_test.h
+++ b/src/builtins/test.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_TEST_H
 #define FISH_BUILTIN_TEST_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_type.cpp b/src/builtins/type.cpp
similarity index 95%
rename from src/builtin_type.cpp
rename to src/builtins/type.cpp
index bf08bc4b9..99991a7a1 100644
--- a/src/builtin_type.cpp
+++ b/src/builtins/type.cpp
@@ -1,25 +1,25 @@
 // Implementation of the type builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin_type.h"
+#include "type.h"
 
 #include <unistd.h>
 
 #include <string>
 
-#include "builtin.h"
-#include "common.h"
-#include "complete.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "function.h"
-#include "highlight.h"
-#include "io.h"
-#include "parser.h"
-#include "path.h"
-#include "signal.h"
-#include "wcstringutil.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../complete.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../function.h"
+#include "../highlight.h"
+#include "../io.h"
+#include "../parser.h"
+#include "../path.h"
+#include "../signal.h"
+#include "../wcstringutil.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 struct type_cmd_opts_t {
     bool all = false;
diff --git a/src/builtin_type.h b/src/builtins/type.h
similarity index 91%
rename from src/builtin_type.h
rename to src/builtins/type.h
index 93e98dc75..121fe2264 100644
--- a/src/builtin_type.h
+++ b/src/builtins/type.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_TYPE_H
 #define FISH_BUILTIN_TYPE_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/builtin_ulimit.cpp b/src/builtins/ulimit.cpp
similarity index 97%
rename from src/builtin_ulimit.cpp
rename to src/builtins/ulimit.cpp
index cf54e76f4..9f8224a6c 100644
--- a/src/builtin_ulimit.cpp
+++ b/src/builtins/ulimit.cpp
@@ -1,17 +1,19 @@
 // Functions used for implementing the ulimit builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "ulimit.h"
+    
 #include <sys/resource.h>
 
 #include <cerrno>
 #include <cstddef>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 class parser_t;
 
diff --git a/src/builtin_ulimit.h b/src/builtins/ulimit.h
similarity index 93%
rename from src/builtin_ulimit.h
rename to src/builtins/ulimit.h
index 9c584f685..cefe1726f 100644
--- a/src/builtin_ulimit.h
+++ b/src/builtins/ulimit.h
@@ -5,7 +5,7 @@
 #include <cstring>
 #include <cwchar>
 
-#include "io.h"
+#include "../io.h"
 
 class parser_t;
 
diff --git a/src/builtin_wait.cpp b/src/builtins/wait.cpp
similarity index 95%
rename from src/builtin_wait.cpp
rename to src/builtins/wait.cpp
index 2e46fe679..ab7574fbb 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtins/wait.cpp
@@ -1,19 +1,21 @@
-// Functions for waiting for processes completed.
-#include "builtin_wait.h"
+/// Functions for waiting for processes completed.
+#include "config.h"  // IWYU pragma: keep
+
+#include "wait.h"
 
 #include <sys/wait.h>
 
 #include <algorithm>
 #include <vector>
 
-#include "builtin.h"
-#include "common.h"
-#include "parser.h"
-#include "proc.h"
-#include "signal.h"
-#include "wait_handle.h"
-#include "wgetopt.h"
-#include "wutil.h"
+#include "../builtin.h"
+#include "../common.h"
+#include "../parser.h"
+#include "../proc.h"
+#include "../signal.h"
+#include "../wait_handle.h"
+#include "../wgetopt.h"
+#include "../wutil.h"
 
 /// \return true if we can wait on a job.
 static bool can_wait_on_job(const std::shared_ptr<job_t> &j) {
diff --git a/src/builtin_wait.h b/src/builtins/wait.h
similarity index 91%
rename from src/builtin_wait.h
rename to src/builtins/wait.h
index 260977679..2bc0a0bcd 100644
--- a/src/builtin_wait.h
+++ b/src/builtins/wait.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_WAIT_H
 #define FISH_BUILTIN_WAIT_H
 
-#include "maybe.h"
+#include "../maybe.h"
 
 class parser_t;
 struct io_streams_t;
diff --git a/src/env.cpp b/src/env.cpp
index ec0e65397..261d1a697 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -18,7 +18,7 @@
 #include <utility>
 #include <vector>
 
-#include "builtin_bind.h"
+#include "builtins/bind.h"
 #include "common.h"
 #include "env_dispatch.h"
 #include "env_universal_common.h"
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 8d70e25ca..d0963e59d 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -6748,7 +6748,7 @@ static const test_t s_tests[]{
     {TEST_GROUP("ifind"), test_ifind},
     {TEST_GROUP("ifind_fuzzy"), test_ifind_fuzzy},
     {TEST_GROUP("abbreviations"), test_abbreviations},
-    {TEST_GROUP("builtin_test"), test_test},
+    {TEST_GROUP("builtins/test"), test_test},
     {TEST_GROUP("wcstod"), test_wcstod},
     {TEST_GROUP("dup2s"), test_dup2s},
     {TEST_GROUP("dup2s"), test_dup2s_fd_for_target_fd},
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 1f645319f..64a263880 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -20,7 +20,7 @@
 
 #include "ast.h"
 #include "builtin.h"
-#include "builtin_function.h"
+#include "builtins/function.h"
 #include "common.h"
 #include "complete.h"
 #include "env.h"