From: verbalshadow <verbalshadow@users.sourceforge.net>
Date: Tue, 24 Jun 2008 06:32:23 +0000 (+0000)
Subject: Cmake: remove header files from source lists
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ccee8a9aa5c7646c5e05f860a0e8221151551c51;p=inkscape.git

Cmake: remove header files from source lists
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3327eb2f..6a4d79d81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,41 +1,41 @@
-PROJECT(inkscape)
-
-SET(INKSCAPE_VERSION 0.46+devel)
-SET(PROJECT_NAME inkscape)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6)
-SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
-
+PROJECT(inkscape)
+
+SET(INKSCAPE_VERSION 0.46+devel)
+SET(PROJECT_NAME inkscape)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6)
+SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+
 LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeScripts")
 INCLUDE(ConfigPaths)
-INCLUDE(DefineDependsandFlags)
+INCLUDE(DefineDependsandFlags)
 INCLUDE(HelperMacros)
-
# Set to true if compiler/linker should enable profiling:
-#SET(ENABLE_PROFILING TRUE)
-
-#make dist target
-SET(INKSCAPE_DIST_PREFIX "${PROJECT_NAME}-${INKSCAPE_VERSION}")
-ADD_CUSTOM_TARGET(dist svn export --force -q "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}" 
-		COMMAND tar -czf "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.gz" -C "${CMAKE_BINARY_DIR}" --exclude=".hidden" ${INKSCAPE_DIST_PREFIX}
-		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
-
-#make unistall target
-CONFIGURE_FILE(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
-
-ADD_CUSTOM_TARGET(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-
-SET(folders
-src
-cxxtest
-share
-doc
-#doc-pak
-po
-)
-
-FOREACH(dirlist ${folders})
-ADD_SUBDIRECTORY(${dirlist})
+
# Set to true if compiler/linker should enable profiling:
+#SET(ENABLE_PROFILING TRUE)
+
+#make dist target
+SET(INKSCAPE_DIST_PREFIX "${PROJECT_NAME}-${INKSCAPE_VERSION}")
+ADD_CUSTOM_TARGET(dist svn export --force -q "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}" 
+		COMMAND tar -czf "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.gz" -C "${CMAKE_BINARY_DIR}" --exclude=".hidden" ${INKSCAPE_DIST_PREFIX}
+		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
+
+#make unistall target
+CONFIGURE_FILE(
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET(uninstall
+  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
+SET(folders
+src
+cxxtest
+share
+doc
+#doc-pak
+po
+)
+
+FOREACH(dirlist ${folders})
+ADD_SUBDIRECTORY(${dirlist})
 ENDFOREACH(dirlist)
diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt
index 7150eacad..8c22cb15a 100644
--- a/src/2geom/CMakeLists.txt
+++ b/src/2geom/CMakeLists.txt
@@ -1,97 +1,41 @@
 SET(2geom_SRC
-angle.h
 basic-intersection.cpp
-basic-intersection.h
-bezier-curve.h
-bezier.h
-bezier-to-sbasis.h
 bezier-utils.cpp
-bezier-utils.h
-choose.h
 circle-circle.cpp
-circulator.h
-concepts.h
 conjugate_gradient.cpp
-conjugate_gradient.h
 convex-cover.cpp
-convex-cover.h
-coord.h
 crossing.cpp
-crossing.h
-curve.h
 curve-helpers.cpp
-curves.h
-d2.h
 d2-sbasis.cpp
-d2-sbasis.h
 elliptical-arc.cpp
-elliptical-arc.h
-exception.h
-forward.h
 geom.cpp
-geom.h
-hvlinesegment.h
-interval.h
-isnan.h
-linear.h
 matrix.cpp
-matrix.h
 nearest-point.cpp
-nearest-point.h
 numeric
-ord.h
 path.cpp
-path.h
 path-intersection.cpp
-path-intersection.h
 pathvector.cpp
-pathvector.h
 piecewise.cpp
-piecewise.h
 point.cpp
-point.h
-point-l.h
-point-ops.h
 poly.cpp
 poly-dk-solve.cpp
-poly-dk-solve.h
-poly.h
 poly-laguerre-solve.cpp
-poly-laguerre-solve.h
 quadtree.cpp
-quadtree.h
-rect.h
 region.cpp
-region.h
 sbasis-2d.cpp
-sbasis-2d.h
 sbasis.cpp
-sbasis-curve.h
 sbasis-geometric.cpp
-sbasis-geometric.h
-sbasis.h
 sbasis-math.cpp
-sbasis-math.h
 sbasis-poly.cpp
-sbasis-poly.h
 sbasis-roots.cpp
 sbasis-to-bezier.cpp
-sbasis-to-bezier.h
 shape.cpp
-shape.h
 solve-bezier-one-d.cpp
 solve-bezier-parametric.cpp
-solver.h
-sturm.h
 svg-path.cpp
-svg-path.h
 svg-path-parser.cpp
-svg-path-parser.h
 sweep.cpp
-sweep.h
 transforms.cpp
-transforms.h
-utils.h
 )
 
 ADD_LIBRARY(2geom STATIC ${2geom_SRC})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1f36cd79..5dfd490c5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,6 @@
 IF(WIN32)
     SET(ONLY_WIN
-    registrytool.cpp
-    registrytool.h
+    registrytool.cpp
     #deptool.cpp
     winmain.cpp)
 ELSEIF(WIN32)
@@ -9,511 +8,221 @@ ELSEIF(WIN32)
 ENDIF(WIN32)
 SET(SP_SRC
 sp-anchor.cpp
-sp-anchor.h
 sp-animation.cpp
-sp-animation.h
 sp-clippath.cpp
-sp-clippath.h
 sp-conn-end.cpp
-sp-conn-end.h
 sp-conn-end-pair.cpp
-sp-conn-end-pair.h
 sp-cursor.cpp
-sp-cursor.h
 sp-defs.cpp
-sp-defs.h
 sp-ellipse.cpp
-sp-ellipse.h
 sp-feblend.cpp
-sp-feblend-fns.h
-sp-feblend.h
 sp-fecolormatrix.cpp
-sp-fecolormatrix-fns.h
-sp-fecolormatrix.h
 sp-fecomponenttransfer.cpp
-sp-fecomponenttransfer-fns.h
 sp-fecomponenttransfer-funcnode.cpp
-sp-fecomponenttransfer-funcnode.h
-sp-fecomponenttransfer.h
 sp-fecomposite.cpp
-sp-fecomposite-fns.h
-sp-fecomposite.h
 sp-feconvolvematrix.cpp
-sp-feconvolvematrix-fns.h
-sp-feconvolvematrix.h
 sp-fediffuselighting.cpp
-sp-fediffuselighting-fns.h
-sp-fediffuselighting.h
 sp-fedisplacementmap.cpp
-sp-fedisplacementmap-fns.h
-sp-fedisplacementmap.h
 sp-fedistantlight.cpp
-sp-fedistantlight.h
 sp-feflood.cpp
-sp-feflood-fns.h
-sp-feflood.h
 sp-feimage.cpp
-sp-feimage-fns.h
-sp-feimage.h
 sp-femerge.cpp
-sp-femerge-fns.h
-sp-femerge.h
 sp-femergenode.cpp
-sp-femergenode.h
 sp-femorphology.cpp
-sp-femorphology-fns.h
-sp-femorphology.h
 sp-feoffset.cpp
-sp-feoffset-fns.h
-sp-feoffset.h
 sp-fepointlight.cpp
-sp-fepointlight.h
 sp-fespecularlighting.cpp
-sp-fespecularlighting-fns.h
-sp-fespecularlighting.h
 sp-fespotlight.cpp
-sp-fespotlight.h
 sp-fetile.cpp
-sp-fetile-fns.h
-sp-fetile.h
 sp-feturbulence.cpp
-sp-feturbulence-fns.h
-sp-feturbulence.h
 sp-filter.cpp
-sp-filter-fns.h
-sp-filter.h
 sp-filter-primitive.cpp
-sp-filter-primitive.h
 sp-filter-reference.cpp
-sp-filter-reference.h
-sp-filter-units.h
 sp-flowdiv.cpp
-sp-flowdiv.h
 sp-flowregion.cpp
-sp-flowregion.h
 sp-flowtext.cpp
-sp-flowtext.h
 sp-font.cpp
-sp-font.h
 sp-font-face.cpp
-sp-font-face.h
 sp-gaussian-blur.cpp
-sp-gaussian-blur-fns.h
-sp-gaussian-blur.h
 sp-glyph.cpp
-sp-glyph.h
 sp-gradient.cpp
-sp-gradient-fns.h
-sp-gradient.h
 sp-gradient-reference.cpp
-sp-gradient-reference.h
-sp-gradient-spread.h
-#sp-gradient-test.h
-sp-gradient-units.h
-sp-gradient-vector.h
-sp-guide-attachment.h
-sp-guide-constraint.h
 sp-guide.cpp
-sp-guide.h
 sp-glyph-kerning.cpp
-sp-glyph-kerning.h
 sp-image.cpp
-sp-image.h
 spiral-context.cpp
-spiral-context.h
 sp-item.cpp
 sp-item-group.cpp
-sp-item-group.h
-sp-item.h
 sp-item-notify-moveto.cpp
-sp-item-notify-moveto.h
 sp-item-rm-unsatisfied-cns.cpp
-sp-item-rm-unsatisfied-cns.h
 sp-item-transform.cpp
-sp-item-transform.h
 sp-item-update-cns.cpp
-sp-item-update-cns.h
-sp-linear-gradient-fns.h
-sp-linear-gradient.h
 sp-line.cpp
-sp-line.h
 splivarot.cpp
-splivarot.h
 sp-lpe-item.cpp
-sp-lpe-item.h
-sp-marker-loc.h
 sp-mask.cpp
-sp-mask.h
 sp-metadata.cpp
-sp-metadata.h
-sp-metric.h
 sp-metrics.cpp
-sp-metrics.h
 sp-missing-glyph.cpp
-sp-missing-glyph.h
 sp-namedview.cpp
-sp-namedview.h
 sp-object.cpp
 sp-object-group.cpp
-sp-object-group.h
-sp-object.h
 sp-object-repr.cpp
-sp-object-repr.h
 sp-offset.cpp
-sp-offset.h
 sp-paint-server.cpp
-sp-paint-server.h
 sp-path.cpp
-sp-path.h
 sp-pattern.cpp
-sp-pattern.h
 sp-polygon.cpp
-sp-polygon.h
 sp-polyline.cpp
-sp-polyline.h
-sp-radial-gradient-fns.h
-sp-radial-gradient.h
 sp-rect.cpp
-sp-rect.h
 sp-root.cpp
-sp-root.h
 sp-shape.cpp
-sp-shape.h
 sp-skeleton.cpp
-sp-skeleton.h
 sp-spiral.cpp
-sp-spiral.h
 sp-star.cpp
-sp-star.h
-sp-stop-fns.h
-sp-stop.h
 sp-string.cpp
-sp-string.h
 sp-style-elem.cpp
-sp-style-elem.h
-#sp-style-elem-test.h
 sp-switch.cpp
-sp-switch.h
 sp-symbol.cpp
-sp-symbol.h
 sp-text.cpp
-sp-text.h
-sp-textpath.h
 sp-tref.cpp
-sp-tref.h
 sp-tref-reference.cpp
-sp-tref-reference.h
 sp-tspan.cpp
-sp-tspan.h
 sp-use.cpp
-sp-use.h
 sp-use-reference.cpp
-sp-use-reference.h
 )
 
 SET(INKSCAPE_SRC
-approx-equal.h
 arc-context.cpp
-arc-context.h
 attributes.cpp
-attributes.h
-#attributes-test.h
 axis-manip.cpp
-axis-manip.h
-bad-uri-exception.h
 box3d-context.cpp
-box3d-context.h
 box3d.cpp
-box3d.h
 box3d-side.cpp
-box3d-side.h
 color.cpp
-color.h
 color-profile.cpp
-color-profile-fns.h
-color-profile.h
-#color-profile-test.h
-color-rgba.h
 composite-undo-stack-observer.cpp
-composite-undo-stack-observer.h
-common-context.h
 common-context.cpp
 conditions.cpp
-conditions.h
 conn-avoid-ref.cpp
-conn-avoid-ref.h
-connection-pool.h
 connector-context.cpp
-connector-context.h
 console-output-undo-observer.cpp
-console-output-undo-observer.h
 context-fns.cpp
-context-fns.h
-decimal-round.h
 #deptool.cpp
 desktop-affine.cpp
-desktop-affine.h
 desktop.cpp
 desktop-events.cpp
-desktop-events.h
-desktop.h
 desktop-handles.cpp
-desktop-handles.h
 desktop-style.cpp
-desktop-style.h
 device-manager.cpp
-device-manager.h
 dir-util.cpp
-dir-util.h
-#dir-util-test.h
 document.cpp
-document.h
-document-private.h
 document-subset.cpp
-document-subset.h
 document-undo.cpp
 doxygen-main.cpp
 draw-anchor.cpp
-draw-anchor.h
 draw-context.cpp
-draw-context.h
 dropper-context.cpp
-dropper-context.h
 dyna-draw-context.cpp
-dyna-draw-context.h
 ege-adjustment-action.cpp
-ege-adjustment-action.h
 ege-color-prof-tracker.cpp
-ege-color-prof-tracker.h
 ege-output-action.cpp
-ege-output-action.h
 ege-select-one-action.cpp
-ege-select-one-action.h
-enums.h
 eraser-context.cpp
-eraser-context.h
 event-context.cpp
-event-context.h
-event.h
 event-log.cpp
-event-log.h
 extension
 extract-uri.cpp
-extract-uri.h
-#extract-uri-test.h
 file.cpp
-file.h
-fill-or-stroke.h
 filter-chemistry.cpp
-filter-chemistry.h
 filter-enums.cpp
-filter-enums.h
 fixes.cpp
 flood-context.cpp
-flood-context.h
 fontsize-expansion.cpp
-fontsize-expansion.h
-forward.h
-gc-alloc.h
 gc-anchored.cpp
-gc-anchored.h
-gc-core.h
 gc.cpp
 gc-finalized.cpp
-gc-finalized.h
-gc-managed.h
-gc-soft-ptr.h
 gradient-chemistry.cpp
-gradient-chemistry.h
 gradient-context.cpp
-gradient-context.h
 gradient-drag.cpp
-gradient-drag.h
 guide-snapper.cpp
-guide-snapper.h
 help.cpp
-helper-fns.h
-help.h
-icon-size.h
 ige-mac-menu.c
-ige-mac-menu.h
 ink-action.cpp
-ink-action.h
 inkscape.cpp
-inkscape.h
-inkscape-private.h
 inkscape.rc
 inkscape-stock.cpp
-inkscape-stock.h
-inkscape_version.h.mingw
 interface.cpp
-interface.h
-isinf.h
-isnormal.h
-jabber_whiteboard
 knot.cpp
-knot-enums.h
-knot.h
 knotholder.cpp
-knot-holder-entity.h
 knot-holder-entity.cpp
-knotholder.h
 layer-fns.cpp
-layer-fns.h
 layer-manager.cpp
-layer-manager.h
 line-geometry.cpp
-line-geometry.h
 line-snapper.cpp
-line-snapper.h
-macros.h
 main-cmdlineact.cpp
-main-cmdlineact.h
 main.cpp
 marker.cpp
-marker.h
 media.cpp
-media.h
-memeq.h
-menus-skeleton.h
 message-context.cpp
-message-context.h
-message.h
 message-stack.cpp
-message-stack.h
 mod360.cpp
-mod360.h
-#mod360-test.h
-modifier-fns.h
-MultiPrinter.h
 node-context.cpp
-node-context.h
 nodepath.cpp
-nodepath.h
-number-opt-number.h
 object-edit.cpp
-object-edit.h
 object-hierarchy.cpp
-object-hierarchy.h
 object-snapper.cpp
-object-snapper.h
 path-chemistry.cpp
-path-chemistry.h
-path-prefix.h
 pencil-context.cpp
-pencil-context.h
 pen-context.cpp
-pen-context.h
 persp3d.cpp
-persp3d.h
 persp3d-reference.cpp
-persp3d-reference.h
 perspective-line.cpp
-perspective-line.h
 plugin.def
 preferences.cpp
-preferences.h
-preferences-skeleton.h
 prefix.cpp
-prefix.h
 prefs-utils.cpp
-prefs-utils.h
 print.cpp
-print.h
 profile-manager.cpp
-profile-manager.h
 proj_pt.cpp
-proj_pt.h
-PylogFormatter.h
 rect-context.cpp
-rect-context.h
-remove-last.h
-require-config.h
-round.h
-#round-test.h
 rubberband.cpp
-rubberband.h
 satisfied-guide-cns.cpp
-satisfied-guide-cns.h
 selcue.cpp
-selcue.h
 select-context.cpp
-select-context.h
 selection-chemistry.cpp
-selection-chemistry.h
 selection.cpp
 selection-describer.cpp
-selection-describer.h
-selection.h
 #selfname.tpl
 seltrans.cpp
-seltrans.h
 seltrans-handles.cpp
-seltrans-handles.h
 shape-editor.cpp
-shape-editor.h
 shortcuts.cpp
-shortcuts.h
 snap.cpp
-snap.h
 snapped-line.cpp
-snapped-line.h
 snapped-point.cpp
-snapped-point.h
 snapper.cpp
-snapper.h
 star-context.cpp
-star-context.h
 streams-gzip.cpp
-streams-gzip.h
 streams-handles.cpp
-streams-handles.h
 streams-jar.cpp
-streams-jar.h
 streams-zlib.cpp
-streams-zlib.h
-streq.h
-strneq.h
 style.cpp
-style.h
 #style-test.cpp
-#style-test.h
-svg-profile.h
 svg-view.cpp
-svg-view.h
 svg-view-widget.cpp
-svg-view-widget.h
-syseq.h
-#test-helpers.h
 text-chemistry.cpp
-text-chemistry.h
 text-context.cpp
-text-context.h
 text-editing.cpp
-text-editing.h
-text-tag-attributes.h
 tools-switch.cpp
-tools-switch.h
 transf_mat_3x4.cpp
-transf_mat_3x4.h
-TRPIFormatter.h
 tweak-context.cpp
-tweak-context.h
-undo-stack-observer.h
-unit-constants.h
 uri.cpp
-uri.h
 uri-references.cpp
-uri-references.h
 vanishing-point.cpp
-vanishing-point.h
 verbs.cpp
-verbs.h
-#verbs-test.h
 version.cpp
-version.h
-zoom-context.cpp
-zoom-context.h
+zoom-context.cpp
 ${ONLY_WIN}
 )
 # All folder with CMakeLists.txt files (excluding internal libraries)
@@ -597,7 +306,9 @@ ENDFOREACH(dirlistsrc)
 
 
 ADD_LIBRARY(sp STATIC ${SP_SRC})
-
+TARGET_LINK_LIBRARIES(sp 
+	"${INKSCAPE_LIBS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot sp
+)
 # make executable for INKSCAPE
 ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})
 TARGET_LINK_LIBRARIES(inkscape
diff --git a/src/application/CMakeLists.txt b/src/application/CMakeLists.txt
index b8ec44923..242798c9e 100644
--- a/src/application/CMakeLists.txt
+++ b/src/application/CMakeLists.txt
@@ -1,8 +1,5 @@
 SET(application_SRC
 editor.cpp
-editor.h
 application.cpp
-application.h
 app-prototype.cpp
-app-prototype.h
 )
diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt
index bc52a6462..2588d45aa 100644
--- a/src/bind/CMakeLists.txt
+++ b/src/bind/CMakeLists.txt
@@ -1,6 +1,4 @@
 SET(bind_SRC
 dobinding.cpp
 javabind.cpp
-#javabind.h
-#javabind-private.h
 )
diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt
index 88406d4c7..88c8b8e29 100644
--- a/src/debug/CMakeLists.txt
+++ b/src/debug/CMakeLists.txt
@@ -1,19 +1,9 @@
 SET(debug_SRC
 demangle.cpp
-#demangle.h
-#event.h
-#event-tracker.h
-#gc-heap.h
 heap.cpp
-#heap.h
 log-display-config.cpp
-#log-display-config.h
 logger.cpp
-#logger.h
-#simple-event.h
 sysv-heap.cpp
-#sysv-heap.h
 timestamp.cpp
-#timestamp.h
 )
 
diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
index 4e0e9a9c8..4087fbfe9 100644
--- a/src/dialogs/CMakeLists.txt
+++ b/src/dialogs/CMakeLists.txt
@@ -1,52 +1,27 @@
 SET(dialogs_SRC
 clonetiler.cpp
-clonetiler.h
 debugdialog.cpp
-debugdialog.h
 dialog-events.cpp
-dialog-events.h
 eek-color-def.cpp
-eek-color-def.h
 eek-preview.cpp
-eek-preview.h
 export.cpp
-export.h
 extensions.cpp
-extensions.h
 fill-style.cpp
-fill-style.h
 find.cpp
-find.h
 guidelinedialog.cpp
-guidelinedialog.h
 iconpreview.cpp
-iconpreview.h
 in-dt-coordsys.cpp
-in-dt-coordsys.h
 input.cpp
-input.h
 item-properties.cpp
-item-properties.h
 layer-properties.cpp
-layer-properties.h
 layers-panel.cpp
-layers-panel.h
 object-attributes.cpp
-object-attributes.h
 rdf.cpp
-rdf.h
 sp-attribute-widget.cpp
-sp-attribute-widget.h
 stroke-style.cpp
-stroke-style.h
 swatches.cpp
-swatches.h
 text-edit.cpp
-text-edit.h
 tiledialog.cpp
-tiledialog.h
 unclump.cpp
-unclump.h
 xml-tree.cpp
-xml-tree.h
 )
diff --git a/src/dom/CMakeLists.txt b/src/dom/CMakeLists.txt
index 645999e0c..2f6963783 100644
--- a/src/dom/CMakeLists.txt
+++ b/src/dom/CMakeLists.txt
@@ -1,47 +1,20 @@
 SET(dom_SRC
-css.h
 cssreader.cpp
-cssreader.h
-dom.h
 domimpl.cpp
-domimpl.h
 domptr.cpp
-domptr.h
 domstring.cpp
-domstring.h
-events.h
-ls.h
 lsimpl.cpp
-lsimpl.h
 prop-css2.cpp
-prop-css.cpp
-prop-svg.cpp
-smil.h
+#prop-css.cpp
+#prop-svg.cpp
 smilimpl.cpp
-smilimpl.h
-stylesheets.h
-svg.h
 svgimpl.cpp
-svgimpl.h
 svgreader.cpp
-svgreader.h
-svgtypes.h
-traversal.h
 ucd.cpp
-ucd.h
 uri.cpp
-uri.h
-views.h
-views-level3.h
 xmlreader.cpp
-xmlreader.h
 xmlwriter.cpp
-xmlwriter.h
-xpath.h
 xpathimpl.cpp
-xpathimpl.h
 xpathparser.cpp
-xpathparser.h
 xpathtoken.cpp
-xpathtoken.h
 )
diff --git a/src/extension/internal/CMakeLists.txt b/src/extension/internal/CMakeLists.txt
index 3d69be2b1..4437102fc 100644
--- a/src/extension/internal/CMakeLists.txt
+++ b/src/extension/internal/CMakeLists.txt
@@ -1,59 +1,34 @@
 IF(WIN32)
 SET(EXT_INT_WIN
 win32.cpp
-win32.h)
+)
 ENDIF(WIN32)
 
 SET(extension_internal_SRC
 bluredge.cpp
-bluredge.h
 cairo-pdf-out.cpp
-cairo-pdf-out.h
 cairo-png-out.cpp
-cairo-png-out.h
 cairo-ps-out.cpp
-cairo-ps-out.h
 cairo-render-context.cpp
-cairo-render-context.h
 cairo-renderer.cpp
-cairo-renderer.h
 cairo-renderer-pdf-out.cpp
-cairo-renderer-pdf-out.h
-clear-n_.h
 emf-win32-inout.cpp
-emf-win32-inout.h
 emf-win32-print.cpp
-emf-win32-print.h
 eps-out.cpp
-eps-out.h
 gdkpixbuf-input.cpp
-gdkpixbuf-input.h
 gimpgrad.cpp
-gimpgrad.h
 grid.cpp
-grid.h
 latex-pstricks.cpp
-latex-pstricks.h
 latex-pstricks-out.cpp
-latex-pstricks-out.h
 odf.cpp
-odf.h
 pdf-cairo.cpp
-pdf-cairo.h
 pdfinput
 pdf-input-cairo.cpp
-pdf-input-cairo.h
 pov-out.cpp
-pov-out.h
 ps.cpp
-ps.h
 ps-out.cpp
-ps-out.h
 svg.cpp
-svg.h
 svgz.cpp
-svgz.h
 wpg-input.cpp
-wpg-input.h
 ${EXT_INT_WIN}
 )
diff --git a/src/extension/script/CMakeLists.txt b/src/extension/script/CMakeLists.txt
index a09528bb5..693948508 100644
--- a/src/extension/script/CMakeLists.txt
+++ b/src/extension/script/CMakeLists.txt
@@ -1,4 +1,3 @@
 SET(extension_script_SRC
 InkscapeScript.cpp
-InkscapeScript.h
 )
diff --git a/src/graphlayout/CMakeLists.txt b/src/graphlayout/CMakeLists.txt
index a90a88762..e570a7a5d 100644
--- a/src/graphlayout/CMakeLists.txt
+++ b/src/graphlayout/CMakeLists.txt
@@ -1,4 +1,3 @@
 SET(graphlayout_SRC
 graphlayout.cpp
-graphlayout.h
 )
diff --git a/src/inkjar/CMakeLists.txt b/src/inkjar/CMakeLists.txt
index de1574a2c..501441940 100644
--- a/src/inkjar/CMakeLists.txt
+++ b/src/inkjar/CMakeLists.txt
@@ -1,4 +1,3 @@
 SET(inkjar_SRC
 jar.cpp
-jar.h
 )
diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
index 8e159b24b..4da53ce0a 100644
--- a/src/io/CMakeLists.txt
+++ b/src/io/CMakeLists.txt
@@ -1,23 +1,13 @@
 SET(io_SRC
 base64stream.cpp
-base64stream.h
 ftos.cpp
-ftos.h
 gzipstream.cpp
-gzipstream.h
 inkscapestream.cpp
-inkscapestream.h
 resource.cpp
-resource.h
 simple-sax.cpp
-simple-sax.h
 #streamtest.cpp
 stringstream.cpp
-stringstream.h
 sys.cpp
-sys.h
 uristream.cpp
-uristream.h
 xsltstream.cpp
-xsltstream.h
-)
\ No newline at end of file
+)
diff --git a/src/jabber_whiteboard/CMakeLists.txt b/src/jabber_whiteboard/CMakeLists.txt
index 754276749..e1b069d21 100644
--- a/src/jabber_whiteboard/CMakeLists.txt
+++ b/src/jabber_whiteboard/CMakeLists.txt
@@ -1,33 +1,17 @@
 SET(jabber_whiteboard_SRC
 defines.cpp
-defines.h
 empty.cpp
 inkboard-document.cpp
-inkboard-document.h
 inkboard-node.cpp
 invitation-confirm-dialog.cpp
-invitation-confirm-dialog.h
 keynode.cpp
-keynode.h
 message-aggregator.cpp
-message-aggregator.h
-message-node.h
 message-queue.cpp
-message-queue.h
 message-tags.cpp
-message-tags.h
 message-utilities.cpp
-message-utilities.h
-message-verifier.h
 #node-tracker.cpp
-#node-tracker.h
 #node-utilities.cpp
-#node-utilities.h
 pedrogui.cpp
-pedrogui.h
 session-file-selector.cpp
-session-file-selector.h
 session-manager.cpp
-session-manager.h
-tracker-node.h
 )
diff --git a/src/jabber_whiteboard/dialog/CMakeLists.txt b/src/jabber_whiteboard/dialog/CMakeLists.txt
index d1c972f01..74863aa4b 100644
--- a/src/jabber_whiteboard/dialog/CMakeLists.txt
+++ b/src/jabber_whiteboard/dialog/CMakeLists.txt
@@ -1,4 +1,3 @@
 SET(jabber_whiteboard_dialog_SRC
 choose-desktop.cpp
-choose-desktop.h
-)
\ No newline at end of file
+)
diff --git a/src/libcola/CMakeLists.txt b/src/libcola/CMakeLists.txt
index ffc3f481f..564663aa0 100644
--- a/src/libcola/CMakeLists.txt
+++ b/src/libcola/CMakeLists.txt
@@ -1,17 +1,10 @@
-SET(libcola_SRC
-cola.cpp
-cola.h
-conjugate_gradient.cpp
-conjugate_gradient.h
-connected_components.cpp
-cycle_detector.cpp
-cycle_detector.h
-defs.h
-gradient_projection.cpp
-gradient_projection.h
-shortest_paths.cpp
-shortest_paths.h
-straightener.cpp
-straightener.h
-)
+SET(libcola_SRC
+cola.cpp
+conjugate_gradient.cpp
+connected_components.cpp
+cycle_detector.cpp
+gradient_projection.cpp
+shortest_paths.cpp
+straightener.cpp
+)
 ADD_LIBRARY(cola STATIC ${libcola_SRC})
diff --git a/src/libcroco/CMakeLists.txt b/src/libcroco/CMakeLists.txt
index 60a839bf9..cee248a2a 100644
--- a/src/libcroco/CMakeLists.txt
+++ b/src/libcroco/CMakeLists.txt
@@ -1,59 +1,30 @@
 SET(libcroco_SRC
 cr-additional-sel.c
-cr-additional-sel.h
 cr-attr-sel.c
-cr-attr-sel.h
 cr-cascade.c
-cr-cascade.h
 cr-declaration.c
-cr-declaration.h
 cr-doc-handler.c
-cr-doc-handler.h
 cr-enc-handler.c
-cr-enc-handler.h
 cr-fonts.c
-cr-fonts.h
 cr-input.c
-cr-input.h
 cr-libxml-node-iface.c
-cr-libxml-node-iface.h
-cr-node-iface.h
 cr-num.c
-cr-num.h
 cr-om-parser.c
-cr-om-parser.h
 cr-parser.c
-cr-parser.h
 cr-parsing-location.c
-cr-parsing-location.h
 cr-prop-list.c
-cr-prop-list.h
 cr-pseudo.c
-cr-pseudo.h
 cr-rgb.c
-cr-rgb.h
 cr-selector.c
-cr-selector.h
 cr-sel-eng.c
-cr-sel-eng.h
 cr-simple-sel.c
-cr-simple-sel.h
 cr-statement.c
-cr-statement.h
 cr-string.c
-cr-string.h
 cr-style.c
-cr-style.h
 cr-stylesheet.c
-cr-stylesheet.h
 cr-term.c
-cr-term.h
 cr-tknzr.c
-cr-tknzr.h
 cr-token.c
-cr-token.h
 cr-utils.c
-cr-utils.h
-libcroco.h
 )
 ADD_LIBRARY(croco STATIC ${libcroco_SRC})
diff --git a/src/libgdl/CMakeLists.txt b/src/libgdl/CMakeLists.txt
index 5378e7e1e..0c12944a5 100644
--- a/src/libgdl/CMakeLists.txt
+++ b/src/libgdl/CMakeLists.txt
@@ -1,42 +1,25 @@
 IF(WIN32)
 SET(GDL_WIN
-gdl-win32.c
-gdl-win32.h)
+gdl-win32.c
+)
 ENDIF(WIN32)
 
-SET(libgdl_SRC
-gdl-dock.c
-gdl-dock.h
-gdl-dock-bar.c
-gdl-dock-bar.h
-gdl-dock-item.c
-gdl-dock-item.h
-gdl-dock-item-grip.c
-gdl-dock-item-grip.h
-gdl-dock-master.c
-gdl-dock-master.h
-gdl-dock-notebook.c
-gdl-dock-notebook.h
-gdl-dock-object.c
-gdl-dock-object.h
-gdl-dock-paned.c
-gdl-dock-paned.h
-gdl-dock-placeholder.c
-gdl-dock-placeholder.h
-gdl-dock-tablabel.c
-gdl-dock-tablabel.h
-gdl-i18n.c
-gdl-i18n.h
-gdl-stock.c
-gdl-stock.h
-gdl-stock-icons.h
-gdl-switcher.c
-gdl-switcher.h
-gdl-tools.h
libgdl.h
-libgdlmarshal.c
-libgdlmarshal.h
-libgdltypebuiltins.c
-libgdltypebuiltins.h
+SET(libgdl_SRC
+gdl-dock.c
+gdl-dock-bar.c
+gdl-dock-item.c
+gdl-dock-item-grip.c
+gdl-dock-master.c
+gdl-dock-notebook.c
+gdl-dock-object.c
+gdl-dock-paned.c
+gdl-dock-placeholder.c
+gdl-dock-tablabel.c
+gdl-i18n.c
+gdl-stock.c
+gdl-switcher.c
+gdl-tools.h
libgdlmarshal.c
+libgdltypebuiltins.c
 ${GDL_WIN}
-)
+)
 ADD_LIBRARY(gdl STATIC ${libgdl_SRC})
diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index 9adfb1236..00307fcdd 100644
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -1,104 +1,41 @@
-SET(libnr_SRC
-in-svg-plane.h
-#in-svg-plane-test.cpp
-#in-svg-plane-test.h
-n-art-bpath.h
-n-art-bpath-2geom.cpp
-n-art-bpath-2geom.h
-nr-blit.cpp
-nr-blit.h
-nr-compose.cpp
-nr-compose.h
-nr-compose-transform.cpp
-nr-compose-transform.h
-nr-convert2geom.h
-nr-convex-hull.h
-nr-convex-hull-ops.h
-nr-coord.h
-nr-dim2.h
-nr-forward.h
-nr-gradient.cpp
-nr-gradient.h
-nr-i-coord.h
-nr-macros.h
-nr-matrix.cpp
-nr-matrix.h
-nr-matrix-div.cpp
-nr-matrix-div.h
-nr-matrix-fns.cpp
-nr-matrix-fns.h
-nr-matrix-ops.h
-nr-matrix-rotate-ops.cpp
-nr-matrix-rotate-ops.h
-nr-matrix-scale-ops.h
-nr-matrix-test.cpp
-nr-matrix-test.h
-nr-matrix-translate-ops.h
-nr-maybe.h
-nr-object.cpp
-nr-object.h
-nr-path.cpp
-nr-path.h
-nr-path-code.h
-nr-pixblock.cpp
-nr-pixblock.h
-nr-pixblock-line.cpp
-nr-pixblock-line.h
-nr-pixblock-pattern.cpp
-nr-pixblock-pattern.h
-nr-pixblock-pixel.cpp
-nr-pixblock-pixel.h
-nr-pixops.h
-nr-point.h
-nr-point-fns.cpp
-nr-point-fns.h
-#nr-point-fns-test.cpp
-#nr-point-fns-test.h
-nr-point-l.h
-nr-point-matrix-ops.h
-nr-point-ops.h
-nr-rect.cpp
-nr-rect.h
-nr-rect-l.cpp
-nr-rect-l.h
-nr-rect-ops.h
-nr-render.h
-nr-rotate.h
-nr-rotate-fns.cpp
-nr-rotate-fns.h
-#nr-rotate-fns-test.cpp
-#nr-rotate-fns-test.h
-nr-rotate-matrix-ops.cpp
-nr-rotate-matrix-ops.h
-nr-rotate-ops.h
-nr-rotate-test.cpp
-nr-rotate-test.h
-nr-scale.h
-nr-scale-matrix-ops.cpp
-nr-scale-matrix-ops.h
-nr-scale-ops.h
-nr-scale-test.cpp
-nr-scale-test.h
-nr-scale-translate-ops.cpp
-nr-scale-translate-ops.h
-nr-translate.h
-nr-translate-matrix-ops.cpp
-nr-translate-matrix-ops.h
-nr-translate-ops.h
-nr-translate-rotate-ops.cpp
-nr-translate-rotate-ops.h
-nr-translate-scale-ops.cpp
-nr-translate-scale-ops.h
-#nr-translate-test.cpp
-#nr-translate-test.h
-nr-types.cpp
-nr-types.h
-#nr-types-test.cpp
-#nr-types-test.h
-nr-values.cpp
-nr-values.h
-testnr.cpp
-)
+SET(libnr_SRC
+#in-svg-plane-test.cpp
+n-art-bpath-2geom.cpp
+nr-blit.cpp
+nr-compose.cpp
+nr-compose-transform.cpp
+nr-gradient.cpp
+nr-matrix.cpp
+nr-matrix-div.cpp
+nr-matrix-fns.cpp
+nr-matrix-rotate-ops.cpp
+nr-matrix-test.cpp
+nr-object.cpp
+nr-path.cpp
+nr-pixblock.cpp
+nr-pixblock-line.cpp
+nr-pixblock-pattern.cpp
+nr-pixblock-pixel.cpp
+nr-point-fns.cpp
+#nr-point-fns-test.cpp
+nr-rect.cpp
+nr-rect-l.cpp
+nr-rotate-fns.cpp
+#nr-rotate-fns-test.cpp
+nr-rotate-matrix-ops.cpp
+nr-rotate-test.cpp
+nr-scale-matrix-ops.cpp
+nr-scale-test.cpp
+nr-scale-translate-ops.cpp
+nr-translate-matrix-ops.cpp
+nr-translate-rotate-ops.cpp
+nr-translate-scale-ops.cpp
+#nr-translate-test.cpp
+nr-types.cpp
+#nr-types-test.cpp
+nr-values.cpp
+testnr.cpp
+)
 ADD_LIBRARY(nr STATIC ${libnr_SRC})
-TARGET_LINK_LIBRARIES(nr
+TARGET_LINK_LIBRARIES(nr
 	"${INKSCAPE_LINK_FLAGS}" 2geom )
diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index 905fc44c3..28ff101c9 100644
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -1,39 +1,19 @@
-SET(libnrtype_SRC
-boundary-type.h
-FontFactory.cpp
-FontFactory.h
-font-glyph.h
-FontInstance.cpp
-font-instance.h
-font-lister.cpp
-font-lister.h
-font-style.h
-font-style-to-pos.cpp
-font-style-to-pos.h
-Layout-TNG.cpp
-Layout-TNG.h
-Layout-TNG-Compute.cpp
-Layout-TNG-Input.cpp
-Layout-TNG-OutIter.cpp
-Layout-TNG-Output.cpp
-Layout-TNG-Scanline-Maker.h
-Layout-TNG-Scanline-Makers.cpp
-nrtype-forward.h
-nr-type-pos-def.cpp
-nr-type-pos-def.h
-nr-type-primitives.cpp
-nr-type-primitives.h
-one-box.h
-one-glyph.h
-one-para.h
-RasterFont.cpp
-RasterFont.h
-raster-glyph.h
-raster-position.h
-text-boundary.h
-TextWrapper.cpp
-TextWrapper.h
-)
+SET(libnrtype_SRC
+FontFactory.cpp
+FontInstance.cpp
+font-lister.cpp
+font-style-to-pos.cpp
+Layout-TNG.cpp
+Layout-TNG-Compute.cpp
+Layout-TNG-Input.cpp
+Layout-TNG-OutIter.cpp
+Layout-TNG-Output.cpp
+Layout-TNG-Scanline-Makers.cpp
+nr-type-pos-def.cpp
+nr-type-primitives.cpp
+RasterFont.cpp
+TextWrapper.cpp
+)
 ADD_LIBRARY(nrtype STATIC ${libnrtype_SRC})
-TARGET_LINK_LIBRARIES(nrtype
+TARGET_LINK_LIBRARIES(nrtype
 	"${INKSCAPE_LINK_FLAGS}" nr )
diff --git a/src/livarot/CMakeLists.txt b/src/livarot/CMakeLists.txt
index 583863890..d12df1c3b 100644
--- a/src/livarot/CMakeLists.txt
+++ b/src/livarot/CMakeLists.txt
@@ -1,39 +1,23 @@
-SET(livarot_SRC
+SET(livarot_SRC
 AlphaLigne.cpp
-AlphaLigne.h
 AVL.cpp
-AVL.h
 BitLigne.cpp
-BitLigne.h
-CMakeLists.txt
 float-line.cpp
-float-line.h
 int-line.cpp
-int-line.h
-LivarotDefs.h
-livarot-forward.h
-Livarot.h
 PathConversion.cpp
 Path.cpp
 PathCutting.cpp
 path-description.cpp
-path-description.h
-Path.h
 PathOutline.cpp
 PathSimplify.cpp
 PathStroke.cpp
 Shape.cpp
 ShapeDraw.cpp
-Shape.h
 ShapeMisc.cpp
 ShapeRaster.cpp
 ShapeSweep.cpp
 sweep-event.cpp
-sweep-event.h
-sweep-event-queue.h
 sweep-tree.cpp
-sweep-tree.h
 sweep-tree-list.cpp
-sweep-tree-list.h
-)
+)
 ADD_LIBRARY(livarot STATIC ${livarot_SRC})
diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index 8e8bfb7c6..38b652106 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -1,52 +1,26 @@
 SET(live_effects_SRC
 bezctx.cpp
-bezctx.h
-bezctx_intf.h
 effect.cpp
-effect.h
 lpe-bendpath.cpp
-lpe-bendpath.h
 lpe-circle_with_radius.cpp
-lpe-circle_with_radius.h
 lpe-constructgrid.cpp
-lpe-constructgrid.h
 lpe-curvestitch.cpp
-lpe-curvestitch.h
 lpe-envelope.cpp
 lpe-gears.cpp
-lpe-gears.h
 lpegroupbbox.cpp
-lpegroupbbox.h
 lpe-knot.cpp
-lpe-knot.h
-lpe-lattice.h
 lpe-lattice.cpp
 lpe-mirror_reflect.cpp
-lpe-mirror_reflect.h
 lpeobject.cpp
-lpeobject.h
 lpeobject-reference.cpp
-lpeobject-reference.h
 lpe-patternalongpath.cpp
-lpe-patternalongpath.h
 lpe-perp_bisector.cpp
-lpe-perp_bisector.h
 lpe-perspective_path.cpp
-lpe-perspective_path.h
 lpe-skeleton.cpp
-lpe-skeleton.h
 lpe-sketch.cpp
-lpe-sketch.h
 lpe-spiro.cpp
-lpe-spiro.h
 lpe-tangent_to_curve.cpp
-lpe-tangent_to_curve.h
 lpe-test-doEffect-stack.cpp
-lpe-test-doEffect-stack.h
 lpe-vonkoch.cpp
-lpe-vonkoch.h
 spiro.cpp
-spiro.h
 )
-
-
diff --git a/src/live_effects/parameter/CMakeLists.txt b/src/live_effects/parameter/CMakeLists.txt
index 4c429e586..9d00856b8 100644
--- a/src/live_effects/parameter/CMakeLists.txt
+++ b/src/live_effects/parameter/CMakeLists.txt
@@ -1,19 +1,9 @@
 SET(live_effects_parameter_SRC
 bool.cpp
-bool.h
-enum.h
-makefile.in
-Makefile_insert
 parameter.cpp
-parameter.h
 path.cpp
-path.h
 path-reference.cpp
-path-reference.h
 point.cpp
-point.h
 pointparam-knotholder.cpp
-pointparam-knotholder.h
 random.cpp
-random.h
 )
diff --git a/src/pedro/CMakeLists.txt b/src/pedro/CMakeLists.txt
index 9e3cbdb03..ac24ba8d2 100644
--- a/src/pedro/CMakeLists.txt
+++ b/src/pedro/CMakeLists.txt
@@ -1,16 +1,10 @@
 SET(pedro_SRC
 #empty.cpp
 #geckoembed.cpp
-#geckoembed.h
 pedroconfig.cpp
-pedroconfig.h
 pedrodom.cpp
-pedrodom.h
 #pedrogui.cpp
-#pedrogui.h
 #pedromain.cpp
 pedroutil.cpp
-pedroutil.h
 pedroxmpp.cpp
-pedroxmpp.h
 )
diff --git a/src/removeoverlap/CMakeLists.txt b/src/removeoverlap/CMakeLists.txt
index 75a15c85b..a7c18b886 100644
--- a/src/removeoverlap/CMakeLists.txt
+++ b/src/removeoverlap/CMakeLists.txt
@@ -1,4 +1,3 @@
 SET(removeoverlap_SRC
 removeoverlap.cpp
-removeoverlap.h
-)
\ No newline at end of file
+)
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index 85d943000..707b86736 100644
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -1,31 +1,16 @@
 SET(svg_SRC
 css-ostringstream.cpp
-css-ostringstream.h
-#css-ostringstream-test.h
 #ftos.cpp
-#ftos.h
 gnome-canvas-bpath-util.cpp
-gnome-canvas-bpath-util.h
 itos.cpp
 path-string.cpp
-path-string.h
 round.cpp
 sp-svg.def
 stringstream.cpp
-stringstream.h
-#stringstream-test.h
 strip-trailing-zeros.cpp
-strip-trailing-zeros.h
 svg-affine.cpp
 svg-color.cpp
-svg-color.h
-#svg-color-test.h
-svg.h
-svg-icc-color.h
 svg-length.cpp
-svg-length.h
 svg-path.cpp
-#svg-path-test.h
 #test-stubs.cpp
-#test-stubs.h
 )
diff --git a/src/trace/CMakeLists.txt b/src/trace/CMakeLists.txt
index 5f541f5be..053d77ad9 100644
--- a/src/trace/CMakeLists.txt
+++ b/src/trace/CMakeLists.txt
@@ -1,15 +1,8 @@
 SET(trace_SRC
 filterset.cpp
-filterset.h
 imagemap.cpp
-imagemap.h
 imagemap-gdk.cpp
-imagemap-gdk.h
-pool.h
 quantize.cpp
-quantize.h
 siox.cpp
-siox.h
 trace.cpp
-trace.h
 )
diff --git a/src/trace/potrace/CMakeLists.txt b/src/trace/potrace/CMakeLists.txt
index 07f942589..f61e8bcd1 100644
--- a/src/trace/potrace/CMakeLists.txt
+++ b/src/trace/potrace/CMakeLists.txt
@@ -1,20 +1,9 @@
 SET(trace_potrace_SRC
-auxiliary.h
-bitmap.h
 curve.cpp
-curve.h
 decompose.cpp
-decompose.h
 greymap.cpp
-greymap.h
 inkscape-potrace.cpp
-inkscape-potrace.h
-lists.h
 potracelib.cpp
-potracelib.h
-progress.h
 render.cpp
-render.h
 trace.cpp
-trace.h
-)
\ No newline at end of file
+)
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 8edeb1715..48884807d 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -1,16 +1,8 @@
 SET(ui_SRC
 clipboard.cpp
-clipboard.h
 context-menu.cpp
-context-menu.h
 icons.cpp
-icons.h
-previewable.h
-previewfillable.h
 previewholder.cpp
-previewholder.h
 stock.cpp
-stock.h
 stock-items.cpp
-stock-items.h
 )
diff --git a/src/ui/cache/CMakeLists.txt b/src/ui/cache/CMakeLists.txt
index 632c8840d..a78010196 100644
--- a/src/ui/cache/CMakeLists.txt
+++ b/src/ui/cache/CMakeLists.txt
@@ -1,4 +1,3 @@
 SET(ui_cache_SRC
 svg_preview_cache.cpp
-svg_preview_cache.h
-)
\ No newline at end of file
+)
diff --git a/src/ui/dialog/CMakeLists.txt b/src/ui/dialog/CMakeLists.txt
index b36afce45..abdfa4dd8 100644
--- a/src/ui/dialog/CMakeLists.txt
+++ b/src/ui/dialog/CMakeLists.txt
@@ -1,81 +1,45 @@
 IF(WIN32)
 SET(ui_dialog_WIN32_SRC
 filedialogimpl-win32.cpp
-filedialogimpl-win32.h)
+)
 ELSEIF(WIN32)
     SET(ui_dialog_WIN32_SRC)
 ENDIF(WIN32)
 
 SET(ui_dialog_SRC
 aboutbox.cpp
-aboutbox.h
 align-and-distribute.cpp
-align-and-distribute.h
-behavior.h
 dialog.cpp
-dialog.h
 dialog-manager.cpp
-dialog-manager.h
 dock-behavior.cpp
-dock-behavior.h
 document-metadata.cpp
-document-metadata.h
 document-properties.cpp
-document-properties.h
 export.cpp
-export.h
 extension-editor.cpp
-extension-editor.h
 filedialog.cpp
-filedialog.h
 filedialogimpl-gtkmm.cpp
-filedialogimpl-gtkmm.h
 fill-and-stroke.cpp
-fill-and-stroke.h
 filter-effects-dialog.cpp
-filter-effects-dialog.h
 find.cpp
-find.h
 floating-behavior.cpp
-floating-behavior.h
 inkscape-preferences.cpp
-inkscape-preferences.h
 input.cpp
-input.h
 layer-editor.cpp
-layer-editor.h
 livepatheffect-editor.cpp
-livepatheffect-editor.h
 memory.cpp
-memory.h
 messages.cpp
-messages.h
 ocaldialogs.cpp
-ocaldialogs.h
-panel-dialog.h
 print.cpp
-print.h
 scriptdialog.cpp
-scriptdialog.h
 #session-player.cpp
-#session-player.h
 text-properties.cpp
-text-properties.h
 tracedialog.cpp
-tracedialog.h
 transformation.cpp
-transformation.h
 tree-editor.cpp
-tree-editor.h
 undo-history.cpp
-undo-history.h
 #whiteboard-connect.cpp
-#whiteboard-connect.h
 #whiteboard-sharewithchat.cpp
-#whiteboard-sharewithchat.h
 #whiteboard-sharewithuser.cpp
-#whiteboard-sharewithuser.h
 xml-editor.cpp
-xml-editor.h
 ${ui_dialog_WIN32_SRC}
 )
