diff --git a/CMakeLists.txt b/CMakeLists.txt
index 417439cf6..d37e41d7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,32 +99,64 @@ endif()
 
 # List of sources for builtin functions.
 set(FISH_BUILTIN_SRCS
-    src/builtin.cpp src/builtins/bind.cpp
-    src/builtins/commandline.cpp src/builtins/complete.cpp
+    src/builtin.cpp
+    src/builtins/bind.cpp
+    src/builtins/commandline.cpp
+    src/builtins/complete.cpp
     src/builtins/disown.cpp
-    src/builtins/eval.cpp src/builtins/fg.cpp
+    src/builtins/eval.cpp
+    src/builtins/fg.cpp
     src/builtins/history.cpp
     src/builtins/jobs.cpp
-    src/builtins/read.cpp src/builtins/set.cpp
+    src/builtins/read.cpp
+    src/builtins/set.cpp
     src/builtins/source.cpp
     src/builtins/ulimit.cpp
 )
 
 # List of other sources.
 set(FISH_SRCS
-    src/ast.cpp src/autoload.cpp src/color.cpp src/common.cpp src/complete.cpp
-    src/env.cpp src/env_universal_common.cpp src/event.cpp
-    src/exec.cpp src/expand.cpp src/fallback.cpp src/fish_indent_common.cpp src/fish_version.cpp
-    src/flog.cpp src/function.cpp src/highlight.cpp
-    src/history.cpp src/history_file.cpp src/input.cpp src/input_common.cpp
+    src/ast.cpp
+    src/autoload.cpp
+    src/color.cpp
+    src/common.cpp
+    src/complete.cpp
+    src/env.cpp
+    src/env_universal_common.cpp
+    src/event.cpp
+    src/exec.cpp
+    src/expand.cpp
+    src/fallback.cpp
+    src/fds.cpp
+    src/fish_indent_common.cpp
+    src/fish_version.cpp
+    src/flog.cpp
+    src/function.cpp
+    src/highlight.cpp
+    src/history.cpp
+    src/history_file.cpp
+    src/input_common.cpp
+    src/input.cpp
     src/io.cpp
-    src/null_terminated_array.cpp src/operation_context.cpp src/output.cpp
-    src/pager.cpp src/parse_execution.cpp src/parse_util.cpp
-    src/parser.cpp src/parser_keywords.cpp src/path.cpp
-    src/proc.cpp src/reader.cpp src/screen.cpp
-    src/signals.cpp src/utf8.cpp
-    src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp
-    src/wutil.cpp src/fds.cpp src/rustffi.cpp
+    src/null_terminated_array.cpp
+    src/operation_context.cpp
+    src/output.cpp
+    src/pager.cpp
+    src/parse_execution.cpp
+    src/parser.cpp
+    src/parser_keywords.cpp
+    src/parse_util.cpp
+    src/path.cpp
+    src/proc.cpp
+    src/reader.cpp
+    src/rustffi.cpp
+    src/screen.cpp
+    src/signals.cpp
+    src/utf8.cpp
+    src/wcstringutil.cpp
+    src/wgetopt.cpp
+    src/wildcard.cpp
+    src/wutil.cpp
 )
 
 # Header files are just globbed.