diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f3cdb3f..ec8154ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,10 +167,10 @@ if (CMAKE_SYSTEM_NAME STREQUAL "MSDOS")
   message(STATUS "MSDOS is incompatible with gtest")
 endif ()
 
-# Get version from core.h
-file(READ include/fmt/core.h core_h)
+# Get version from base.h
+file(READ include/fmt/base.h core_h)
 if (NOT core_h MATCHES "FMT_VERSION ([0-9]+)([0-9][0-9])([0-9][0-9])")
-  message(FATAL_ERROR "Cannot get FMT_VERSION from core.h.")
+  message(FATAL_ERROR "Cannot get FMT_VERSION from base.h.")
 endif ()
 # Use math to skip leading zeros if any.
 math(EXPR CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1})
@@ -274,7 +274,7 @@ function(add_headers VAR)
 endfunction()
 
 # Define the fmt library, its includes and the needed defines.
-add_headers(FMT_HEADERS args.h chrono.h color.h compile.h core.h format.h
+add_headers(FMT_HEADERS args.h chrono.h color.h compile.h base.h format.h
                         format-inl.h os.h ostream.h printf.h ranges.h std.h
                         xchar.h)
 set(FMT_SOURCES src/format.cc)
diff --git a/include/fmt/core.h b/include/fmt/base.h
similarity index 100%
rename from include/fmt/core.h
rename to include/fmt/base.h
diff --git a/include/fmt/format.h b/include/fmt/format.h
index 07d34134..6f8329f5 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -52,7 +52,7 @@
 #  include <bit>  // std::bit_cast
 #endif
 
-#include "core.h"
+#include "base.h"
 
 // libc++ supports string_view in pre-c++17.
 #if FMT_HAS_INCLUDE(<string_view>) && \
diff --git a/test/add-subdirectory-test/main.cc b/test/add-subdirectory-test/main.cc
index fcdf232e..1d31cb90 100644
--- a/test/add-subdirectory-test/main.cc
+++ b/test/add-subdirectory-test/main.cc
@@ -1,4 +1,4 @@
-#include "fmt/core.h"
+#include "fmt/base.h"
 
 int main(int argc, char** argv) {
   for (int i = 0; i < argc; ++i) fmt::print("{}: {}\n", i, argv[i]);
diff --git a/test/assert-test.cc b/test/assert-test.cc
index c74e617e..368fb587 100644
--- a/test/assert-test.cc
+++ b/test/assert-test.cc
@@ -9,7 +9,7 @@
 //
 // For the license information refer to format.h.
 
-#include "fmt/core.h"
+#include "fmt/base.h"
 #include "gtest/gtest.h"
 
 TEST(assert_test, fail) {
diff --git a/test/core-test.cc b/test/core-test.cc
index 4a96ccda..10d01b81 100644
--- a/test/core-test.cc
+++ b/test/core-test.cc
@@ -9,7 +9,7 @@
 #include "test-assert.h"
 // clang-format on
 
-#include "fmt/core.h"
+#include "fmt/base.h"
 
 #include <climits>      // INT_MAX
 #include <cstring>      // std::strlen
diff --git a/test/cuda-test/cpp14.cc b/test/cuda-test/cpp14.cc
index ad846396..59db442e 100644
--- a/test/cuda-test/cpp14.cc
+++ b/test/cuda-test/cpp14.cc
@@ -1,4 +1,4 @@
-#include <fmt/core.h>
+#include <fmt/base.h>
 
 // The purpose of this part is to ensure NVCC's host compiler also supports
 // the standard version. See 'cuda-cpp14.cu'.
diff --git a/test/cuda-test/cuda-cpp14.cu b/test/cuda-test/cuda-cpp14.cu
index 76a9d088..9fc36c93 100644
--- a/test/cuda-test/cuda-cpp14.cu
+++ b/test/cuda-test/cuda-cpp14.cu
@@ -10,7 +10,7 @@
 // https://en.cppreference.com/w/cpp/preprocessor/replace#Predefined_macros
 static_assert(__cplusplus >= 201402L, "expect C++ 2014 for nvcc");
 
-#include <fmt/core.h>
+#include <fmt/base.h>
 
 #include <cuda.h>
 #include <iostream>
diff --git a/test/fuzzing/fuzzer-common.h b/test/fuzzing/fuzzer-common.h
index c0a24672..eaae5a6e 100644
--- a/test/fuzzing/fuzzer-common.h
+++ b/test/fuzzing/fuzzer-common.h
@@ -4,7 +4,7 @@
 #ifndef FUZZER_COMMON_H
 #define FUZZER_COMMON_H
 
-#include <fmt/core.h>
+#include <fmt/base.h>
 
 #include <cstdint>  // std::uint8_t
 #include <cstring>  // memcpy
diff --git a/test/header-only-test.cc b/test/header-only-test.cc
index 570f09a5..8c99f857 100644
--- a/test/header-only-test.cc
+++ b/test/header-only-test.cc
@@ -1,6 +1,6 @@
 // Header-only configuration test
 
-#include "fmt/core.h"
+#include "fmt/base.h"
 #include "fmt/ostream.h"
 #include "gtest/gtest.h"
 
diff --git a/test/noexception-test.cc b/test/noexception-test.cc
index bf3472fd..0e44e13b 100644
--- a/test/noexception-test.cc
+++ b/test/noexception-test.cc
@@ -6,10 +6,10 @@
 // For the license information refer to format.h.
 
 #include "fmt/args.h"
+#include "fmt/base.h"
 #include "fmt/chrono.h"
 #include "fmt/color.h"
 #include "fmt/compile.h"
-#include "fmt/core.h"
 #include "fmt/format.h"
 #include "fmt/os.h"
 #include "fmt/ostream.h"