diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c
index 09b4a69891a..209d929fe07 100644
--- a/src/util/format/u_format.c
+++ b/src/util/format/u_format.c
@@ -33,6 +33,7 @@
  */
 
 #include "c11/threads.h"
+#include "util/detect_arch.h"
 #include "util/format/u_format.h"
 #include "util/format/u_format_s3tc.h"
 #include "util/u_math.h"
diff --git a/src/util/format/u_format_unpack_neon.c b/src/util/format/u_format_unpack_neon.c
index f0e3502d357..468b8868a2d 100644
--- a/src/util/format/u_format_unpack_neon.c
+++ b/src/util/format/u_format_unpack_neon.c
@@ -21,7 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#include <u_format.h>
+#include "util/detect_arch.h"
+#include "util/format/u_format.h"
 
 #if (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__)
 
diff --git a/src/util/os_misc.h b/src/util/os_misc.h
index 6a3998beaa0..ef3913ebf50 100644
--- a/src/util/os_misc.h
+++ b/src/util/os_misc.h
@@ -37,7 +37,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "detect_os.h"
+#include "util/detect.h"
 
 
 #if DETECT_OS_UNIX
diff --git a/src/util/u_debug_stack.h b/src/util/u_debug_stack.h
index 27e8d1970cd..f729ba66500 100644
--- a/src/util/u_debug_stack.h
+++ b/src/util/u_debug_stack.h
@@ -30,6 +30,8 @@
 
 #include <stdio.h>
 
+#include "util/detect_os.h"
+
 #ifdef HAVE_LIBUNWIND
 #define UNW_LOCAL_ONLY
 #include <libunwind.h>
diff --git a/src/util/u_math.h b/src/util/u_math.h
index 75d392c81f1..2a78e781180 100644
--- a/src/util/u_math.h
+++ b/src/util/u_math.h
@@ -47,6 +47,8 @@
 
 #include "bitscan.h"
 #include "u_endian.h" /* for UTIL_ARCH_BIG_ENDIAN */
+#include "util/detect_cc.h"
+#include "util/detect_arch.h"
 
 #ifdef __cplusplus
 extern "C" {