diff --git a/Makefile.am b/Makefile.am
index 09e0b5c56b..2b3bf549fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = .
+VDEPTH = ./$(VPATH)
 
 SUBDIRS =					\
 	lib						\
diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index 60341d6a9c..ade290012d 100644
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 SUBDIRS =					\
 	synergy					\
diff --git a/cmd/synergy/Makefile.am b/cmd/synergy/Makefile.am
index 0345af5a1c..87df1dfc73 100644
--- a/cmd/synergy/Makefile.am
+++ b/cmd/synergy/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ../..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 EXTRA_DIST =				\
 	synergy.dsp				\
@@ -32,11 +33,11 @@ synergy_LDADD =							\
 	$(X_EXTRA_LIBS)						\
 	$(NULL)
 INCLUDES =								\
-	-I$(DEPTH)/lib/base 				\
-	-I$(DEPTH)/lib/mt	 				\
-	-I$(DEPTH)/lib/io	 				\
-	-I$(DEPTH)/lib/net	 				\
-	-I$(DEPTH)/lib/synergy				\
-	-I$(DEPTH)/lib/platform 			\
-	-I$(DEPTH)/lib/client 				\
+	-I$(VDEPTH)/lib/base 				\
+	-I$(VDEPTH)/lib/mt	 				\
+	-I$(VDEPTH)/lib/io	 				\
+	-I$(VDEPTH)/lib/net	 				\
+	-I$(VDEPTH)/lib/synergy				\
+	-I$(VDEPTH)/lib/platform 			\
+	-I$(VDEPTH)/lib/client 				\
 	$(NULL)
diff --git a/cmd/synergyd/Makefile.am b/cmd/synergyd/Makefile.am
index f3e75fcefd..287a620cbc 100644
--- a/cmd/synergyd/Makefile.am
+++ b/cmd/synergyd/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ../..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 EXTRA_DIST =				\
 	synergyd.dsp			\
@@ -33,12 +34,12 @@ synergyd_LDADD =						\
 	$(X_EXTRA_LIBS)						\
 	$(NULL)
 INCLUDES =								\
-	-I$(DEPTH)/lib/base 				\
-	-I$(DEPTH)/lib/mt	 				\
-	-I$(DEPTH)/lib/io	 				\
-	-I$(DEPTH)/lib/http 				\
-	-I$(DEPTH)/lib/net	 				\
-	-I$(DEPTH)/lib/synergy				\
-	-I$(DEPTH)/lib/platform 			\
-	-I$(DEPTH)/lib/server	 			\
+	-I$(VDEPTH)/lib/base 				\
+	-I$(VDEPTH)/lib/mt	 				\
+	-I$(VDEPTH)/lib/io	 				\
+	-I$(VDEPTH)/lib/http 				\
+	-I$(VDEPTH)/lib/net	 				\
+	-I$(VDEPTH)/lib/synergy				\
+	-I$(VDEPTH)/lib/platform 			\
+	-I$(VDEPTH)/lib/server	 			\
 	$(NULL)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c7dda5af2b..c98329def5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 SUBDIRS =					\
 	base					\
diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am
index d32a3f6ac2..e37143fb0f 100644
--- a/lib/base/Makefile.am
+++ b/lib/base/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ../..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 EXTRA_DIST =				\
 	base.dsp				\
diff --git a/lib/client/Makefile.am b/lib/client/Makefile.am
index b05160912a..70762077c7 100644
--- a/lib/client/Makefile.am
+++ b/lib/client/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ../..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 EXTRA_DIST =						\
 	client.dsp						\
@@ -25,10 +26,10 @@ libclient_a_SOURCES = 				\
 	ISecondaryScreenFactory.h		\
 	$(NULL)
 INCLUDES =							\
-	-I$(DEPTH)/lib/base 			\
-	-I$(DEPTH)/lib/mt	 			\
-	-I$(DEPTH)/lib/io	 			\
-	-I$(DEPTH)/lib/net	 			\
-	-I$(DEPTH)/lib/synergy			\
-	-I$(DEPTH)/lib/platform 		\
+	-I$(VDEPTH)/lib/base 			\
+	-I$(VDEPTH)/lib/mt	 			\
+	-I$(VDEPTH)/lib/io	 			\
+	-I$(VDEPTH)/lib/net	 			\
+	-I$(VDEPTH)/lib/synergy			\
+	-I$(VDEPTH)/lib/platform 		\
 	$(NULL)
diff --git a/lib/http/Makefile.am b/lib/http/Makefile.am
index 26adc718e5..9b1f6d4923 100644
--- a/lib/http/Makefile.am
+++ b/lib/http/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ../..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 EXTRA_DIST =				\
 	http.dsp				\
@@ -18,7 +19,7 @@ libhttp_a_SOURCES = 		\
 	XHTTP.h					\
 	$(NULL)
 INCLUDES =					\
-	-I$(DEPTH)/lib/base 	\
-	-I$(DEPTH)/lib/mt	 	\
-	-I$(DEPTH)/lib/io	 	\
+	-I$(VDEPTH)/lib/base 	\
+	-I$(VDEPTH)/lib/mt	 	\
+	-I$(VDEPTH)/lib/io	 	\
 	$(NULL)
