diff --git a/src/mp-units-core.cpp b/src/mp-units-core.cpp
index b0ddbb81f..2826e6fe3 100644
--- a/src/mp-units-core.cpp
+++ b/src/mp-units-core.cpp
@@ -8,4 +8,8 @@ export
 {
 // core
 #include <mp-units/core.h>
+
+// utility
+#include <mp-units/compare.h>
+#include <mp-units/random.h>
 }
diff --git a/src/mp-units-systems.cpp b/src/mp-units-systems.cpp
index 250bd9ebc..eaa632188 100644
--- a/src/mp-units-systems.cpp
+++ b/src/mp-units-systems.cpp
@@ -26,7 +26,5 @@ export
 
 // utility
 #include <mp-units/chrono.h>
-#include <mp-units/compare.h>
 #include <mp-units/math.h>
-#include <mp-units/random.h>
 }