diff --git a/src/lib/client/Client.h b/src/lib/client/Client.h
index 31f52b9e5..dd424dd86 100644
--- a/src/lib/client/Client.h
+++ b/src/lib/client/Client.h
@@ -11,12 +11,14 @@
 #include "deskflow/IClient.h"
 
 #include "HelloBack.h"
+#include "base/EventTypes.h"
 #include "deskflow/IClipboard.h"
 #include "net/NetworkAddress.h"
 
 #include <climits>
 #include <memory>
 
+class Event;
 class EventQueueTimer;
 namespace deskflow {
 class Screen;
@@ -154,7 +156,7 @@ public:
 
 private:
   void sendClipboard(ClipboardID);
-  void sendEvent(EventTypes, void *);
+  void sendEvent(deskflow::EventTypes, void *);
   void sendConnectionFailedEvent(const char *msg);
   void setupConnecting();
   void setupConnection();
diff --git a/src/lib/deskflow/IScreen.h b/src/lib/deskflow/IScreen.h
index 4e3a23ef6..073a2d63e 100644
--- a/src/lib/deskflow/IScreen.h
+++ b/src/lib/deskflow/IScreen.h
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "base/Event.h"
-#include "base/EventTypes.h"
 #include "deskflow/ClipboardTypes.h"
 
 class IClipboard;