diff --git a/include/macros.h b/include/macros.h
index 65e7f88e2e..f0a411428e 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -538,7 +538,7 @@ typedef s32 Difficulty2D[AC_DIFFICULTY_LEN][2];
 
 #define DMA_COPY_SEGMENT(segment) dma_copy(segment##_ROM_START, segment##_ROM_END, segment##_VRAM)
 
-#if __STDC_VERSION__ < 202311L
+#if defined(OLD_GCC) || __STDC_VERSION__ < 202311L
 typedef enum {
     false,
     true
diff --git a/include/types.h b/include/types.h
index bb8bd4fe63..d7b6ca156b 100644
--- a/include/types.h
+++ b/include/types.h
@@ -3,10 +3,10 @@
 
 #include "ultra64.h"
 
-#if (defined(__cplusplus) && __cplusplus >= 201103L)
+#if !defined(OLD_GCC) && (defined(__cplusplus) && __cplusplus >= 201103L)
     /* C++11 or later */
     #include <cstddef>
-#elif (defined(__STDC__) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202000L))
+#elif !defined(OLD_GCC) && (defined(__STDC__) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202000L))
     /* C23 or later */
     #include <stddef.h>
 #else