diff --git a/unix/tx/Makefile.am b/unix/tx/Makefile.am
index 2e15f15..ec42dbf 100644
--- a/unix/tx/Makefile.am
+++ b/unix/tx/Makefile.am
@@ -1,6 +1,9 @@
 noinst_LTLIBRARIES = libtx.la
 
-libtx_la_SOURCES = TXWindow.cxx TXScrollbar.cxx TXViewport.cxx TXImage.cxx \
-	TXMenu.cxx
+HDRS = TXButton.h TXCheckbox.h TXDialog.h TXEntry.h TXImage.h TXLabel.h \
+	TXMenu.h TXMsgBox.h TXScrollbar.h TXViewport.h TXWindow.h
+
+libtx_la_SOURCES = $(HDRS) TXWindow.cxx TXScrollbar.cxx TXViewport.cxx \
+	TXImage.cxx TXMenu.cxx
 
 libtx_la_CPPFLAGS = -I$(COMMON_DIR) @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
diff --git a/unix/vncconfig/Makefile.am b/unix/vncconfig/Makefile.am
index 0ae7e25..5e37ce0 100644
--- a/unix/vncconfig/Makefile.am
+++ b/unix/vncconfig/Makefile.am
@@ -1,6 +1,9 @@
 bin_PROGRAMS = vncconfig
 
-vncconfig_SOURCES = vncExt.c vncconfig.cxx QueryConnectDialog.cxx buildtime.c
+HDRS = QueryConnectDialog.h vncExt.h
+
+vncconfig_SOURCES = $(HDRS) vncExt.c vncconfig.cxx QueryConnectDialog.cxx \
+	buildtime.c
 
 vncconfig_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir)/tx @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
 
diff --git a/unix/vncviewer/Makefile.am b/unix/vncviewer/Makefile.am
index a5b9ac3..a73e97a 100644
--- a/unix/vncviewer/Makefile.am
+++ b/unix/vncviewer/Makefile.am
@@ -1,6 +1,10 @@
 bin_PROGRAMS = vncviewer
 
-vncviewer_SOURCES = DesktopWindow.cxx CConn.cxx vncviewer.cxx buildtime.c
+HDRS = AboutDialog.h CConn.h DesktopWindow.h gettext.h InfoDialog.h \
+	OptionsDialog.h parameters.h PasswdDialog.h ServerDialog.h
+
+vncviewer_SOURCES = $(HDRS) DesktopWindow.cxx CConn.cxx vncviewer.cxx \
+	buildtime.c
 
 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
diff --git a/unix/x0vncserver/Makefile.am b/unix/x0vncserver/Makefile.am
index 52c3276..4fba34b 100644
--- a/unix/x0vncserver/Makefile.am
+++ b/unix/x0vncserver/Makefile.am
@@ -1,6 +1,9 @@
 bin_PROGRAMS = x0vncserver
 
-x0vncserver_SOURCES = Image.cxx TimeMillis.cxx PollingScheduler.cxx \
+HDRS = Geometry.h Image.h PollingManager.h PollingScheduler.h TimeMillis.h \
+	XPixelBuffer.h
+
+x0vncserver_SOURCES = $(HDRS) Image.cxx TimeMillis.cxx PollingScheduler.cxx \
 	PollingManager.cxx Geometry.cxx XPixelBuffer.cxx x0vncserver.cxx \
 	../vncconfig/QueryConnectDialog.cxx buildtime.c
 
diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
index 47d79b8..6a1090a 100644
--- a/unix/xserver/hw/vnc/Makefile.am
+++ b/unix/xserver/hw/vnc/Makefile.am
@@ -8,7 +8,9 @@
 
 noinst_LTLIBRARIES = libvnccommon.la
 
-libvnccommon_la_SOURCES = vncExtInit.cc vncHooks.cc XserverDesktop.cc
+HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h
+
+libvnccommon_la_SOURCES = $(HDRS) vncExtInit.cc vncHooks.cc XserverDesktop.cc
 
 libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
 	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \
@@ -58,4 +60,3 @@
 
 fbrop.h: $(top_srcdir)/fb/fbrop.h
 	cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h
-