diff --git a/src/Makefile.am b/src/Makefile.am
index 697b32d69037..d864b3694956 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 export COMMON_INCDIR = \
+	$(PLATFORM_INCDIR) \
 	$(SOF_INCDIR) \
-	$(ARCH_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(ARCH_INCDIR)
 
 if BUILD_LIB
 SUBDIRS = ipc math audio arch include library host
diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am
index 88dc8c6678e5..696a450a0808 100644
--- a/src/arch/xtensa/Makefile.am
+++ b/src/arch/xtensa/Makefile.am
@@ -50,8 +50,8 @@ endif
 sof_CFLAGS = \
 	$(ARCH_INCDIR) \
 	$(ARCH_CFLAGS) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
 
 sof_CCASFLAGS = \
 	$(ARCH_INCDIR) \
@@ -111,8 +111,8 @@ boot_ldr_SOURCES = \
 boot_ldr_CFLAGS = \
 	$(ARCH_INCDIR) \
 	$(ARCH_CFLAGS) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
 
 boot_ldr_CCASFLAGS = \
 	$(ARCH_INCDIR) \
diff --git a/src/drivers/Makefile.am b/src/drivers/Makefile.am
index d87f4a08968d..f6b8dd8d5adc 100644
--- a/src/drivers/Makefile.am
+++ b/src/drivers/Makefile.am
@@ -39,6 +39,6 @@ endif
 
 libdrivers_a_CFLAGS = \
 	$(ARCH_CFLAGS) \
+	$(PLATFORM_INCDIR) \
 	$(SOF_INCDIR) \
-	$(ARCH_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(ARCH_INCDIR)
diff --git a/src/init/Makefile.am b/src/init/Makefile.am
index a4641c6caf30..28a51af51d5c 100644
--- a/src/init/Makefile.am
+++ b/src/init/Makefile.am
@@ -6,5 +6,5 @@ libinit_a_SOURCES = \
 libinit_a_CFLAGS = \
 	$(ARCH_CFLAGS) \
 	$(ARCH_INCDIR) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 31750790d43a..5b52be4dec3a 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -15,8 +15,8 @@ libcore_a_SOURCES = \
 libcore_a_CFLAGS = \
 	$(ARCH_CFLAGS) \
 	$(ARCH_INCDIR) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
 
 libdma_a_SOURCES = \
 	dma.c
@@ -24,5 +24,5 @@ libdma_a_SOURCES = \
 libdma_a_CFLAGS = \
 	$(ARCH_CFLAGS) \
 	$(ARCH_INCDIR) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
diff --git a/src/platform/apollolake/Makefile.am b/src/platform/apollolake/Makefile.am
index 1732a6d310c7..a7fc290c569a 100644
--- a/src/platform/apollolake/Makefile.am
+++ b/src/platform/apollolake/Makefile.am
@@ -19,8 +19,8 @@ libplatform_a_SOURCES = \
 libplatform_a_CFLAGS = \
 	$(ARCH_CFLAGS) \
 	$(ARCH_INCDIR) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
 
 noinst_PROGRAMS = module boot_module
 
@@ -29,13 +29,13 @@ module_SOURCES = \
 
 module_CFLAGS = \
 	$(ARCH_INCDIR) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
 
 boot_module_SOURCES = \
 	boot_module.c
 
 boot_module_CFLAGS = \
 	$(ARCH_INCDIR) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
diff --git a/src/platform/baytrail/Makefile.am b/src/platform/baytrail/Makefile.am
index 22031d4acf50..03e9c2dbad73 100644
--- a/src/platform/baytrail/Makefile.am
+++ b/src/platform/baytrail/Makefile.am
@@ -15,5 +15,5 @@ libplatform_a_SOURCES = \
 libplatform_a_CFLAGS = \
 	$(ARCH_CFLAGS) \
 	$(ARCH_INCDIR) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
diff --git a/src/platform/cannonlake/Makefile.am b/src/platform/cannonlake/Makefile.am
index da7b4e9aef56..db622b5e92be 100644
--- a/src/platform/cannonlake/Makefile.am
+++ b/src/platform/cannonlake/Makefile.am
@@ -19,8 +19,8 @@ libplatform_a_SOURCES = \
 libplatform_a_CFLAGS = \
 	$(ARCH_CFLAGS) \
 	$(ARCH_INCDIR) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
 
 noinst_PROGRAMS = module boot_module
 
@@ -29,13 +29,13 @@ module_SOURCES = \
 
 module_CFLAGS = \
 	$(ARCH_INCDIR) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
 
 boot_module_SOURCES = \
 	boot_module.c
 
 boot_module_CFLAGS = \
 	$(ARCH_INCDIR) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
\ No newline at end of file
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
\ No newline at end of file
diff --git a/src/platform/haswell/Makefile.am b/src/platform/haswell/Makefile.am
index 4591c1281ced..0bb95b2242a2 100644
--- a/src/platform/haswell/Makefile.am
+++ b/src/platform/haswell/Makefile.am
@@ -15,5 +15,5 @@ libplatform_a_SOURCES = \
 libplatform_a_CFLAGS = \
 	$(ARCH_CFLAGS) \
 	$(ARCH_INCDIR) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)
diff --git a/src/tasks/Makefile.am b/src/tasks/Makefile.am
index 190b54d06500..cad7565d9560 100644
--- a/src/tasks/Makefile.am
+++ b/src/tasks/Makefile.am
@@ -6,5 +6,5 @@ libtasks_a_SOURCES = \
 libtasks_a_CFLAGS = \
 	$(ARCH_CFLAGS) \
 	$(ARCH_INCDIR) \
-	$(SOF_INCDIR) \
-	$(PLATFORM_INCDIR)
+	$(PLATFORM_INCDIR) \
+	$(SOF_INCDIR)