5 files changed, 12 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index edc02658e..42e091f43 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -235,7 +235,7 @@ set(inkscape_SRC
 	knotholder.cpp
 	layer-fns.cpp
 	layer-manager.cpp
-  layer-model.cpp
+	layer-model.cpp
 	line-geometry.cpp
 	line-snapper.cpp
 	lpe-tool-context.cpp
@@ -323,6 +323,7 @@ set(inkscape_SRC
 	color-profile.h
 	color-rgba.h
 	color.h
+	colorspace.h
 	common-context.h
 	composite-undo-stack-observer.h
 	conditions.h
diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index e3e15a19f..28b3d38e3 100644
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -52,6 +52,7 @@ set(extension_SRC
 	internal/javafx-out.cpp
 	internal/svg.cpp
 	internal/svgz.cpp
+	internal/text_reassemble.c
 	internal/vsd-input.cpp
 	internal/wmf-inout.cpp
 	internal/wmf-print.cpp
@@ -135,6 +136,7 @@ set(extension_SRC
 	internal/pov-out.h
 	internal/svg.h
 	internal/svgz.h
+	internal/text_reassemble.h
 	internal/vsd-input.h
 	internal/wmf-inout.h
 	internal/wmf-print.h
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
index 2e1e724f5..b0e473ddd 100644
--- a/src/helper/CMakeLists.txt
+++ b/src/helper/CMakeLists.txt
@@ -17,10 +17,7 @@ set(helper_SRC
 	pixbuf-ops.cpp
 	png-write.cpp
 	stock-items.cpp
-	unit-menu.cpp
-	units.cpp
 	#units-test.cpp
-	unit-tracker.cpp
 	window.cpp
 
 	# we generate this file and it's .h counter-part
@@ -38,10 +35,6 @@ set(helper_SRC
 	pixbuf-ops.h
 	png-write.h
 	stock-items.h
-	unit-menu.h
-	unit-tracker.h
-	units-test.h
-	units.h
 	window.h
 )
 
diff --git a/src/libuemf/CMakeLists.txt b/src/libuemf/CMakeLists.txt
index d7e757ad1..dbf9fb36c 100644
--- a/src/libuemf/CMakeLists.txt
+++ b/src/libuemf/CMakeLists.txt
@@ -11,6 +11,7 @@ set(libuemf_SRC
 
 	# -------
 	# Headers
+	symbol_convert.h
 	uemf.h
 	uemf_endian.h
 	uemf_print.h
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index b592d2527..c95dd35cc 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -54,6 +54,7 @@ set(ui_SRC
 	dialog/livepatheffect-editor.cpp
 	dialog/memory.cpp
 	dialog/messages.cpp
+	dialog/new-from-template.cpp
 	dialog/object-attributes.cpp
 	dialog/object-properties.cpp
 	dialog/ocaldialogs.cpp
@@ -65,6 +66,8 @@ set(ui_SRC
 	dialog/spellcheck.cpp
 	dialog/svg-fonts-dialog.cpp
 	dialog/swatches.cpp
+	dialog/template-load-tab.cpp
+	dialog/template-widget.cpp
 	dialog/text-edit.cpp
 	dialog/tile.cpp
 	dialog/tracedialog.cpp
@@ -166,16 +169,20 @@ set(ui_SRC
 	dialog/livepatheffect-editor.h
 	dialog/memory.h
 	dialog/messages.h
+	dialog/new-from-template.h
 	dialog/object-attributes.h
 	dialog/object-properties.h
 	dialog/ocaldialogs.h
 	dialog/panel-dialog.h
 	dialog/print-colors-preview-dialog.h
 	dialog/print.h
+	
 	dialog/spellcheck.h
 	dialog/svg-fonts-dialog.h
 	dialog/swatches.h
 	dialog/symbols.h
+	dialog/template-load-tab.h
+    dialog/template-widget.h
 	dialog/text-edit.h
 	dialog/tile.h
 	dialog/tracedialog.h