diff --git a/include/fmt/base.h b/include/fmt/base.h
index 6b1d8140c29b9..408f4fc4493e8 100644
--- a/include/fmt/base.h
+++ b/include/fmt/base.h
@@ -8,9 +8,9 @@
 #ifndef FMT_BASE_H_
 #define FMT_BASE_H_
 
-#include <limits.h>  // CHAR_BIT
-#include <stdio.h>   // FILE
-#include <string.h>  // strlen
+#include <climits>  // CHAR_BIT
+#include <cstdio>   // FILE
+#include <cstring>  // strlen
 
 #ifndef FMT_IMPORT_STD
 // <cstddef> is also included transitively from <type_traits>.
diff --git a/src/fmt.cc b/src/fmt.cc
index bb3845f2f964e..3d4599c9493cb 100644
--- a/src/fmt.cc
+++ b/src/fmt.cc
@@ -6,12 +6,14 @@ module;
 #  include <algorithm>
 #  include <chrono>
 #  include <cmath>
+#  include <complex>
 #  include <cstddef>
 #  include <cstdint>
 #  include <cstdio>
 #  include <cstdlib>
 #  include <cstring>
 #  include <ctime>
+#  include <expected>
 #  include <exception>
 #  include <filesystem>
 #  include <fstream>
@@ -22,6 +24,7 @@ module;
 #  include <memory>
 #  include <optional>
 #  include <ostream>
+#  include <source_location>
 #  include <stdexcept>
 #  include <string>
 #  include <string_view>
@@ -104,7 +107,9 @@ extern "C++" {
 #if FMT_OS
 #  include "fmt/os.h"
 #endif
+#include "fmt/ostream.h"
 #include "fmt/printf.h"
+#include "fmt/ranges.h"
 #include "fmt/std.h"
 #include "fmt/xchar.h"