diff --git a/src/mem/threadalloc.h b/src/mem/threadalloc.h
index f2b6f4b..101e092 100644
--- a/src/mem/threadalloc.h
+++ b/src/mem/threadalloc.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "../ds/helpers.h"
-#include "globalconfig.h"
 #include "localalloc.h"
 
 #if defined(SNMALLOC_EXTERNAL_THREAD_ALLOC)
diff --git a/src/override/malloc.cc b/src/override/malloc.cc
index a040042..acd6402 100644
--- a/src/override/malloc.cc
+++ b/src/override/malloc.cc
@@ -2,6 +2,7 @@
 #include "../snmalloc_core.h"
 
 #ifndef SNMALLOC_PROVIDE_OWN_CONFIG
+#  include "../mem/globalconfig.h"
 // The default configuration for snmalloc is used if alternative not defined
 namespace snmalloc
 {
diff --git a/src/snmalloc.h b/src/snmalloc.h
index 87f3b5f..6abd703 100644
--- a/src/snmalloc.h
+++ b/src/snmalloc.h
@@ -3,6 +3,9 @@
 // Core implementation of snmalloc independent of the configuration mode
 #include "snmalloc_core.h"
 
+// Default implementation of global state
+#include "mem/globalconfig.h"
+
 // The default configuration for snmalloc
 namespace snmalloc
 {
diff --git a/src/snmalloc_core.h b/src/snmalloc_core.h
index 231d79b..0c6a2d3 100644
--- a/src/snmalloc_core.h
+++ b/src/snmalloc_core.h
@@ -1,4 +1,3 @@
 #pragma once
 
-#include "mem/globalalloc.h"
-#include "mem/globalconfig.h"
\ No newline at end of file
+#include "mem/globalalloc.h"
\ No newline at end of file
diff --git a/src/test/func/fixed_region/fixed_region.cc b/src/test/func/fixed_region/fixed_region.cc
index ed5ca3d..1f0ca0b 100644
--- a/src/test/func/fixed_region/fixed_region.cc
+++ b/src/test/func/fixed_region/fixed_region.cc
@@ -1,5 +1,4 @@
 #include "mem/fixedglobalconfig.h"
-#include "mem/globalconfig.h"
 #include "test/setup.h"
 
 #include <iostream>
diff --git a/src/test/func/thread_alloc_external/thread_alloc_external.cc b/src/test/func/thread_alloc_external/thread_alloc_external.cc
index 16fed06..a5b1fe8 100644
--- a/src/test/func/thread_alloc_external/thread_alloc_external.cc
+++ b/src/test/func/thread_alloc_external/thread_alloc_external.cc
@@ -3,6 +3,9 @@
 
 // Specify using own
 #define SNMALLOC_EXTERNAL_THREAD_ALLOC
+
+#include "mem/globalconfig.h"
+
 namespace snmalloc
 {
   using Alloc = snmalloc::LocalAllocator<snmalloc::Globals>;