diff --git a/client/Makefile.am b/client/Makefile.am
index b747856b..744ba730 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -3,10 +3,12 @@ NULL =
 DEPTH = ..
 
 bin_PROGRAMS = synergy
-synergy_SOURCES = 			\
+synergy_SOURCES = 					\
 	CXWindowsSecondaryScreen.cpp	\
-	CClient.cpp				\
-	client.cpp				\
+	CClient.cpp						\
+	client.cpp						\
+	CClient.h						\
+	CXWindowsSecondaryScreen.h		\
 	$(NULL)
 synergy_LDADD =						\
 	$(DEPTH)/platform/libplatform.a	\
diff --git a/http/Makefile.am b/http/Makefile.am
index ecdf2c9c..08404a0a 100644
--- a/http/Makefile.am
+++ b/http/Makefile.am
@@ -6,6 +6,8 @@ noinst_LIBRARIES = libhttp.a
 libhttp_a_SOURCES = 		\
 	CHTTPProtocol.cpp		\
 	XHTTP.cpp				\
+	CHTTPProtocol.h			\
+	XHTTP.h					\
 	$(NULL)
 INCLUDES =					\
 	-I$(DEPTH)/base 		\
diff --git a/io/Makefile.am b/io/Makefile.am
index e0b58ce6..897daf14 100644
--- a/io/Makefile.am
+++ b/io/Makefile.am
@@ -10,6 +10,14 @@ libio_a_SOURCES = 			\
 	COutputStreamFilter.cpp	\
 	CStreamBuffer.cpp		\
 	XIO.cpp					\
+	CBufferedInputStream.h	\
+	CBufferedOutputStream.h	\
+	CInputStreamFilter.h	\
+	COutputStreamFilter.h	\
+	CStreamBuffer.h			\
+	IInputStream.h			\
+	IOutputStream.h			\
+	XIO.h					\
 	$(NULL)
 INCLUDES =					\
 	-I$(DEPTH)/base 		\
diff --git a/mt/Makefile.am b/mt/Makefile.am
index 0b23ad3f..e7f69865 100644
--- a/mt/Makefile.am
+++ b/mt/Makefile.am
@@ -10,6 +10,13 @@ libmt_a_SOURCES = 			\
 	CThread.cpp				\
 	CThreadRep.cpp			\
 	CTimerThread.cpp		\
+	CCondVar.h				\
+	CLock.h					\
+	CMutex.h				\
+	CThread.h				\
+	CThreadRep.h			\
+	CTimerThread.h			\
+	XThread.h				\
 	$(NULL)
 INCLUDES =					\
 	-I$(DEPTH)/base 		\
diff --git a/net/Makefile.am b/net/Makefile.am
index 6a5b59d9..5262f015 100644
--- a/net/Makefile.am
+++ b/net/Makefile.am
@@ -10,6 +10,15 @@ libnet_a_SOURCES = 			\
 	CTCPListenSocket.cpp	\
 	XNetwork.cpp			\
 	XSocket.cpp				\
+	CNetwork.h				\
+	CNetworkAddress.h		\
+	CTCPListenSocket.h		\
+	CTCPSocket.h			\
+	IDataSocket.h			\
+	IListenSocket.h			\
+	ISocket.h				\
+	XNetwork.h				\
+	XSocket.h				\
 	$(NULL)
 INCLUDES =					\
 	-I$(DEPTH)/base 		\
diff --git a/platform/Makefile.am b/platform/Makefile.am
index e6c4c2ca..388d0541 100644
--- a/platform/Makefile.am
+++ b/platform/Makefile.am
@@ -2,12 +2,19 @@
 NULL =
 DEPTH = ..
 
+# FIXME -- add CUnixPlatform.cpp as an unbuilt source
 noinst_LIBRARIES = libplatform.a
 libplatform_a_SOURCES = 	\
 	CPlatform.cpp			\
 	CXWindowsClipboard.cpp	\
 	CXWindowsScreen.cpp		\
 	CXWindowsUtil.cpp		\
+	CPlatform.h				\
+	CUnixPlatform.h			\
+	CXWindowsClipboard.h	\
+	CXWindowsScreen.h		\
+	CXWindowsUtil.h			\
+	IPlatform.h				\
 	$(NULL)
 INCLUDES =					\
 	-I$(DEPTH)/base 		\
diff --git a/server/Makefile.am b/server/Makefile.am
index c8abb6a3..0d145475 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -3,14 +3,21 @@ NULL =
 DEPTH = ..
 
 bin_PROGRAMS = synergyd
-synergyd_SOURCES = 			\
-	CConfig.cpp				\
-	CServerProtocol.cpp		\
-	CServerProtocol1_0.cpp	\
-	CXWindowsPrimaryScreen.cpp	\
-	CServer.cpp				\
-	CHTTPServer.cpp			\
-	server.cpp				\
+synergyd_SOURCES = 					\
+	CConfig.cpp						\
+	CServerProtocol.cpp				\
+	CServerProtocol1_0.cpp			\
+	CXWindowsPrimaryScreen.cpp		\
+	CServer.cpp						\
+	CHTTPServer.cpp					\
+	server.cpp						\
+	CConfig.h						\
+	CHTTPServer.h					\
+	CServer.h						\
+	CServerProtocol.h				\
+	CServerProtocol1_0.h			\
+	CSynergyHook.h					\
+	CXWindowsPrimaryScreen.h		\
 	$(NULL)
 synergyd_LDADD =					\
 	$(DEPTH)/platform/libplatform.a	\
diff --git a/synergy/Makefile.am b/synergy/Makefile.am
index 3b10a96b..8b0b6318 100644
--- a/synergy/Makefile.am
+++ b/synergy/Makefile.am
@@ -11,6 +11,23 @@ libsynergy_a_SOURCES = 		\
 	CTCPSocketFactory.cpp	\
 	XScreen.cpp				\
 	XSynergy.cpp			\
+	CClipboard.h			\
+	CInputPacketStream.h	\
+	COutputPacketStream.h	\
+	CProtocolUtil.h			\
+	CTCPSocketFactory.h		\
+	ClipboardTypes.h		\
+	IClipboard.h			\
+	IPrimaryScreen.h		\
+	ISecondaryScreen.h		\
+	IServerProtocol.h		\
+	ISocketFactory.h		\
+	KeyTypes.h				\
+	MouseTypes.h			\
+	ProtocolTypes.h			\
+	Version.h				\
+	XScreen.h				\
+	XSynergy.h				\
 	$(NULL)
 INCLUDES =					\
 	-I$(DEPTH)/base 		\