diff --git a/common/Xregion/Makefile.am b/common/Xregion/Makefile.am
index 03151e2..fb6a1c7 100644
--- a/common/Xregion/Makefile.am
+++ b/common/Xregion/Makefile.am
@@ -1,3 +1,5 @@
 noinst_LTLIBRARIES = libXregion.la
 
-libXregion_la_SOURCES = Region.c
+HDRS = region.h Xregion.h
+
+libXregion_la_SOURCES = $(HDRS) Region.c
diff --git a/common/jpeg/Makefile.am b/common/jpeg/Makefile.am
index 530b8de..b63c602 100644
--- a/common/jpeg/Makefile.am
+++ b/common/jpeg/Makefile.am
@@ -1,11 +1,14 @@
 noinst_LTLIBRARIES = libjpeg.la
 
-libjpeg_la_SOURCES = jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c \
-	jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c \
-	jcparam.c jcphuff.c jcprepct.c jcsample.c jctrans.c jdapimin.c \
-	jdapistd.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c \
-	jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c jdmerge.c \
-	jdphuff.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c \
-	jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jidctred.c \
-	jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c
+HDRS = jchuff.h jdct.h jdhuff.h jinclude.h jmemsys.h jpegint.h jpeglib.h \
+	jversion.h
+
+libjpeg_la_SOURCES = $(HDRS) jcapimin.c jcapistd.c jccoefct.c jccolor.c \
+	jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \
+	jcomapi.c jcparam.c jcphuff.c jcprepct.c jcsample.c jctrans.c \
+	jdapimin.c jdapistd.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \
+	jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \
+	jdmerge.c jdphuff.c jdpostct.c jdsample.c jdtrans.c jerror.c \
+	jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c \
+	jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c
 
diff --git a/common/network/Makefile.am b/common/network/Makefile.am
index 716e8ba..61d276b 100644
--- a/common/network/Makefile.am
+++ b/common/network/Makefile.am
@@ -1,6 +1,8 @@
 noinst_LTLIBRARIES = libnetwork.la
 
-libnetwork_la_SOURCES = TcpSocket.cxx
+HDRS = Socket.h TcpSocket.h
+
+libnetwork_la_SOURCES = $(HDRS) TcpSocket.cxx
 
 libnetwork_la_CPPFLAGS = -I$(top_srcdir) @SOCKLEN_T_DEFINE@
 
diff --git a/common/rdr/Makefile.am b/common/rdr/Makefile.am
index b9e7eb7..b1c0be5 100644
--- a/common/rdr/Makefile.am
+++ b/common/rdr/Makefile.am
@@ -1,8 +1,13 @@
 noinst_LTLIBRARIES = librdr.la
 
-librdr_la_SOURCES = Exception.cxx FdInStream.cxx FdOutStream.cxx InStream.cxx \
-	RandomStream.cxx ZlibInStream.cxx ZlibOutStream.cxx HexInStream.cxx \
-	HexOutStream.cxx
+HDRS = Exception.h FdInStream.h FdOutStream.h FixedMemOutStream.h \
+	HexInStream.h HexOutStream.h InStream.h MemInStream.h \
+	MemOutStream.h msvcwarning.h OutStream.h RandomStream.h \
+	SubstitutingInStream.h types.h ZlibInStream.h ZlibOutStream.h
+
+librdr_la_SOURCES = $(HDRS) Exception.cxx FdInStream.cxx FdOutStream.cxx \
+	InStream.cxx RandomStream.cxx ZlibInStream.cxx ZlibOutStream.cxx \
+	HexInStream.cxx HexOutStream.cxx
 
 librdr_la_CPPFLAGS = -I$(top_srcdir) @ZLIB_INCLUDE@
 
diff --git a/common/rfb/Makefile.am b/common/rfb/Makefile.am
index 2f9e72e..7fff7c8 100644
--- a/common/rfb/Makefile.am
+++ b/common/rfb/Makefile.am
@@ -1,6 +1,32 @@
 noinst_LTLIBRARIES = librfb.la
 
