diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt
index da735c0a6..c37081630 100644
--- a/src/cmd/synergyc/CMakeLists.txt
+++ b/src/cmd/synergyc/CMakeLists.txt
@@ -46,7 +46,6 @@ if (SYNERGY_ADD_HEADERS)
 endif()
 
 include_directories(
-    ../
     ../../lib/
 )
 
diff --git a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp b/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp
index adccae0da..05af63a5b 100644
--- a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp
+++ b/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergyc/MSWindowsClientTaskBarReceiver.h"
+#include "MSWindowsClientTaskBarReceiver.h"
 
 #include "resource.h"
 #include "client/Client.h"
diff --git a/src/cmd/synergyc/OSXClientTaskBarReceiver.cpp b/src/cmd/synergyc/OSXClientTaskBarReceiver.cpp
index 39afe27aa..488698ba7 100644
--- a/src/cmd/synergyc/OSXClientTaskBarReceiver.cpp
+++ b/src/cmd/synergyc/OSXClientTaskBarReceiver.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergyc/OSXClientTaskBarReceiver.h"
+#include "OSXClientTaskBarReceiver.h"
 #include "arch/Arch.h"
 
 //
diff --git a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp b/src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp
index 6eda5e391..20001360c 100644
--- a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp
+++ b/src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergyc/XWindowsClientTaskBarReceiver.h"
+#include "XWindowsClientTaskBarReceiver.h"
 #include "arch/Arch.h"
 
 //
diff --git a/src/cmd/synergyc/synergyc.cpp b/src/cmd/synergyc/synergyc.cpp
index 2a582adc2..5d598add9 100644
--- a/src/cmd/synergyc/synergyc.cpp
+++ b/src/cmd/synergyc/synergyc.cpp
@@ -22,11 +22,11 @@
 #include "base/EventQueue.h"
 
 #if WINAPI_MSWINDOWS
-#include "synergyc/MSWindowsClientTaskBarReceiver.h"
+#include "MSWindowsClientTaskBarReceiver.h"
 #elif WINAPI_XWINDOWS
-#include "synergyc/XWindowsClientTaskBarReceiver.h"
+#include "XWindowsClientTaskBarReceiver.h"
 #elif WINAPI_CARBON
-#include "synergyc/OSXClientTaskBarReceiver.h"
+#include "OSXClientTaskBarReceiver.h"
 #else
 #error Platform not supported.
 #endif
diff --git a/src/cmd/synergyd/CMakeLists.txt b/src/cmd/synergyd/CMakeLists.txt
index 217291bba..74b33ac2b 100644
--- a/src/cmd/synergyd/CMakeLists.txt
+++ b/src/cmd/synergyd/CMakeLists.txt
@@ -18,7 +18,6 @@ file(GLOB headers "*.h")
 file(GLOB sources "*.cpp")
 
 include_directories(
-    ../
     ../../lib/
 )
 
diff --git a/src/cmd/synergys/CMakeLists.txt b/src/cmd/synergys/CMakeLists.txt
index eb8b74749..75f1fcfee 100644
--- a/src/cmd/synergys/CMakeLists.txt
+++ b/src/cmd/synergys/CMakeLists.txt
@@ -46,7 +46,6 @@ if (SYNERGY_ADD_HEADERS)
 endif()
 
 include_directories(
-    ../
     ../../lib/
 )
 
diff --git a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp b/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp
index 9620c39f4..2b63c0c27 100644
--- a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp
+++ b/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergys/MSWindowsServerTaskBarReceiver.h"
+#include "MSWindowsServerTaskBarReceiver.h"
 
 #include "resource.h"
 #include "server/Server.h"
diff --git a/src/cmd/synergys/OSXServerTaskBarReceiver.cpp b/src/cmd/synergys/OSXServerTaskBarReceiver.cpp
index e7741a032..cd51c3f02 100644
--- a/src/cmd/synergys/OSXServerTaskBarReceiver.cpp
+++ b/src/cmd/synergys/OSXServerTaskBarReceiver.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergys/OSXServerTaskBarReceiver.h"
+#include "OSXServerTaskBarReceiver.h"
 #include "arch/Arch.h"
 
 //
diff --git a/src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp b/src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp
index 2e07e5877..cdee1a282 100644
--- a/src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp
+++ b/src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "synergys/XWindowsServerTaskBarReceiver.h"
+#include "XWindowsServerTaskBarReceiver.h"
 #include "arch/Arch.h"
 
 //
diff --git a/src/cmd/synergys/synergys.cpp b/src/cmd/synergys/synergys.cpp
index e1e787f7e..1ec3fe4eb 100644
--- a/src/cmd/synergys/synergys.cpp
+++ b/src/cmd/synergys/synergys.cpp
@@ -22,11 +22,11 @@
 #include "base/EventQueue.h"
 
 #if WINAPI_MSWINDOWS
-#include "synergys/MSWindowsServerTaskBarReceiver.h"
+#include "MSWindowsServerTaskBarReceiver.h"
 #elif WINAPI_XWINDOWS
-#include "synergys/XWindowsServerTaskBarReceiver.h"
+#include "XWindowsServerTaskBarReceiver.h"
 #elif WINAPI_CARBON
-#include "synergys/OSXServerTaskBarReceiver.h"
+#include "OSXServerTaskBarReceiver.h"
 #else
 #error Platform not supported.
 #endif
diff --git a/src/cmd/syntool/CMakeLists.txt b/src/cmd/syntool/CMakeLists.txt
index d1d5febed..f717f16ea 100644
--- a/src/cmd/syntool/CMakeLists.txt
+++ b/src/cmd/syntool/CMakeLists.txt
@@ -17,7 +17,6 @@ file(GLOB headers "*.h")
 file(GLOB sources "*.cpp")
 
 include_directories(
-    ../
     ../../lib/
 )