diff --git a/src/lib/base/IEventQueue.h b/src/lib/base/IEventQueue.h
index da963a1b5..6d0eaa459 100644
--- a/src/lib/base/IEventQueue.h
+++ b/src/lib/base/IEventQueue.h
@@ -9,10 +9,8 @@
 #pragma once
 
 #include "base/Event.h"
-#include "base/EventTypes.h"
 
 #include <functional>
-#include <string>
 
 class IEventQueueBuffer;
 
diff --git a/src/lib/deskflow/IKeyState.h b/src/lib/deskflow/IKeyState.h
index 3fa8f3fb1..cad575a64 100644
--- a/src/lib/deskflow/IKeyState.h
+++ b/src/lib/deskflow/IKeyState.h
@@ -12,6 +12,7 @@
 #include "deskflow/KeyTypes.h"
 
 #include <set>
+#include <string>
 
 //! Key state interface
 /*!