diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index 26f1df249e..5f89ba1330 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -3,7 +3,7 @@
 #ifndef cmConfigure_h
 #define cmConfigure_h
 
-#include <cmsys/Configure.hxx> // IWYU pragma: keep
+#include <cmsys/Configure.hxx> // IWYU pragma: export
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4786)
diff --git a/Source/cmDynamicLoader.cxx b/Source/cmDynamicLoader.cxx
index a30b6423c6..39a59fc025 100644
--- a/Source/cmDynamicLoader.cxx
+++ b/Source/cmDynamicLoader.cxx
@@ -4,7 +4,6 @@
 
 #include <cmConfigure.h>
 
-#include <cmsys/DynamicLoader.hxx>
 #include <map>
 #include <string>
 #include <utility>
diff --git a/Source/cmDynamicLoader.h b/Source/cmDynamicLoader.h
index d14f81e0bd..5d69400966 100644
--- a/Source/cmDynamicLoader.h
+++ b/Source/cmDynamicLoader.h
@@ -10,7 +10,7 @@
 
 #include <cmConfigure.h> // IWYU pragma: keep
 
-#include <cmsys/DynamicLoader.hxx>
+#include "cmsys/DynamicLoader.hxx" // IWYU pragma: export
 
 class cmDynamicLoader
 {
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index b7afa1052f..b2e3c6aad8 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -33,7 +33,6 @@
 #include <cmsys/FStream.hxx>
 #include <cmsys/RegularExpression.hxx>
 #include <cmsys/System.h>
-#include <cmsys/SystemTools.hxx>
 #include <cmsys/Terminal.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 10e828032a..070f81fc31 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -5,9 +5,9 @@
 
 #include <cmConfigure.h> // IWYU pragma: keep
 
+#include "cmsys/SystemTools.hxx" // IWYU pragma: export
 #include <cmProcessOutput.h>
 #include <cmsys/Process.h>
-#include <cmsys/SystemTools.hxx>
 #include <stddef.h>
 #include <string>
 #include <vector>