diff --git a/posix/include/rtos/alloc.h b/posix/include/rtos/alloc.h
index d64ea319f48e..45bcda659789 100644
--- a/posix/include/rtos/alloc.h
+++ b/posix/include/rtos/alloc.h
@@ -18,9 +18,10 @@
 
 #include <rtos/bit.h>
 #include <rtos/string.h>
+#ifndef MODULE_PRIVAT
 #include <sof/trace/trace.h>
 #include <user/trace.h>
-
+#endif
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/posix/include/rtos/idc.h b/posix/include/rtos/idc.h
index 8bfbb5c5ad19..fde1fd275562 100644
--- a/posix/include/rtos/idc.h
+++ b/posix/include/rtos/idc.h
@@ -13,12 +13,13 @@
 
 #ifndef __POSIX_RTOS_IDC_H__
 #define __POSIX_RTOS_IDC_H__
-
+#ifndef MODULE_PRIVAT
 #include <arch/drivers/idc.h>
 #include <platform/drivers/idc.h>
 #include <rtos/task.h>
 #include <sof/trace/trace.h>
 #include <user/trace.h>
+#endif
 #include <stdint.h>
 #include <rtos/cache.h>
 
diff --git a/src/audio/up_down_mixer/up_down_mixer.h b/src/audio/up_down_mixer/up_down_mixer.h
index 52a5f1e34daa..7ea4e22dad86 100644
--- a/src/audio/up_down_mixer/up_down_mixer.h
+++ b/src/audio/up_down_mixer/up_down_mixer.h
@@ -7,12 +7,16 @@
 
 #ifndef __SOF_AUDIO_UP_DOWN_MIXER_H__
 #define __SOF_AUDIO_UP_DOWN_MIXER_H__
-
+#ifndef MODULE_PRIVAT
 #include <sof/audio/component_ext.h>
-#include <sof/audio/ipc-config.h>
 #include <sof/common.h>
+#endif
+#include <sof/audio/ipc-config.h>
+
 #include <ipc/stream.h>
+#ifndef MODULE_PRIVAT
 #include <ipc4/module.h>
+#endif
 #include <ipc4/base-config.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/include/module/audio/sink_api.h b/src/include/module/audio/sink_api.h
index d5fd0118b3bf..6c4a71b02f14 100644
--- a/src/include/module/audio/sink_api.h
+++ b/src/include/module/audio/sink_api.h
@@ -6,8 +6,9 @@
 
 #ifndef __MODULE_AUDIO_SINK_API_H__
 #define __MODULE_AUDIO_SINK_API_H__
-
+#ifndef MODULE_PRIVAT
 #include <errno.h>
+#endif
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/include/module/audio/source_api.h b/src/include/module/audio/source_api.h
index e4b522bdb7f0..fa23d2f08350 100644
--- a/src/include/module/audio/source_api.h
+++ b/src/include/module/audio/source_api.h
@@ -6,8 +6,9 @@
 
 #ifndef __MODULE_AUDIO_SOURCE_API_H__
 #define __MODULE_AUDIO_SOURCE_API_H__
-
+#ifndef MODULE_PRIVAT
 #include <errno.h>
+#endif
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/include/sof/audio/dp_queue.h b/src/include/sof/audio/dp_queue.h
index bdbf17920d94..e2b87e1a6fc3 100644
--- a/src/include/sof/audio/dp_queue.h
+++ b/src/include/sof/audio/dp_queue.h
@@ -12,10 +12,10 @@
 #ifndef MODULE_PRIVAT
 #include <sof/audio/audio_stream.h>
 #include <rtos/bit.h>
+#endif
 #include <sof/common.h>
 #include <ipc/topology.h>
 #include <sof/coherent.h>
