diff --git a/src/audio/module_adapter/iadk/system_agent.cpp b/src/audio/module_adapter/iadk/system_agent.cpp
index f42d0e158..77c0e120d 100644
--- a/src/audio/module_adapter/iadk/system_agent.cpp
+++ b/src/audio/module_adapter/iadk/system_agent.cpp
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <rtos/string.h>
 #include <utilities/array.h>
-#include <adsp_error_code.h>
+#include <module/iadk/adsp_error_code.h>
 #include <logger.h>
 #include <native_system_service.h>
 #include <system_agent_interface.h>
diff --git a/src/include/sof/audio/module_adapter/iadk/adsp_error_code.h b/src/include/module/iadk/adsp_error_code.h
similarity index 78%
rename from src/include/sof/audio/module_adapter/iadk/adsp_error_code.h
rename to src/include/module/iadk/adsp_error_code.h
index 8dbcd2698..e7b820e0e 100644
--- a/src/include/sof/audio/module_adapter/iadk/adsp_error_code.h
+++ b/src/include/module/iadk/adsp_error_code.h
@@ -1,10 +1,12 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright(c) 2022 Intel Corporation. All rights reserved.
+ * Copyright(c) 2022 - 2023 Intel Corporation. All rights reserved.
+ *
+ * Author: Adrian Warecki <adrian.warecki@intel.com>
  */
 
-#ifndef _ADSP_ERROR_CODE_H_
-#define _ADSP_ERROR_CODE_H_
+#ifndef __MODULE_IADK_ADSP_ERROR_CODE_H__
+#define __MODULE_IADK_ADSP_ERROR_CODE_H__
 
 #include <stdint.h>
 
@@ -34,4 +36,4 @@ typedef uint32_t AdspErrorCode;
 /* Service is not supported on target platform. */
 #define ADSP_SERVICE_UNAVAILABLE 143
 
-#endif /* _ADSP_ERROR_CODE_H_ */
+#endif /* __MODULE_IADK_ADSP_ERROR_CODE_H__ */
diff --git a/src/include/sof/audio/module_adapter/iadk/system_error.h b/src/include/sof/audio/module_adapter/iadk/system_error.h
index 57b57b4b8..821f13669 100644
--- a/src/include/sof/audio/module_adapter/iadk/system_error.h
+++ b/src/include/sof/audio/module_adapter/iadk/system_error.h
@@ -7,7 +7,7 @@
 #ifndef _ADSP_SYSTEM_ERROR_H_
 #define _ADSP_SYSTEM_ERROR_H_
 
-#include "adsp_error_code.h"
+#include <module/iadk/adsp_error_code.h>
 
 namespace intel_adsp
 {
diff --git a/src/include/sof/audio/module_adapter/iadk/system_service.h b/src/include/sof/audio/module_adapter/iadk/system_service.h
index 54b15c0ab..453247a38 100644
--- a/src/include/sof/audio/module_adapter/iadk/system_service.h
+++ b/src/include/sof/audio/module_adapter/iadk/system_service.h
@@ -9,7 +9,7 @@
 
 #include "logger.h"
 #include "adsp_stddef.h"
-#include "adsp_error_code.h"
+#include <module/iadk/adsp_error_code.h>
 #include "native_system_service.h"
 #include <stdint.h>
 
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 6007770e2..74f6a8231 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
@@ -5,10 +5,12 @@
 /*! \file native_system_service.h */
 #ifndef NATIVE_SYSTEM_SERVICE_H
 #define NATIVE_SYSTEM_SERVICE_H
+
+#include <stdint.h>
+
 #include "logger.h"
 #include "adsp_stddef.h"
-#include "adsp_error_code.h"
-#include <stdint.h>
+#include <module/iadk/adsp_error_code.h>
 
 /*! \brief This struct defines the obfuscating type for notifications. */
 typedef struct _adsp_notification_handle {} *adsp_notification_handle;