diff --git a/silecs-codegen/src/xml/fesa/fesa_3_0_0/fesaTemplates.py b/silecs-codegen/src/xml/fesa/fesa_3_0_0/fesaTemplates.py
index 5171e2dd0c491de899a7bc6613d102427afde7ba..223e535076e763513a9ba65bfd70a6b49bdcf694 100644
--- a/silecs-codegen/src/xml/fesa/fesa_3_0_0/fesaTemplates.py
+++ b/silecs-codegen/src/xml/fesa/fesa_3_0_0/fesaTemplates.py
@@ -105,7 +105,7 @@ htop = """/*
 #ifndef ${className}_${className}_H_
 #define ${className}_${className}_H_
 
-#include <SilecsService.h>
+#include <silecs-communication/interface/core/SilecsService.h>
 #include <fesa-core/Synchronization/MultiplexingContext.h>
 #include <${className}/GeneratedCode/ServiceLocator.h>
 """
@@ -635,7 +635,7 @@ SILECS_PATH ?= ${centralMakefilePath}
 override WARNFLAGS += 
 
 # Additional compiler flags
-COMPILER_FLAGS += -I$(SILECS_PATH)/include -I$(SILECS_PATH)/include/silecs-communication/interface/core
+COMPILER_FLAGS += -I$(SILECS_PATH)/include
 COMPILER_FLAGS +=
 LINKER_FLAGS +=