diff --git a/unix/vncviewer/Makefile.am b/unix/vncviewer/Makefile.am
index 6b81ec3..e5e0190 100644
--- a/unix/vncviewer/Makefile.am
+++ b/unix/vncviewer/Makefile.am
@@ -7,12 +7,15 @@
 
 vncviewer_SOURCES = $(HDRS) DesktopWindow.cxx CConn.cxx vncviewer.cxx \
 	buildtime.c
+# X_CFLAGS are really CPPFLAGS
+vncviewer_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/unix \
+	-I$(top_srcdir)/unix/tx -I$(top_srcdir)/intl \
+	-DLOCALEDIR=\"$(localedir)\" @X_CFLAGS@
 
-vncviewer_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir) -I$(top_srcdir)/tx \
-	-I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\" @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
-
-vncviewer_LDADD = $(top_srcdir)/tx/libtx.la $(COMMON_DIR)/rfb/librfb.la \
-	$(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \
+vncviewer_LDADD = $(top_srcdir)/unix/tx/libtx.la \
+	$(top_srcdir)/common/rfb/librfb.la \
+	$(top_srcdir)/common/network/libnetwork.la \
+	$(top_srcdir)/common/rdr/librdr.la \
 	@X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ # @LIBINTL@
 
 EXTRA_DIST = vncviewer.man