3 files changed, 13 insertions, 4 deletions
diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h
index 05f18f940..8563d83b0 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/SourceParagraph.h
@@ -12,8 +12,6 @@
 
 namespace vcpkg
 {
-    extern bool g_feature_packages;
-
     struct Dependency
     {
         Features depend;
diff --git a/toolsrc/include/vcpkg_GlobalState.h b/toolsrc/include/vcpkg_GlobalState.h
new file mode 100644
index 000000000..15b8867f7
--- /dev/null
+++ b/toolsrc/include/vcpkg_GlobalState.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <vcpkg_Chrono.h>
+
+namespace vcpkg
+{
+    struct GlobalState
+    {
+        static ElapsedTime timer;
+        static bool debugging;
+        static bool feature_packages;
+    };
+}
+\ No newline at end of file
diff --git a/toolsrc/include/vcpkglib.h b/toolsrc/include/vcpkglib.h
index 63b358d74..0bb75f9b5 100644
--- a/toolsrc/include/vcpkglib.h
+++ b/toolsrc/include/vcpkglib.h
@@ -6,8 +6,6 @@
 
 namespace vcpkg
 {
-    extern bool g_debugging;
-
     StatusParagraphs database_load_check(const VcpkgPaths& paths);
 
     void write_update(const VcpkgPaths& paths, const StatusParagraph& p);