diff --git a/producer/event_monitor_producer/src/inotify_event.h b/producer/event_monitor_producer/src/inotify_event.h
index 530b15cdad13e29af15c5cf26aae631eb7dc6586..9ba0d7ec1e136b8b4d2a6cca234ef364808e91d8 100644
--- a/producer/event_monitor_producer/src/inotify_event.h
+++ b/producer/event_monitor_producer/src/inotify_event.h
@@ -6,7 +6,7 @@
 #include <string>
 
 #include "asapo/common/error.h"
-#include "asapo/common.h"
+#include "common.h"
 
 
 namespace asapo {
diff --git a/producer/event_monitor_producer/src/shared_event_list.h b/producer/event_monitor_producer/src/shared_event_list.h
index 19b0d65118d20ad3ae7c8404a0ea021e482c2907..02e2aa421a4fb1f13afe198ad9f8d739a38dd2d8 100644
--- a/producer/event_monitor_producer/src/shared_event_list.h
+++ b/producer/event_monitor_producer/src/shared_event_list.h
@@ -7,7 +7,7 @@
 #include <mutex>
 #include <windows.h>
 #include <chrono>
-#include "asapo/common.h"
+#include "common.h"
 
 namespace asapo {
 
diff --git a/producer/event_monitor_producer/src/system_folder_watch_linux.h b/producer/event_monitor_producer/src/system_folder_watch_linux.h
index febf1f2af10462c0bd800f6c84ab89c73f3f3e2f..914e1f297c7102ea9845916ce5aa67498ed1cddd 100644
--- a/producer/event_monitor_producer/src/system_folder_watch_linux.h
+++ b/producer/event_monitor_producer/src/system_folder_watch_linux.h
@@ -8,8 +8,8 @@
 
 #include "asapo/common/error.h"
 #include "asapo/preprocessor/definitions.h"
-#include "asapo_producer.h"
-#include "asapo/common.h"
+#include "asapo/asapo_producer.h"
+#include "common.h"
 #include "asapo/io/io.h"
 #include "inotify_event.h"
 #include "inotify_linux.h"
diff --git a/producer/event_monitor_producer/src/system_folder_watch_windows.h b/producer/event_monitor_producer/src/system_folder_watch_windows.h
index 87f8acebe2e83d39c23959ae071590d5b4773fb0..77cfb6fb4a617dfea7e08787136aad5e436a043e 100644
--- a/producer/event_monitor_producer/src/system_folder_watch_windows.h
+++ b/producer/event_monitor_producer/src/system_folder_watch_windows.h
@@ -6,8 +6,8 @@
 
 #include "asapo/common/error.h"
 #include "asapo/preprocessor/definitions.h"
-#include "asapo_producer.h"
-#include "asapo/common.h"
+#include "asapo/asapo_producer.h"
+#include "common.h"
 #include "asapo/io/io.h"
 #include "shared_event_list.h"