diff --git a/producer/event_monitor_producer/src/inotify_linux.h b/producer/event_monitor_producer/src/inotify_linux.h
index 44e82ce3700f86754f5a03e11d82e51f1bc25366..8a5890fdeead61e378274927cf76c435dae436a9 100644
--- a/producer/event_monitor_producer/src/inotify_linux.h
+++ b/producer/event_monitor_producer/src/inotify_linux.h
@@ -11,10 +11,10 @@ namespace asapo {
 
 class Inotify {
   public:
-    VIRTUAL int Init();
-    VIRTUAL int AddWatch(int fd, const char* name, uint32_t mask);
-    VIRTUAL int DeleteWatch(int fd, int wd);
-    VIRTUAL ssize_t Read(int fd, void* buf, size_t nbytes);
+    ASAPO_VIRTUAL int Init();
+    ASAPO_VIRTUAL int AddWatch(int fd, const char* name, uint32_t mask);
+    ASAPO_VIRTUAL int DeleteWatch(int fd, int wd);
+    ASAPO_VIRTUAL ssize_t Read(int fd, void* buf, size_t nbytes);
 };
 
 }
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 914e1f297c7102ea9845916ce5aa67498ed1cddd..828f4dec22bfdfbb049b3607124aac2b16b7accd 100644
--- a/producer/event_monitor_producer/src/system_folder_watch_linux.h
+++ b/producer/event_monitor_producer/src/system_folder_watch_linux.h
@@ -32,8 +32,8 @@ const uint32_t kInotifyWatchFlags  = IN_CLOSE_WRITE |
 
 class SystemFolderWatch {
   public:
-    VIRTUAL Error StartFolderMonitor(const std::string& root_folder, const std::vector<std::string>& monitored_folders);
-    VIRTUAL FilesToSend GetFileList(Error* err);
+    ASAPO_VIRTUAL Error StartFolderMonitor(const std::string& root_folder, const std::vector<std::string>& monitored_folders);
+    ASAPO_VIRTUAL FilesToSend GetFileList(Error* err);
     SystemFolderWatch();
     std::unique_ptr<IO> io__;
     std::unique_ptr<Inotify> inotify__;
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 77cfb6fb4a617dfea7e08787136aad5e436a043e..3fdd02c9c8428af80291ff5c3324fb0be657de9c 100644
--- a/producer/event_monitor_producer/src/system_folder_watch_windows.h
+++ b/producer/event_monitor_producer/src/system_folder_watch_windows.h
@@ -18,9 +18,9 @@ namespace asapo {
 class SystemFolderWatch {
   public:
     SystemFolderWatch();
-    VIRTUAL Error StartFolderMonitor(const std::string& root_folder,
+    ASAPO_VIRTUAL Error StartFolderMonitor(const std::string& root_folder,
                                      const std::vector<std::string>& monitored_folders);
-    VIRTUAL FilesToSend GetFileList(Error* err);
+    ASAPO_VIRTUAL FilesToSend GetFileList(Error* err);
     std::unique_ptr<IO> io__;
   private:
     SharedEventList event_list_;
diff --git a/producer/event_monitor_producer/src/watch_io.h b/producer/event_monitor_producer/src/watch_io.h
index c941109898bd2643d0cbec0c094dfb8d9d6e3b83..afa567d5e01fd77379cc7bbe980990a6a7692a5a 100644
--- a/producer/event_monitor_producer/src/watch_io.h
+++ b/producer/event_monitor_producer/src/watch_io.h
@@ -12,9 +12,9 @@ namespace asapo {
 class WatchIO {
   public:
     explicit WatchIO();
-    VIRTUAL HANDLE Init(const char* folder, Error* err);
-    VIRTUAL Error ReadDirectoryChanges(HANDLE handle, LPVOID buffer, DWORD buffer_length, LPDWORD bytes_returned);
-    VIRTUAL bool IsDirectory(const std::string& path);
+    ASAPO_VIRTUAL HANDLE Init(const char* folder, Error* err);
+    ASAPO_VIRTUAL Error ReadDirectoryChanges(HANDLE handle, LPVOID buffer, DWORD buffer_length, LPDWORD bytes_returned);
+    ASAPO_VIRTUAL bool IsDirectory(const std::string& path);
   private:
     std::unique_ptr<IO>io_;
 };