diff --git a/src/ui/view/CMakeLists.txt b/src/ui/view/CMakeLists.txt
index d80cac587..df2b422ca 100644
--- a/src/ui/view/CMakeLists.txt
+++ b/src/ui/view/CMakeLists.txt
@@ -1,21 +1,11 @@
 SET(ui_view_SRC
 desktop.cpp
-desktop.h
 desktop-affine.cpp
-desktop-affine.h
 desktop-events.cpp
-desktop-events.h
 desktop-handles.cpp
-desktop-handles.h
 desktop-style.cpp
-desktop-style.h
 edit.cpp
-edit.h
 edit-widget.cpp
-edit-widget.h
-edit-widget-interface.h
 view.cpp
-view.h
 view-widget.cpp
-view-widget.h
-)
\ No newline at end of file
+)
diff --git a/src/ui/widget/CMakeLists.txt b/src/ui/widget/CMakeLists.txt
index 44c626cd5..9293e3be4 100644
--- a/src/ui/widget/CMakeLists.txt
+++ b/src/ui/widget/CMakeLists.txt
@@ -1,79 +1,39 @@
 SET(ui_widget_SRC
-attr-widget.h
 button.cpp
-button.h
 color-picker.cpp
-color-picker.h
 color-preview.cpp
-color-preview.h
-combo-enums.h
 combo-text.cpp
-combo-text.h
 dock.cpp
-dock.h
 dock-item.cpp
-dock-item.h
 entity-entry.cpp
-entity-entry.h
 entry.cpp
-entry.h
 filter-effect-chooser.cpp
-filter-effect-chooser.h
 handlebox.cpp
-handlebox.h
 icon-widget.cpp
-icon-widget.h
 imageicon.cpp
-imageicon.h
 labelled.cpp
-labelled.h
 licensor.cpp
-licensor.h
 notebook-page.cpp
-notebook-page.h
 object-composite-settings.cpp
-object-composite-settings.h
 page-sizer.cpp
-page-sizer.h
 panel.cpp
-panel.h
 point.cpp
-point.h
 preferences-widget.cpp
-preferences-widget.h
 random.cpp
-random.h
-registered-enums.h
 registered-widget.cpp
-registered-widget.h
 registry.cpp
-registry.h
 rendering-options.cpp
-rendering-options.h
 rotateable.cpp
-rotateable.h
 ruler.cpp
-ruler.h
 scalar.cpp
-scalar.h
 scalar-unit.cpp
-scalar-unit.h
 selected-style.cpp
-selected-style.h
 spin-slider.cpp
-spin-slider.h
 style-subject.cpp
-style-subject.h
 style-swatch.cpp
-style-swatch.h
 svg-canvas.cpp
-svg-canvas.h
 tolerance-slider.cpp
-tolerance-slider.h
 toolbox.cpp
-toolbox.h
 unit-menu.cpp
-unit-menu.h
 zoom-status.cpp
-zoom-status.h
-)
\ No newline at end of file
+)
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 1a5c48ba2..b11720c26 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,19 +1,5 @@
 SET(util_SRC
-enums.h
-filter-list.h
-fixed_point.h
-format.h
-forward-pointer-iterator.h
-glib-list-iterators.h
-list.h
-list-container.h
 list-container-test.cpp
-map-list.h
-mathfns.h
-reverse-list.h
 share.cpp
-share.h
-tuple.h
 units.cpp
-units.h
-)
\ No newline at end of file
+)
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 1889f5b10..80ab4c528 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -1,65 +1,33 @@
 SET(widgets_SRC
 button.cpp
-button.h
 calligraphic-profile-rename.cpp
-calligraphic-profile-rename.h
 dash-selector.cpp
-dash-selector.h
 desktop-widget.cpp
-desktop-widget.h
 font-selector.cpp
-font-selector.h
 gradient-image.cpp
-gradient-image.h
 gradient-selector.cpp
-gradient-selector.h
 gradient-toolbar.cpp
-gradient-toolbar.h
 gradient-vector.cpp
-gradient-vector.h
 icon.cpp
-icon.h
 layer-selector.cpp
-layer-selector.h
 paint-selector.cpp
-paint-selector.h
 ruler.cpp
-ruler.h
 select-toolbar.cpp
-select-toolbar.h
 shrink-wrap-button.cpp
-shrink-wrap-button.h
 sp-color-gtkselector.cpp
-sp-color-gtkselector.h
 sp-color-icc-selector.cpp
-sp-color-icc-selector.h
 sp-color-notebook.cpp
-sp-color-notebook.h
 sp-color-preview.cpp
-sp-color-preview.h
 sp-color-scales.cpp
-sp-color-scales.h
 sp-color-selector.cpp
-sp-color-selector.h
 sp-color-slider.cpp
-sp-color-slider.h
 sp-color-wheel.cpp
-sp-color-wheel.h
 sp-color-wheel-selector.cpp
-sp-color-wheel-selector.h
 spinbutton-events.cpp
-spinbutton-events.h
 sp-widget.cpp
-sp-widget.h
 spw-utilities.cpp
-spw-utilities.h
 sp-xmlview-attr-list.cpp
-sp-xmlview-attr-list.h
 sp-xmlview-content.cpp
-sp-xmlview-content.h
 sp-xmlview-tree.cpp
-sp-xmlview-tree.h
 toolbox.cpp
-toolbox.h
-widget-sizes.h
-)
\ No newline at end of file
+)
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index a9bdba99d..9ee5b4626 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -1,44 +1,18 @@
 SET(xml_SRC
-attribute-record.h
-comment-node.h
 composite-node-observer.cpp
-composite-node-observer.h
 croco-node-iface.cpp
-croco-node-iface.h
-document.h
-element-node.h
 event.cpp
-event.h
-event-fns.h
-invalid-operation-exception.h
 log-builder.cpp
-log-builder.h
-node.h
-node-event-vector.h
 node-fns.cpp
-node-fns.h
-node-iterators.h
-node-observer.h
-pi-node.h
 quote.cpp
-quote.h
 #quote-test.cpp
-#quote-test.h
 repr.cpp
-repr.h
 #repr-action-test.cpp
-#repr-action-test.h
 repr-css.cpp
 repr-io.cpp
 repr-sorting.cpp
-repr-sorting.h
 repr-util.cpp
 simple-document.cpp
-simple-document.h
 simple-node.cpp
-simple-node.h
-sp-css-attr.h
 subtree.cpp
-subtree.h
-text-node.h
-)
\ No newline at end of file
+)