2 files changed, 59 insertions, 56 deletions
diff --git a/toolsrc/include/PostBuildLint_BuildInfo.h b/toolsrc/include/PostBuildLint_BuildInfo.h
index b41478ef0..ff996b2b6 100644
--- a/toolsrc/include/PostBuildLint_BuildInfo.h
+++ b/toolsrc/include/PostBuildLint_BuildInfo.h
@@ -2,67 +2,11 @@
 
 #include <unordered_map>
 #include "Paragraphs.h"
-#include <regex>
 #include "PostBuildLint_BuildPolicies.h"
 #include "opt_bool.h"
 
 namespace vcpkg::PostBuildLint
 {
-    struct OutdatedDynamicCrt
-    {
-        // Old CPP
-        static const OutdatedDynamicCrt MSVCP100_DLL;
-        static const OutdatedDynamicCrt MSVCP100D_DLL;
-        static const OutdatedDynamicCrt MSVCP110_DLL;
-        static const OutdatedDynamicCrt MSVCP110_WIN_DLL;
-        static const OutdatedDynamicCrt MSVCP120_DLL;
-        static const OutdatedDynamicCrt MSVCP120_CLR0400_DLL;
-        static const OutdatedDynamicCrt MSVCP60_DLL;
-        static const OutdatedDynamicCrt MSVCP_WIN_DLL;
-
-        // Old C
-        static const OutdatedDynamicCrt MSVCR100_DLL;
-        static const OutdatedDynamicCrt MSVCR100D_DLL;
-        static const OutdatedDynamicCrt MSVCR100_CLR0400_DLL;
-        static const OutdatedDynamicCrt MSVCR110_DLL;
-        static const OutdatedDynamicCrt MSVCR120_DLL;
-        static const OutdatedDynamicCrt MSVCR120_CLR0400_DLL;
-        static const OutdatedDynamicCrt MSVCRT_DLL;
-        static const OutdatedDynamicCrt MSVCRT20_DLL;
-        static const OutdatedDynamicCrt MSVCRT40_DLL;
-
-        static const std::vector<OutdatedDynamicCrt>& values()
-        {
-            static const std::vector<OutdatedDynamicCrt> v = {
-                MSVCP100_DLL, MSVCP100D_DLL,
-                MSVCP110_DLL,MSVCP110_WIN_DLL,
-                MSVCP120_DLL, MSVCP120_CLR0400_DLL,
-                MSVCP60_DLL,
-                MSVCP_WIN_DLL,
-
-                MSVCR100_DLL, MSVCR100D_DLL, MSVCR100_CLR0400_DLL,
-                MSVCR110_DLL,
-                MSVCR120_DLL, MSVCR120_CLR0400_DLL,
-                MSVCRT_DLL, MSVCRT20_DLL,MSVCRT40_DLL
-            };
-            return v;
-        }
-
-        OutdatedDynamicCrt() = delete;
-
-        std::regex crt_regex() const;
-        const std::string& toString() const;
-
-    private:
-        explicit OutdatedDynamicCrt(const std::string& dll_name, const std::string& crt_regex_as_string)
-            : m_dll_name(dll_name), m_crt_regex_as_string(crt_regex_as_string)
-        {
-        }
-
-        std::string m_dll_name;
-        std::string m_crt_regex_as_string;
-    };
-
     struct BuildInfo
     {
         static BuildInfo create(std::unordered_map<std::string, std::string> pgh);
diff --git a/toolsrc/include/PostBuildLint_OutdatedDynamicCrt.h b/toolsrc/include/PostBuildLint_OutdatedDynamicCrt.h
new file mode 100644
index 000000000..484f74cf0
--- /dev/null
+++ b/toolsrc/include/PostBuildLint_OutdatedDynamicCrt.h
@@ -0,0 +1,59 @@
+#pragma once
+#include <vector>
+#include <regex>
+
+namespace vcpkg::PostBuildLint
+{
+    struct OutdatedDynamicCrt
+    {
+        // Old CPP
+        static const OutdatedDynamicCrt MSVCP100_DLL;
+        static const OutdatedDynamicCrt MSVCP100D_DLL;
+        static const OutdatedDynamicCrt MSVCP110_DLL;
+        static const OutdatedDynamicCrt MSVCP110_WIN_DLL;
+        static const OutdatedDynamicCrt MSVCP120_DLL;
+        static const OutdatedDynamicCrt MSVCP120_CLR0400_DLL;
+        static const OutdatedDynamicCrt MSVCP60_DLL;
+        static const OutdatedDynamicCrt MSVCP_WIN_DLL;
+
+        // Old C
+        static const OutdatedDynamicCrt MSVCR100_DLL;
+        static const OutdatedDynamicCrt MSVCR100D_DLL;
+        static const OutdatedDynamicCrt MSVCR100_CLR0400_DLL;
+        static const OutdatedDynamicCrt MSVCR110_DLL;
+        static const OutdatedDynamicCrt MSVCR120_DLL;
+        static const OutdatedDynamicCrt MSVCR120_CLR0400_DLL;
+        static const OutdatedDynamicCrt MSVCRT_DLL;
+        static const OutdatedDynamicCrt MSVCRT20_DLL;
+        static const OutdatedDynamicCrt MSVCRT40_DLL;
+
+        static const std::vector<OutdatedDynamicCrt>& values()
+        {
+            static const std::vector<OutdatedDynamicCrt> v = {
+                MSVCP100_DLL, MSVCP100D_DLL,
+                MSVCP110_DLL,MSVCP110_WIN_DLL,
+                MSVCP120_DLL, MSVCP120_CLR0400_DLL,
+                MSVCP60_DLL,
+                MSVCP_WIN_DLL,
+
+                MSVCR100_DLL, MSVCR100D_DLL, MSVCR100_CLR0400_DLL,
+                MSVCR110_DLL,
+                MSVCR120_DLL, MSVCR120_CLR0400_DLL,
+                MSVCRT_DLL, MSVCRT20_DLL,MSVCRT40_DLL
+            };
+            return v;
+        }
+
+        OutdatedDynamicCrt() = delete;
+
+        std::regex crt_regex() const;
+        const std::string& toString() const;
+
+    private:
+        explicit OutdatedDynamicCrt(const std::string& dll_name, const std::string& crt_regex_as_string)
+            : m_dll_name(dll_name), m_crt_regex_as_string(crt_regex_as_string) { }
+
+        std::string m_dll_name;
+        std::string m_crt_regex_as_string;
+    };
+}