diff --git a/firmware/console/eficonsole.cpp b/firmware/console/eficonsole.cpp
index 9d9f477927..563df05e9a 100644
--- a/firmware/console/eficonsole.cpp
+++ b/firmware/console/eficonsole.cpp
@@ -21,7 +21,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "global.h"
+#include "globalaccess.h"
 #include "os_access.h"
 #include "eficonsole.h"
 #include "console_io.h"
diff --git a/firmware/controllers/global_shared.h b/firmware/controllers/global_shared.h
index 6f89a3f740..507689291c 100644
--- a/firmware/controllers/global_shared.h
+++ b/firmware/controllers/global_shared.h
@@ -92,3 +92,11 @@
 #define EXPECTED_REMAINING_STACK 128
 
 #endif /* __cplusplus */
+
+/*
+ * Stack debugging
+ * See also getMaxUsedStack()
+ */
+EXTERNC int getRemainingStack(thread_t *otp);
+int CountFreeStackSpace(const void* wabase);
+void validateStack(const char*msg, obd_code_e code, int stackUnusedSize);
diff --git a/firmware/os_access.h b/firmware/os_access.h
index 302c28d79b..339f580f7e 100644
--- a/firmware/os_access.h
+++ b/firmware/os_access.h
@@ -24,12 +24,4 @@ extern "C"
 
 #include "io_pins.h"
 
-/*
- * Stack debugging
- * See also getMaxUsedStack()
- */
-EXTERNC int getRemainingStack(thread_t *otp);
-int CountFreeStackSpace(const void* wabase);
-void validateStack(const char*msg, obd_code_e code, int stackUnusedSize);
-
 #define HAS_OS_ACCESS
diff --git a/firmware/util/datalogging.cpp b/firmware/util/datalogging.cpp
index 1ea4f121cb..dffb844dbc 100644
--- a/firmware/util/datalogging.cpp
+++ b/firmware/util/datalogging.cpp
@@ -30,7 +30,7 @@
  *
  */
 
-#include "global.h"
+#include "globalaccess.h"
 
 #if ! EFI_UNIT_TEST
 #include "os_access.h"