diff --git a/lib/io/Makefile.am b/lib/io/Makefile.am
index c64ee7a4cc..f4ecea1d24 100644
--- a/lib/io/Makefile.am
+++ b/lib/io/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ../..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 EXTRA_DIST =					\
 	io.dsp						\
@@ -29,6 +30,6 @@ libio_a_SOURCES = 				\
 	XIO.h						\
 	$(NULL)
 INCLUDES =						\
-	-I$(DEPTH)/lib/base 		\
-	-I$(DEPTH)/lib/mt	 		\
+	-I$(VDEPTH)/lib/base 		\
+	-I$(VDEPTH)/lib/mt	 		\
 	$(NULL)
diff --git a/lib/mt/Makefile.am b/lib/mt/Makefile.am
index 9c4ca47f54..e4868bfaf5 100644
--- a/lib/mt/Makefile.am
+++ b/lib/mt/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ../..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 EXTRA_DIST =				\
 	mt.dsp					\
@@ -27,5 +28,5 @@ libmt_a_SOURCES = 			\
 	XThread.h				\
 	$(NULL)
 INCLUDES =					\
-	-I$(DEPTH)/lib/base 	\
+	-I$(VDEPTH)/lib/base 	\
 	$(NULL)
diff --git a/lib/net/Makefile.am b/lib/net/Makefile.am
index 561ea886b6..280640bdee 100644
--- a/lib/net/Makefile.am
+++ b/lib/net/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ../..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 EXTRA_DIST =				\
 	net.dsp					\
@@ -32,7 +33,7 @@ libnet_a_SOURCES = 			\
 	XSocket.h				\
 	$(NULL)
 INCLUDES =					\
-	-I$(DEPTH)/lib/base 	\
-	-I$(DEPTH)/lib/mt	 	\
-	-I$(DEPTH)/lib/io	 	\
+	-I$(VDEPTH)/lib/base 	\
+	-I$(VDEPTH)/lib/mt	 	\
+	-I$(VDEPTH)/lib/io	 	\
 	$(NULL)
diff --git a/lib/platform/Makefile.am b/lib/platform/Makefile.am
index ffca735632..a618eee874 100644
--- a/lib/platform/Makefile.am
+++ b/lib/platform/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ../..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 EXTRA_DIST =								\
 	makehook.dsp							\
@@ -54,7 +55,7 @@ EXTRA_libplatform_a_SOURCES =				\
 	CUnixPlatform.cpp						\
 	$(NULL)
 INCLUDES =									\
-	-I$(DEPTH)/lib/base 					\
-	-I$(DEPTH)/lib/mt	 					\
-	-I$(DEPTH)/lib/synergy 					\
+	-I$(VDEPTH)/lib/base 					\
+	-I$(VDEPTH)/lib/mt	 					\
+	-I$(VDEPTH)/lib/synergy 				\
 	$(NULL)
diff --git a/lib/server/Makefile.am b/lib/server/Makefile.am
index 774509cf73..10979ae60f 100644
--- a/lib/server/Makefile.am
+++ b/lib/server/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ../..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 EXTRA_DIST =						\
 	server.dsp						\
@@ -33,11 +34,11 @@ libserver_a_SOURCES = 				\
 	IPrimaryScreenFactory.h			\
 	$(NULL)
 INCLUDES =							\
-	-I$(DEPTH)/lib/base 			\
-	-I$(DEPTH)/lib/mt	 			\
-	-I$(DEPTH)/lib/io	 			\
-	-I$(DEPTH)/lib/http 			\
-	-I$(DEPTH)/lib/net	 			\
-	-I$(DEPTH)/lib/synergy			\
-	-I$(DEPTH)/lib/platform 		\
+	-I$(VDEPTH)/lib/base 			\
+	-I$(VDEPTH)/lib/mt	 			\
+	-I$(VDEPTH)/lib/io	 			\
+	-I$(VDEPTH)/lib/http 			\
+	-I$(VDEPTH)/lib/net	 			\
+	-I$(VDEPTH)/lib/synergy			\
+	-I$(VDEPTH)/lib/platform 		\
 	$(NULL)
diff --git a/lib/synergy/Makefile.am b/lib/synergy/Makefile.am
index 316d9b4e2b..3a1b91171f 100644
--- a/lib/synergy/Makefile.am
+++ b/lib/synergy/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 DEPTH = ../..
+VDEPTH = ./$(VPATH)/$(DEPTH)
 
 EXTRA_DIST =					\
 	libsynergy.dsp				\
@@ -38,8 +39,8 @@ libsynergy_a_SOURCES = 			\
 	XSynergy.h					\
 	$(NULL)
 INCLUDES =						\
-	-I$(DEPTH)/lib/base 		\
-	-I$(DEPTH)/lib/mt	 		\
-	-I$(DEPTH)/lib/io	 		\
-	-I$(DEPTH)/lib/net	 		\
+	-I$(VDEPTH)/lib/base 		\
+	-I$(VDEPTH)/lib/mt	 		\
+	-I$(VDEPTH)/lib/io	 		\
+	-I$(VDEPTH)/lib/net	 		\
 	$(NULL)