5 files changed, 7 insertions, 7 deletions
diff --git a/Tests/CMakeLib/testArgumentParser.cxx b/Tests/CMakeLib/testArgumentParser.cxx
index 788fece..909f71b 100644
--- a/Tests/CMakeLib/testArgumentParser.cxx
+++ b/Tests/CMakeLib/testArgumentParser.cxx
@@ -4,7 +4,7 @@
 #include "cmArgumentParser.h"
 
 #include "cm_static_string_view.hxx"
-#include "cm_string_view.hxx"
+#include <cm/string_view>
 
 #include <initializer_list>
 #include <iostream>
diff --git a/Tests/CMakeLib/testOptional.cxx b/Tests/CMakeLib/testOptional.cxx
index a5e30fb..cefe9fa 100644
--- a/Tests/CMakeLib/testOptional.cxx
+++ b/Tests/CMakeLib/testOptional.cxx
@@ -1,9 +1,8 @@
-#include "cm_optional.hxx"
-#include "cm_utility.hxx"
+#include <cm/optional>
+#include <cm/utility>
 
 #include <iostream>
 #include <type_traits>
-#include <utility>
 #include <vector>
 
 class EventLogger;
diff --git a/Tests/CMakeLib/testString.cxx b/Tests/CMakeLib/testString.cxx
index 075892f..3b47a9c 100644
--- a/Tests/CMakeLib/testString.cxx
+++ b/Tests/CMakeLib/testString.cxx
@@ -4,7 +4,7 @@
 #include "cmString.hxx"
 
 #include "cm_static_string_view.hxx"
-#include "cm_string_view.hxx"
+#include <cm/string_view>
 
 #include <cstddef>
 #include <cstring>
diff --git a/Tests/CMakeLib/testStringAlgorithms.cxx b/Tests/CMakeLib/testStringAlgorithms.cxx
index a92a910..4e48f6e 100644
--- a/Tests/CMakeLib/testStringAlgorithms.cxx
+++ b/Tests/CMakeLib/testStringAlgorithms.cxx
@@ -3,7 +3,8 @@
 
 #include <cmConfigure.h> // IWYU pragma: keep
 
-#include "cm_string_view.hxx"
+#include <cm/string_view>
+
 #include <iostream>
 #include <sstream>
 #include <string>
diff --git a/Tests/CMakeLib/testUVProcessChain.cxx b/Tests/CMakeLib/testUVProcessChain.cxx
index 63c9943..8cee49d 100644
--- a/Tests/CMakeLib/testUVProcessChain.cxx
+++ b/Tests/CMakeLib/testUVProcessChain.cxx
@@ -15,7 +15,7 @@
 
 #include <csignal>
 
-#include "cm_memory.hxx"
+#include <cm/memory>
 
 struct ExpectedStatus
 {