-#endif
 /**
  * DP queue is a lockless circular buffer
  * providing safe consumer/producer cached operations cross cores
diff --git a/src/include/sof/audio/module_adapter/library/native_system_service.h b/src/include/sof/audio/module_adapter/library/native_system_service.h
index 74f6a823192b..9fa6cdddbc17 100644
--- a/src/include/sof/audio/module_adapter/library/native_system_service.h
+++ b/src/include/sof/audio/module_adapter/library/native_system_service.h
@@ -7,8 +7,9 @@
 #define NATIVE_SYSTEM_SERVICE_H
 
 #include <stdint.h>
-
+#ifndef MODULE_PRIVAT
 #include "logger.h"
+#endif
 #include "adsp_stddef.h"
 #include <module/iadk/adsp_error_code.h>
 
diff --git a/src/include/sof/coherent.h b/src/include/sof/coherent.h
index 445e8eae9b1c..c1f499425323 100644
--- a/src/include/sof/coherent.h
+++ b/src/include/sof/coherent.h
@@ -11,7 +11,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-
 #include <rtos/spinlock.h>
 #include <sof/list.h>
 #include <sof/lib/memory.h>
diff --git a/src/include/sof/common.h b/src/include/sof/common.h
index 6a875f5a90f7..3d8edbde0a13 100644
--- a/src/include/sof/common.h
+++ b/src/include/sof/common.h
@@ -25,9 +25,10 @@
 #define ALIGN_UP_INTERNAL(val, align) (((val) + (align) - 1) & ~((align) - 1))
 
 #if !defined(__ASSEMBLER__) && defined(__XTENSA__)
-
+#ifndef MODULE_PRIVAT
 #include <ipc/trace.h>
 #include <rtos/panic.h>
+#endif
 #define VERIFY_ALIGN
 
 #endif
diff --git a/src/platform/library/include/platform/lib/memory.h b/src/platform/library/include/platform/lib/memory.h
index fafb3df303f7..f8234dece4fc 100644
--- a/src/platform/library/include/platform/lib/memory.h
+++ b/src/platform/library/include/platform/lib/memory.h
@@ -15,8 +15,10 @@
 
 /* prioritize definitions in Zephyr SoC layer */
 #ifdef __ZEPHYR__
+#ifndef MODULE_PRIVAT
 #include <adsp_memory.h>
 #endif
+#endif
 
 struct sof;
 
diff --git a/xtos/include/sof/compiler_attributes.h b/xtos/include/sof/compiler_attributes.h
index 30ccaff1fe15..e25515a9643c 100644
--- a/xtos/include/sof/compiler_attributes.h
+++ b/xtos/include/sof/compiler_attributes.h
@@ -6,12 +6,12 @@
  */
 
 #ifdef __ZEPHYR__
-
+#ifndef MODULE_PRIVAT
 #include <zephyr/toolchain.h>
 
 /* Get __sparse_cache and __sparse_force definitions if __CHECKER__ is defined */
 #include <zephyr/debug/sparse.h>
-
+#endif
 #else
 
 #define __sparse_cache
diff --git a/zephyr/include/rtos/spinlock.h b/zephyr/include/rtos/spinlock.h
index 24b0ee9dc579..05b82349f481 100644
--- a/zephyr/include/rtos/spinlock.h
+++ b/zephyr/include/rtos/spinlock.h
@@ -5,10 +5,10 @@
 
 #ifndef __ZEPHYR_RTOS_SPINLOCK_H__
 #define __ZEPHYR_RTOS_SPINLOCK_H__
-
+#ifndef MODULE_PRIVAT
 #include <zephyr/kernel.h>
 #include <zephyr/spinlock.h>
-
+#endif
 /* not implemented on Zephyr, but used within SOF */
 static inline void k_spinlock_init(struct k_spinlock *lock)
 {
diff --git a/zephyr/include/sof/lib/cpu.h b/zephyr/include/sof/lib/cpu.h
index 349ad2af15d2..e2a579ff5703 100644
--- a/zephyr/include/sof/lib/cpu.h
+++ b/zephyr/include/sof/lib/cpu.h
@@ -19,9 +19,9 @@
 #if !defined(__ASSEMBLER__) && !defined(LINKER)
 
 #include <stdbool.h>
-
+#ifndef MODULE_PRIVAT
 #include <zephyr/arch/arch_inlines.h>
-
+#endif
 #if CONFIG_PM
 
 #include <zephyr/pm/pm.h>