diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index e893d85f..ed4525f3 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -79,7 +79,6 @@ add_mp_units_module(
             include/mp-units/framework/value_cast.h
             include/mp-units/compat_macros.h
             include/mp-units/concepts.h
-            include/mp-units/core.h
             include/mp-units/format.h
             include/mp-units/framework.h
             include/mp-units/math.h
@@ -119,3 +118,5 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         /utf-8 # Specifies both the source character set and the execution character set as UTF-8
     )
 endif()
+
+# target_compile_options(mp-units-core ${${projectPrefix}TARGET_SCOPE} "-ftime-trace")
diff --git a/src/core/mp-units-core.cpp b/src/core/mp-units-core.cpp
index c5a48436..f0278d29 100644
--- a/src/core/mp-units-core.cpp
+++ b/src/core/mp-units-core.cpp
@@ -6,4 +6,10 @@ export module mp_units.core;
 
 #define MP_UNITS_IN_MODULE_INTERFACE
 
-#include <mp-units/core.h>
+#include <mp-units/compat_macros.h>
+#include <mp-units/concepts.h>
+#include <mp-units/format.h>
+#include <mp-units/framework.h>
+#include <mp-units/math.h>
+#include <mp-units/ostream.h>
+#include <mp-units/random.h>