diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt
index da735c0a..c3708163 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 adccae0d..05af63a5 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 39afe27a..488698ba 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 6eda5e39..20001360 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 2a582adc..5d598add 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 217291bb..74b33ac2 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 eb8b7474..75f1fcfe 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 9620c39f..2b63c0c2 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 e7741a03..cd51c3f0 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 2e07e587..cdee1a28 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 e1e787f7..1ec3fe4e 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 d1d5febe..f717f16e 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/
 )