diff --git a/firmware/firmware.mk b/firmware/firmware.mk
index e11a10d..d5d6ac5 100644
--- a/firmware/firmware.mk
+++ b/firmware/firmware.mk
@@ -52,7 +52,6 @@
 FLAGS += -Ios/inc
 FLAGS += -Ios/platform/$(PLATFORM)/inc
 FLAGS += -Ios/cpu/$(CPU)/inc
-FLAGS += -Ios/cpu/$(CPU)/inc/cpu/cmsis
 FLAGS += -I$(VARIANT_PATH)/inc
 FLAGS += -Iexternal/freebsd/inc
 FLAGS += -I../lib/include
diff --git a/firmware/os/cpu/cortexm4/inc/cpu/cmsis.h b/firmware/os/cpu/cortexm4/inc/cpu/cmsis.h
index 925f4ef..d740542 100644
--- a/firmware/os/cpu/cortexm4/inc/cpu/cmsis.h
+++ b/firmware/os/cpu/cortexm4/inc/cpu/cmsis.h
@@ -25,7 +25,7 @@
 #define __NVIC_PRIO_BITS 4
 #define __FPU_PRESENT 1
 
-#include <core_cm4.h>
+#include <cpu/cmsis/core_cm4.h>
 
 #ifdef __cplusplus
 }
diff --git a/firmware/os/cpu/cortexm4/inc/cpu/cmsis/core_cm4.h b/firmware/os/cpu/cortexm4/inc/cpu/cmsis/core_cm4.h
index bb6be13..fde301f 100644
--- a/firmware/os/cpu/cortexm4/inc/cpu/cmsis/core_cm4.h
+++ b/firmware/os/cpu/cortexm4/inc/cpu/cmsis/core_cm4.h
@@ -185,9 +185,9 @@
 #endif
 
 #include <stdint.h>                      /* standard types definitions                      */
-#include <core_cmInstr.h>                /* Core Instruction Access                         */
-#include <core_cmFunc.h>                 /* Core Function Access                            */
-#include <core_cmSimd.h>                 /* Compiler specific SIMD Intrinsics               */
+#include "core_cmInstr.h"                /* Core Instruction Access                         */
+#include "core_cmFunc.h"                 /* Core Function Access                            */
+#include "core_cmSimd.h"                 /* Compiler specific SIMD Intrinsics               */
 
 #ifdef __cplusplus
 }
diff --git a/firmware/os/cpu/cortexm4/inc/cpu/nanohub_math.h b/firmware/os/cpu/cortexm4/inc/cpu/nanohub_math.h
index d353c45..f00ec91 100644
--- a/firmware/os/cpu/cortexm4/inc/cpu/nanohub_math.h
+++ b/firmware/os/cpu/cortexm4/inc/cpu/nanohub_math.h
@@ -17,7 +17,7 @@
 #ifndef _CPU_NANOHUB_MATH_H_
 #define _CPU_NANOHUB_MATH_H_
 
-#include <arm_math.h>
+#include <cpu/cmsis/arm_math.h>
 
 #define asinf  arm_asinf
 #define sinf   arm_sin_f32
diff --git a/firmware/os/cpu/x86/inc/cpu/nanohub_math.h b/firmware/os/cpu/x86/inc/cpu/nanohub_math.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/firmware/os/cpu/x86/inc/cpu/nanohub_math.h