-librfb_la_SOURCES = Blacklist.cxx CConnection.cxx CMsgHandler.cxx \
+HDRS = Blacklist.h CapsContainer.h CapsList.h CConnection.h CFTMsgReader.h \
+	CFTMsgWriter.h CMsgHandler.h CMsgReader.h CMsgReaderV3.h CMsgWriter.h \
+	CMsgWriterV3.h ColourCube.h ColourMap.h ComparingUpdateTracker.h \
+	Configuration.h ConnParams.h CSecurity.h CSecurityNone.h \
+	CSecurityVncAuth.h Cursor.h Decoder.h DirManager.h d3des.h Encoder.h \
+	encodings.h Exception.h FileInfo.h FileManager.h FileReader.h \
+	FileWriter.h fttypes.h hextileConstants.h hextileDecode.h \
+	HextileDecoder.h hextileEncodeBetter.h hextileEncode.h \
+	HextileEncoder.h Hostname.h HTTPServer.h ImageGetter.h InputHandler.h \
+	IrixCLJpegCompressor.h IrixDMIC_RawToJpeg.h IrixDMJpegCompressor.h \
+	JpegCompressor.h JpegEncoder.h KeyRemapper.h keysymdef.h \
+	ListConnInfo.h Logger_file.h Logger.h Logger_stdio.h LogWriter.h \
+	msgTypes.h Password.h PixelBuffer.h PixelFormat.h Pixel.h \
+	RawDecoder.h RawEncoder.h Rect.h Region.h rreDecode.h RREDecoder.h \
+	rreEncode.h RREEncoder.h ScaledPixelBuffer.h ScaleFilters.h \
+	SConnection.h SDesktop.h secTypes.h ServerCore.h SFileTransfer.h \
+	SFileTransferManager.h SFTMsgReader.h SFTMsgWriter.h SMsgHandler.h \
+	SMsgReader.h SMsgReaderV3.h SMsgWriter.h SMsgWriterV3.h \
+	SSecurityFactoryStandard.h SSecurity.h SSecurityNone.h \
+	SSecurityVncAuth.h Threading.h tightDecode.h TightDecoder.h \
+	tightEncode.h TightEncoder.h TightPalette.h Timer.h TransferQueue.h \
+	TransImageGetter.h transInitTempl.h transTempl.h TrueColourMap.h \
+	UpdateTracker.h UserPasswdGetter.h util.h VNCSConnectionST.h \
+	VNCServer.h VNCServerST.h zrleDecode.h ZRLEDecoder.h zrleEncode.h \
+	ZRLEEncoder.h
+
+librfb_la_SOURCES = $(HDRS) Blacklist.cxx CConnection.cxx CMsgHandler.cxx \
 	CMsgReader.cxx CMsgReaderV3.cxx CMsgWriter.cxx CMsgWriterV3.cxx \
 	CSecurityVncAuth.cxx CapsContainer.cxx CapsList.cxx \
 	ComparingUpdateTracker.cxx Configuration.cxx ConnParams.cxx \
diff --git a/common/zlib/Makefile.am b/common/zlib/Makefile.am
index 4c51d2b..10b7ffc 100644
--- a/common/zlib/Makefile.am
+++ b/common/zlib/Makefile.am
@@ -1,6 +1,8 @@
 noinst_LTLIBRARIES = libz.la
 
-libz_la_SOURCES = adler32.c compress.c crc32.c deflate.c deflate.h \
-	gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c \
-	inffast.h inffixed.h inflate.c inftrees.c inftrees.h infutil.c \
-	infutil.h trees.c trees.h uncompr.c zconf.h zlib.h zutil.c zutil.h
+HDRS = deflate.h infblock.h infcodes.h inffast.h inffixed.h inftrees.h \
+	infutil.h trees.h zconf.h zlib.h zutil.h
+
+libz_la_SOURCES = $(HDRS) adler32.c compress.c crc32.c deflate.c gzio.c \
+	infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c \
+	trees.c uncompr.c