diff --git a/src/audio/module_adapter/CMakeLists.txt b/src/audio/module_adapter/CMakeLists.txt
index a7b5b219a..3bb445ff7 100644
--- a/src/audio/module_adapter/CMakeLists.txt
+++ b/src/audio/module_adapter/CMakeLists.txt
@@ -70,7 +70,6 @@ if((NOT CONFIG_LIBRARY) OR CONFIG_LIBRARY_STATIC)
 	add_local_sources(sof module/waves.c)
 	sof_add_static_library(MaxxChrome ${CMAKE_CURRENT_LIST_DIR}/lib/release/libMaxxChrome.a)
 	# folder with Waves API must be among include directories
-	target_include_directories(sof PUBLIC ${CMAKE_CURRENT_LIST_DIR}/../../include/sof/audio/)
 	endif()
 
 	if(CONFIG_DTS_CODEC)
diff --git a/src/audio/module_adapter/module/waves.c b/src/audio/module_adapter/module/waves.c
index 90b3a24a5..89091b52c 100644
--- a/src/audio/module_adapter/module/waves.c
+++ b/src/audio/module_adapter/module/waves.c
@@ -4,19 +4,16 @@
 //
 // Author: Oleksandr Strelchenko <oleksandr.strelchenko@waves.com>
 //
+
+#include <rtos/init.h>
 #include <sof/audio/module_adapter/module/generic.h>
 #include <sof/debug/debug.h>
 #include <sof/compiler_attributes.h>
-#include <rtos/init.h>
-
-#include "MaxxEffect/MaxxEffect.h"
-#include "MaxxEffect/MaxxStream.h"
-#include "MaxxEffect/MaxxStatus.h"
-#include "MaxxEffect/Initialize/MaxxEffect_Initialize.h"
-#include "MaxxEffect/Process/MaxxEffect_Process.h"
-#include "MaxxEffect/Process/MaxxEffect_Reset.h"
-#include "MaxxEffect/Control/RPC/MaxxEffect_RPC_Server.h"
-#include "MaxxEffect/Control/Direct/MaxxEffect_Revision.h"
+#include <sof/audio/MaxxEffect/Initialize/MaxxEffect_Initialize.h>
+#include <sof/audio/MaxxEffect/Process/MaxxEffect_Process.h>
+#include <sof/audio/MaxxEffect/Process/MaxxEffect_Reset.h>
+#include <sof/audio/MaxxEffect/Control/RPC/MaxxEffect_RPC_Server.h>
+#include <sof/audio/MaxxEffect/Control/Direct/MaxxEffect_Revision.h>
 
 #define MAX_CONFIG_SIZE_BYTES (8192)
 #define NUM_IO_STREAMS (1)
diff --git a/src/include/sof/audio/MaxxEffect/Control/Direct/MaxxEffect_Revision.h b/src/include/sof/audio/MaxxEffect/Control/Direct/MaxxEffect_Revision.h
index e0faf7464..eeb47e704 100644
--- a/src/include/sof/audio/MaxxEffect/Control/Direct/MaxxEffect_Revision.h
+++ b/src/include/sof/audio/MaxxEffect/Control/Direct/MaxxEffect_Revision.h
@@ -6,8 +6,8 @@
 #define MAXX_EFFECT_REVISION_H
 
 #include <stdint.h>
-#include "MaxxEffect/MaxxEffect.h"
-#include "MaxxEffect/MaxxStatus.h"
+#include <sof/audio/MaxxEffect/MaxxEffect.h>
+#include <sof/audio/MaxxEffect/MaxxStatus.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/include/sof/audio/MaxxEffect/Control/RPC/MaxxEffect_RPC_Server.h b/src/include/sof/audio/MaxxEffect/Control/RPC/MaxxEffect_RPC_Server.h
index 666a86562..984060c4c 100644
--- a/src/include/sof/audio/MaxxEffect/Control/RPC/MaxxEffect_RPC_Server.h
+++ b/src/include/sof/audio/MaxxEffect/Control/RPC/MaxxEffect_RPC_Server.h
@@ -6,8 +6,8 @@
 #define MAXX_EFFECT_RPC_SERVER_H
 
 #include <stdint.h>
-#include "MaxxEffect/MaxxEffect.h"
-#include "MaxxEffect/MaxxStatus.h"
+#include <sof/audio/MaxxEffect/MaxxEffect.h>
+#include <sof/audio/MaxxEffect/MaxxStatus.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/include/sof/audio/MaxxEffect/Initialize/MaxxEffect_Initialize.h b/src/include/sof/audio/MaxxEffect/Initialize/MaxxEffect_Initialize.h
index 3a3dc2f21..41a7747a1 100644
--- a/src/include/sof/audio/MaxxEffect/Initialize/MaxxEffect_Initialize.h
+++ b/src/include/sof/audio/MaxxEffect/Initialize/MaxxEffect_Initialize.h
@@ -54,9 +54,9 @@
 #define MAXX_EFFECT_INITIALIZE_H
 
 #include <stdint.h>
-#include "MaxxEffect/MaxxEffect.h"
-#include "MaxxEffect/MaxxStatus.h"
-#include "MaxxEffect/MaxxStream.h"
+#include <sof/audio/MaxxEffect/MaxxEffect.h>
+#include <sof/audio/MaxxEffect/MaxxStatus.h>
+#include <sof/audio/MaxxEffect/MaxxStream.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/include/sof/audio/MaxxEffect/Process/MaxxEffect_Process.h b/src/include/sof/audio/MaxxEffect/Process/MaxxEffect_Process.h
index fdcda71fc..c9e18aa26 100644
--- a/src/include/sof/audio/MaxxEffect/Process/MaxxEffect_Process.h
+++ b/src/include/sof/audio/MaxxEffect/Process/MaxxEffect_Process.h
@@ -72,9 +72,9 @@
 #ifndef MAXX_EFFECT_PROCESS_H
 #define MAXX_EFFECT_PROCESS_H
 
-#include "MaxxEffect/MaxxEffect.h"
-#include "MaxxEffect/MaxxStatus.h"
-#include "MaxxEffect/MaxxStream.h"
+#include <sof/audio/MaxxEffect/MaxxEffect.h>
+#include <sof/audio/MaxxEffect/MaxxStatus.h>
+#include <sof/audio/MaxxEffect/MaxxStream.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/include/sof/audio/MaxxEffect/Process/MaxxEffect_Reset.h b/src/include/sof/audio/MaxxEffect/Process/MaxxEffect_Reset.h
index bc03347e5..75ff92947 100644
--- a/src/include/sof/audio/MaxxEffect/Process/MaxxEffect_Reset.h
+++ b/src/include/sof/audio/MaxxEffect/Process/MaxxEffect_Reset.h
@@ -5,8 +5,8 @@
 #ifndef MAXX_EFFECT_RESET_H
 #define MAXX_EFFECT_RESET_H
 
-#include "MaxxEffect/MaxxEffect.h"
-#include "MaxxEffect/MaxxStatus.h"
+#include <sof/audio/MaxxEffect/MaxxEffect.h>
+#include <sof/audio/MaxxEffect/MaxxStatus.h>
 
 #ifdef __cplusplus
 extern "C" {