diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index abfbee589..1933dac0d 100644
--- a/src/Model/CMakeLists.txt
+++ b/src/Model/CMakeLists.txt
@@ -6,5 +6,12 @@ set(SOURCES
 	modelmgr.cxx
 	panelnode.cxx
 	)
-	
-flightgear_component(Model "${SOURCES}")
\ No newline at end of file
+
+set(HEADERS
+	acmodel.hxx
+	model_panel.hxx
+	modelmgr.hxx
+	panelnode.hxx
+	)
+    		
+flightgear_component(Model "${SOURCES}" "${HEADERS}")
\ No newline at end of file
diff --git a/src/MultiPlayer/CMakeLists.txt b/src/MultiPlayer/CMakeLists.txt
index 3b2f42f53..1d5c7e992 100644
--- a/src/MultiPlayer/CMakeLists.txt
+++ b/src/MultiPlayer/CMakeLists.txt
@@ -5,4 +5,9 @@ set(SOURCES
 	tiny_xdr.cxx
 	)
 
-flightgear_component(MultiPlayer "${SOURCES}")
\ No newline at end of file
+set(HEADERS
+	multiplaymgr.hxx
+	tiny_xdr.hxx
+	)
+    	
+flightgear_component(MultiPlayer "${SOURCES}" "${HEADERS}")
\ No newline at end of file
diff --git a/src/Network/CMakeLists.txt b/src/Network/CMakeLists.txt
index 3f0e202c2..fa6643de8 100644
--- a/src/Network/CMakeLists.txt
+++ b/src/Network/CMakeLists.txt
@@ -27,8 +27,36 @@ set(SOURCES
 	ray.cxx
 	rul.cxx
 	)
-	
-flightgear_component(Network "${SOURCES}")
+
+set(HEADERS
+	ATC-Inputs.hxx
+	ATC-Main.hxx
+	ATC-Outputs.hxx
+	AV400.hxx
+	AV400Sim.hxx
+	AV400WSim.hxx
+	atlas.hxx
+	garmin.hxx
+	generic.hxx
+	httpd.hxx
+	joyclient.hxx
+	jpg-httpd.hxx
+	jsclient.hxx
+	lfsglass.hxx
+	native.hxx
+	native_ctrls.hxx
+	native_fdm.hxx
+	native_gui.hxx
+	nmea.hxx
+	opengc.hxx
+	props.hxx
+	protocol.hxx
+	pve.hxx
+	ray.hxx
+	rul.hxx
+	)
+    	
+flightgear_component(Network "${SOURCES}" "${HEADERS}")
 
 if(RTI_FOUND)
   add_subdirectory(HLA)
diff --git a/src/Scenery/CMakeLists.txt b/src/Scenery/CMakeLists.txt
index 162ab197e..bb85fc0e6 100644
--- a/src/Scenery/CMakeLists.txt
+++ b/src/Scenery/CMakeLists.txt
@@ -6,6 +6,13 @@ set(SOURCES
 	scenery.cxx
 	tilemgr.cxx
 	)
-	
-flightgear_component(Scenery "${SOURCES}")
+
+set(HEADERS
+	SceneryPager.hxx
+	redout.hxx
+	scenery.hxx
+	tilemgr.hxx
+	)
+    		
+flightgear_component(Scenery "${SOURCES}" "${HEADERS}")
 
diff --git a/src/Scripting/CMakeLists.txt b/src/Scripting/CMakeLists.txt
index 42f0dcfe8..e5f0fcfa3 100644
--- a/src/Scripting/CMakeLists.txt
+++ b/src/Scripting/CMakeLists.txt
@@ -4,6 +4,11 @@ set(SOURCES
 	NasalSys.cxx
 	nasal-props.cxx
 	)
-	
-flightgear_component(Scripting "${SOURCES}")
+
+set(HEADERS
+	NasalSys.hxx
+	)
+
+	
+flightgear_component(Scripting "${SOURCES}" "${HEADERS}")
 
diff --git a/src/Sound/CMakeLists.txt b/src/Sound/CMakeLists.txt
index f14728762..29a1d4854 100644
--- a/src/Sound/CMakeLists.txt
+++ b/src/Sound/CMakeLists.txt
@@ -8,5 +8,14 @@ set(SOURCES
 	voice.cxx
 	voiceplayer.cxx
 	)
-	
-flightgear_component(Sound "${SOURCES}")
\ No newline at end of file
+
+set(HEADERS
+	beacon.hxx
+	fg_fx.hxx
+	morse.hxx
+	sample_queue.hxx
+	voice.hxx
+	voiceplayer.hxx
+	)
+    		
+flightgear_component(Sound "${SOURCES}" "${HEADERS}")
\ No newline at end of file
diff --git a/src/Systems/CMakeLists.txt b/src/Systems/CMakeLists.txt
index dde27f258..bacc7efc3 100644
--- a/src/Systems/CMakeLists.txt
+++ b/src/Systems/CMakeLists.txt
@@ -7,5 +7,14 @@ set(SOURCES
 	system_mgr.cxx
 	vacuum.cxx
 	)
+
+set(HEADERS
+	electrical.hxx
+	pitot.hxx
+	static.hxx
+	system_mgr.hxx
+	vacuum.hxx
+	)
+
 	
-flightgear_component(Systems "${SOURCES}")
\ No newline at end of file
+flightgear_component(Systems "${SOURCES}" "${HEADERS}")
\ No newline at end of file
diff --git a/src/Time/CMakeLists.txt b/src/Time/CMakeLists.txt
index f50c7a7ef..cdf26776e 100644
--- a/src/Time/CMakeLists.txt
+++ b/src/Time/CMakeLists.txt
@@ -6,4 +6,10 @@ set(SOURCES
 	sunsolver.cxx
 	)
 	
-flightgear_component(Time "${SOURCES}")
\ No newline at end of file
+set(HEADERS
+	TimeManager.hxx
+	light.hxx
+	sunsolver.hxx
+	)
+    	
+flightgear_component(Time "${SOURCES}" "${HEADERS}")
\ No newline at end of file