diff --git a/pandatool/src/converter/CMakeLists.txt b/pandatool/src/converter/CMakeLists.txt
index b91752f849..aee79d48c6 100644
--- a/pandatool/src/converter/CMakeLists.txt
+++ b/pandatool/src/converter/CMakeLists.txt
@@ -1,9 +1,14 @@
 set(P3CONVERTER_HEADERS
-    somethingToEggConverter.I somethingToEggConverter.h
-    eggToSomethingConverter.I eggToSomethingConverter.h)
+  somethingToEggConverter.h somethingToEggConverter.I
+  eggToSomethingConverter.h eggToSomethingConverter.I
+)
 
 set(P3CONVERTER_SOURCES
-    somethingToEggConverter.cxx eggToSomethingConverter.cxx)
+  somethingToEggConverter.cxx eggToSomethingConverter.cxx
+)
 
 add_library(p3converter STATIC ${P3CONVERTER_HEADERS} ${P3CONVERTER_SOURCES})
 target_link_libraries(p3converter p3pandatoolbase pandaegg)
+
+# This is only needed for binaries in the pandatool package. It is not useful
+# for user applications, so it is not installed.
diff --git a/pandatool/src/cvscopy/CMakeLists.txt b/pandatool/src/cvscopy/CMakeLists.txt
index 68b0a30ed1..718db0d7ca 100644
--- a/pandatool/src/cvscopy/CMakeLists.txt
+++ b/pandatool/src/cvscopy/CMakeLists.txt
@@ -1,9 +1,12 @@
 set(P3CVSCOPY_HEADERS
-    cvsCopy.h cvsSourceDirectory.h cvsSourceTree.h)
+  cvsCopy.h cvsSourceDirectory.h cvsSourceTree.h
+)
 
 set(P3CVSCOPY_SOURCES
-    cvsCopy.cxx cvsSourceDirectory.cxx cvsSourceTree.cxx)
+  cvsCopy.cxx cvsSourceDirectory.cxx cvsSourceTree.cxx
+)
 
+composite_sources(p3cvscopy P3CVSCOPY_SOURCES)
 add_library(p3cvscopy STATIC ${P3CVSCOPY_HEADERS} ${P3CVSCOPY_SOURCES})
 target_link_libraries(p3cvscopy p3progbase)
 
diff --git a/pandatool/src/dxf/CMakeLists.txt b/pandatool/src/dxf/CMakeLists.txt
index d190b1bea9..c8095a327f 100644
--- a/pandatool/src/dxf/CMakeLists.txt
+++ b/pandatool/src/dxf/CMakeLists.txt
@@ -1,15 +1,20 @@
 set(P3DXF_HEADERS
-    dxfFile.h
-    dxfLayer.h
-    dxfLayerMap.h
-    dxfVertex.h)
+  dxfFile.h
+  dxfLayer.h
+  dxfLayerMap.h
+  dxfVertex.h
+)
 
 set(P3DXF_SOURCES
-    dxfFile.cxx
-    dxfLayer.cxx
-    dxfLayerMap.cxx
-    dxfVertex.cxx)
+  dxfFile.cxx
+  dxfLayer.cxx
+  dxfLayerMap.cxx
+  dxfVertex.cxx
+)
 
 composite_sources(p3dxf P3DXF_SOURCES)
 add_library(p3dxf STATIC ${P3DXF_HEADERS} ${P3DXF_SOURCES})
 target_link_libraries(p3dxf p3pandatoolbase)
+
+# This is only needed for binaries in the pandatool package. It is not useful
+# for user applications, so it is not installed.
diff --git a/pandatool/src/dxfegg/CMakeLists.txt b/pandatool/src/dxfegg/CMakeLists.txt
index 43f32316df..dd2b994483 100644
--- a/pandatool/src/dxfegg/CMakeLists.txt
+++ b/pandatool/src/dxfegg/CMakeLists.txt
@@ -1,13 +1,15 @@
 set(P3DXFEGG_HEADERS
-    dxfToEggConverter.h
-    dxfToEggLayer.h)
+  dxfToEggConverter.h
+  dxfToEggLayer.h
+)
 
 set(P3DXFEGG_SOURCES
-    dxfToEggConverter.cxx
-    dxfToEggLayer.cxx)
+  dxfToEggConverter.cxx
+  dxfToEggLayer.cxx
+)
 
 add_library(p3dxfegg STATIC ${P3DXFEGG_HEADERS} ${P3DXFEGG_SOURCES})
-target_link_libraries(p3dxfegg p3dxf p3converter)
+target_link_libraries(p3dxfegg p3dxf p3eggbase)
 
 # This is only needed for binaries in the pandatool package. It is not useful
 # for user applications, so it is not installed.
diff --git a/pandatool/src/eggbase/CMakeLists.txt b/pandatool/src/eggbase/CMakeLists.txt
index c3dda64cd3..1abb6a2dd3 100644
--- a/pandatool/src/eggbase/CMakeLists.txt
+++ b/pandatool/src/eggbase/CMakeLists.txt
@@ -1,19 +1,24 @@
 set(P3EGGBASE_HEADERS
-    eggBase.h eggConverter.h eggFilter.h
-    eggMakeSomething.h
-    eggMultiBase.h eggMultiFilter.h
-    eggReader.h eggSingleBase.h
-    eggToSomething.h eggWriter.h
-    somethingToEgg.h)
+  eggBase.h eggConverter.h eggFilter.h
+  eggMakeSomething.h
+  eggMultiBase.h eggMultiFilter.h
+  eggReader.h eggSingleBase.h
+  eggToSomething.h eggWriter.h
+  somethingToEgg.h
+)
 
 set(P3EGGBASE_SOURCES
-    eggBase.cxx eggConverter.cxx eggFilter.cxx
-    eggMakeSomething.cxx
-    eggMultiBase.cxx
-    eggMultiFilter.cxx eggReader.cxx eggSingleBase.cxx
-    eggToSomething.cxx
-    eggWriter.cxx somethingToEgg.cxx)
+  eggBase.cxx eggConverter.cxx eggFilter.cxx
+  eggMakeSomething.cxx
+  eggMultiBase.cxx
+  eggMultiFilter.cxx eggReader.cxx eggSingleBase.cxx
+  eggToSomething.cxx
+  eggWriter.cxx somethingToEgg.cxx
+)
 
 composite_sources(p3eggbase P3EGGBASE_SOURCES)
 add_library(p3eggbase STATIC ${P3EGGBASE_HEADERS} ${P3EGGBASE_SOURCES})
 target_link_libraries(p3eggbase p3progbase p3converter)
+
+# This is only needed for binaries in the pandatool package. It is not useful
+# for user applications, so it is not installed.
diff --git a/pandatool/src/flt/CMakeLists.txt b/pandatool/src/flt/CMakeLists.txt
index 9b7b045c4d..02f096b81b 100644
--- a/pandatool/src/flt/CMakeLists.txt
+++ b/pandatool/src/flt/CMakeLists.txt
@@ -1,85 +1,90 @@
 set(P3FLT_HEADERS
-    config_flt.h
-    fltBead.h
-    fltBeadID.h
-    fltCurve.I fltCurve.h
-    fltError.h
-    fltExternalReference.h
-    fltEyepoint.h
-    fltFace.I fltFace.h
-    fltGeometry.I fltGeometry.h
-    fltGroup.h
-    fltHeader.h
-    fltInstanceDefinition.h
-    fltInstanceRef.h
-    fltLightSourceDefinition.h
-    fltLocalVertexPool.I fltLocalVertexPool.h
-    fltLOD.h
-    fltMaterial.h
-    fltMesh.I fltMesh.h
-    fltMeshPrimitive.I fltMeshPrimitive.h
-    fltObject.h
-    fltOpcode.h
-    fltPackedColor.I fltPackedColor.h
-    fltRecord.I fltRecord.h
-    fltRecordReader.h
-    fltRecordWriter.h
-    fltTexture.h
-    fltTrackplane.h
-    fltTransformGeneralMatrix.h
-    fltTransformPut.h
-    fltTransformRecord.h
-    fltTransformRotateAboutEdge.h
-    fltTransformRotateAboutPoint.h
-    fltTransformRotateScale.h
-    fltTransformScale.h
-    fltTransformTranslate.h
-    fltUnsupportedRecord.h
-    fltVectorRecord.h
-    fltVertex.I fltVertex.h
-    fltVertexList.h)
+  config_flt.h
+  fltBead.h
+  fltBeadID.h
+  fltCurve.h fltCurve.I
+  fltError.h
+  fltExternalReference.h
+  fltEyepoint.h
+  fltFace.h fltFace.I
+  fltGeometry.h fltGeometry.I
+  fltGroup.h
+  fltHeader.h
+  fltInstanceDefinition.h
+  fltInstanceRef.h
+  fltLightSourceDefinition.h
+  fltLocalVertexPool.h fltLocalVertexPool.I
+  fltLOD.h
+  fltMaterial.h
+  fltMesh.h fltMesh.I
+  fltMeshPrimitive.h fltMeshPrimitive.I
+  fltObject.h
+  fltOpcode.h
+  fltPackedColor.h fltPackedColor.I
+  fltRecord.h fltRecord.I
+  fltRecordReader.h
+  fltRecordWriter.h
+  fltTexture.h
+  fltTrackplane.h
+  fltTransformGeneralMatrix.h
+  fltTransformPut.h
+  fltTransformRecord.h
+  fltTransformRotateAboutEdge.h
+  fltTransformRotateAboutPoint.h
+  fltTransformRotateScale.h
+  fltTransformScale.h
+  fltTransformTranslate.h
+  fltUnsupportedRecord.h
+  fltVectorRecord.h
+  fltVertex.h fltVertex.I
+  fltVertexList.h
+)
 
 set(P3FLT_SOURCES
-    config_flt.cxx
-    fltBead.cxx
-    fltBeadID.cxx
-    fltCurve.cxx
-    fltError.cxx
-    fltExternalReference.cxx
-    fltEyepoint.cxx
-    fltFace.cxx
-    fltGeometry.cxx
-    fltGroup.cxx
-    fltHeader.cxx
-    fltInstanceDefinition.cxx
-    fltInstanceRef.cxx
-    fltLightSourceDefinition.cxx
-    fltLocalVertexPool.cxx
-    fltLOD.cxx
-    fltMaterial.cxx
-    fltMesh.cxx
-    fltMeshPrimitive.cxx
-    fltObject.cxx
-    fltOpcode.cxx
-    fltPackedColor.cxx
-    fltRecord.cxx
-    fltRecordReader.cxx
-    fltRecordWriter.cxx
-    fltTexture.cxx
-    fltTrackplane.cxx
-    fltTransformGeneralMatrix.cxx
-    fltTransformPut.cxx
-    fltTransformRecord.cxx
-    fltTransformRotateAboutEdge.cxx
-    fltTransformRotateAboutPoint.cxx
-    fltTransformRotateScale.cxx
-    fltTransformScale.cxx
-    fltTransformTranslate.cxx
-    fltUnsupportedRecord.cxx
-    fltVectorRecord.cxx
-    fltVertex.cxx
-    fltVertexList.cxx)
+  config_flt.cxx
+  fltBead.cxx
+  fltBeadID.cxx
+  fltCurve.cxx
+  fltError.cxx
+  fltExternalReference.cxx
+  fltEyepoint.cxx
+  fltFace.cxx
+  fltGeometry.cxx
+  fltGroup.cxx
+  fltHeader.cxx
+  fltInstanceDefinition.cxx
+  fltInstanceRef.cxx
+  fltLightSourceDefinition.cxx
+  fltLocalVertexPool.cxx
+  fltLOD.cxx
+  fltMaterial.cxx
+  fltMesh.cxx
+  fltMeshPrimitive.cxx
+  fltObject.cxx
+  fltOpcode.cxx
+  fltPackedColor.cxx
+  fltRecord.cxx
+  fltRecordReader.cxx
+  fltRecordWriter.cxx
+  fltTexture.cxx
+  fltTrackplane.cxx
+  fltTransformGeneralMatrix.cxx
+  fltTransformPut.cxx
+  fltTransformRecord.cxx
+  fltTransformRotateAboutEdge.cxx
+  fltTransformRotateAboutPoint.cxx
+  fltTransformRotateScale.cxx
+  fltTransformScale.cxx
+  fltTransformTranslate.cxx
+  fltUnsupportedRecord.cxx
+  fltVectorRecord.cxx
+  fltVertex.cxx
+  fltVertexList.cxx
+)
 
 composite_sources(p3flt P3FLT_SOURCES)
 add_library(p3flt STATIC ${P3FLT_HEADERS} ${P3FLT_SOURCES})
 target_link_libraries(p3flt p3pandatoolbase panda)
+
+# This is only needed for binaries in the pandatool package. It is not useful
+# for user applications, so it is not installed.
diff --git a/pandatool/src/fltegg/CMakeLists.txt b/pandatool/src/fltegg/CMakeLists.txt
index 94101320c0..5072e863f0 100644
--- a/pandatool/src/fltegg/CMakeLists.txt
+++ b/pandatool/src/fltegg/CMakeLists.txt
@@ -1,13 +1,15 @@
 set(P3FLTEGG_HEADERS
-    fltToEggConverter.I fltToEggConverter.h
-    fltToEggLevelState.I fltToEggLevelState.h)
+  fltToEggConverter.h fltToEggConverter.I
+  fltToEggLevelState.h fltToEggLevelState.I
+)
 
 set(P3FLTEGG_SOURCES
-    fltToEggConverter.cxx
-    fltToEggLevelState.cxx)
+  fltToEggConverter.cxx
+  fltToEggLevelState.cxx
+)
 
 add_library(p3fltegg STATIC ${P3FLTEGG_HEADERS} ${P3FLTEGG_SOURCES})
-target_link_libraries(p3fltegg p3flt p3converter)
+target_link_libraries(p3fltegg p3flt p3eggbase)
 
 # This is only needed for binaries in the pandatool package. It is not useful
 # for user applications, so it is not installed.
diff --git a/pandatool/src/gtk-stats/CMakeLists.txt b/pandatool/src/gtk-stats/CMakeLists.txt
index 130ed34b4a..5594f53a5b 100644
--- a/pandatool/src/gtk-stats/CMakeLists.txt
+++ b/pandatool/src/gtk-stats/CMakeLists.txt
@@ -3,26 +3,28 @@ if(NOT HAVE_GTK2 OR NOT HAVE_NET)
 endif()
 
 set(GTKSTATS_HEADERS
-    gtkStatsChartMenu.h
-    gtkStatsGraph.h
-    gtkStatsLabel.h
-    gtkStatsLabelStack.h
-    gtkStatsMenuId.h
-    gtkStatsMonitor.h gtkStatsMonitor.I
-    gtkStatsPianoRoll.h
-    gtkStatsServer.h
-    gtkStatsStripChart.h)
+  gtkStatsChartMenu.h
+  gtkStatsGraph.h
+  gtkStatsLabel.h
+  gtkStatsLabelStack.h
+  gtkStatsMenuId.h
+  gtkStatsMonitor.h gtkStatsMonitor.I
+  gtkStatsPianoRoll.h
+  gtkStatsServer.h
+  gtkStatsStripChart.h
+)
 
 set(GTKSTATS_SOURCES
-    gtkStats.cxx
-    gtkStatsChartMenu.cxx
-    gtkStatsGraph.cxx
-    gtkStatsLabel.cxx
-    gtkStatsLabelStack.cxx
-    gtkStatsMonitor.cxx
-    gtkStatsPianoRoll.cxx
-    gtkStatsServer.cxx
-    gtkStatsStripChart.cxx)
+  gtkStats.cxx
+  gtkStatsChartMenu.cxx
+  gtkStatsGraph.cxx
+  gtkStatsLabel.cxx
+  gtkStatsLabelStack.cxx
+  gtkStatsMonitor.cxx
+  gtkStatsPianoRoll.cxx
+  gtkStatsServer.cxx
+  gtkStatsStripChart.cxx
+)
 
 composite_sources(gtkstats GTKSTATS_SOURCES)
 add_executable(gtkstats ${GTKSTATS_HEADERS} ${GTKSTATS_SOURCES})
diff --git a/pandatool/src/pandatoolbase/CMakeLists.txt b/pandatool/src/pandatoolbase/CMakeLists.txt
index b1c921f3ea..7e615b2d0b 100644
--- a/pandatool/src/pandatoolbase/CMakeLists.txt
+++ b/pandatool/src/pandatoolbase/CMakeLists.txt
@@ -1,18 +1,20 @@
 set(P3PANDATOOLBASE_HEADERS
-    animationConvert.h
-    config_pandatoolbase.h
-    distanceUnit.h
-    pandatoolbase.h pandatoolsymbols.h
-    pathReplace.I pathReplace.h
-    pathStore.h)
+  animationConvert.h
+  config_pandatoolbase.h
+  distanceUnit.h
+  pandatoolbase.h pandatoolsymbols.h
+  pathReplace.h pathReplace.I
+  pathStore.h
+)
 
 set(P3PANDATOOLBASE_SOURCES
-    animationConvert.cxx
-    config_pandatoolbase.cxx
-    distanceUnit.cxx
-    pandatoolbase.cxx
-    pathReplace.cxx
-    pathStore.cxx)
+  animationConvert.cxx
+  config_pandatoolbase.cxx
+  distanceUnit.cxx
+  pandatoolbase.cxx
+  pathReplace.cxx
+  pathStore.cxx
+)
 
 composite_sources(p3pandatoolbase P3PANDATOOLBASE_SOURCES)
 add_library(p3pandatoolbase STATIC ${P3PANDATOOLBASE_HEADERS} ${P3PANDATOOLBASE_SOURCES})
diff --git a/pandatool/src/progbase/CMakeLists.txt b/pandatool/src/progbase/CMakeLists.txt
index 6d037b460d..3b390c12a3 100644
--- a/pandatool/src/progbase/CMakeLists.txt
+++ b/pandatool/src/progbase/CMakeLists.txt
@@ -1,12 +1,14 @@
 set(P3PROGBASE_HEADERS
-    programBase.I programBase.h
-    withOutputFile.I withOutputFile.h
-    wordWrapStream.h wordWrapStreamBuf.I
-    wordWrapStreamBuf.h)
+  programBase.h programBase.I
+  withOutputFile.h withOutputFile.I
+  wordWrapStream.h wordWrapStreamBuf.I
+  wordWrapStreamBuf.h
+)
 
 set(P3PROGBASE_SOURCES
-    programBase.cxx withOutputFile.cxx wordWrapStream.cxx
-    wordWrapStreamBuf.cxx)
+  programBase.cxx withOutputFile.cxx wordWrapStream.cxx
+  wordWrapStreamBuf.cxx
+)
 
 composite_sources(p3progbase P3PROGBASE_SOURCES)
 add_library(p3progbase STATIC ${P3PROGBASE_HEADERS} ${P3PROGBASE_SOURCES})
diff --git a/pandatool/src/pstatserver/CMakeLists.txt b/pandatool/src/pstatserver/CMakeLists.txt
index d133fd0763..359f529b18 100644
--- a/pandatool/src/pstatserver/CMakeLists.txt
+++ b/pandatool/src/pstatserver/CMakeLists.txt
@@ -3,22 +3,27 @@ if(NOT HAVE_NET)
 endif()
 
 set(P3PSTATSERVER_HEADERS
-    pStatClientData.h pStatGraph.I
-    pStatGraph.h pStatListener.h pStatMonitor.I
-    pStatMonitor.h pStatPianoRoll.I
-    pStatPianoRoll.h pStatReader.h
-    pStatServer.h pStatStripChart.I
-    pStatStripChart.h pStatThreadData.I
-    pStatThreadData.h pStatView.I pStatView.h
-    pStatViewLevel.I pStatViewLevel.h)
+  pStatClientData.h
+  pStatGraph.h pStatGraph.I
+  pStatListener.h
+  pStatMonitor.h pStatMonitor.I
+  pStatPianoRoll.h pStatPianoRoll.I
+  pStatReader.h
+  pStatServer.h
+  pStatStripChart.h pStatStripChart.I
+  pStatThreadData.h pStatThreadData.I
+  pStatView.h pStatView.I
+  pStatViewLevel.h pStatViewLevel.I
+)
 
 set(P3PSTATSERVER_SOURCES
-    pStatClientData.cxx pStatGraph.cxx
-    pStatListener.cxx
-    pStatMonitor.cxx pStatPianoRoll.cxx
-    pStatReader.cxx pStatServer.cxx
-    pStatStripChart.cxx pStatThreadData.cxx
-    pStatView.cxx pStatViewLevel.cxx)
+  pStatClientData.cxx pStatGraph.cxx
+  pStatListener.cxx
+  pStatMonitor.cxx pStatPianoRoll.cxx
+  pStatReader.cxx pStatServer.cxx
+  pStatStripChart.cxx pStatThreadData.cxx
+  pStatView.cxx pStatViewLevel.cxx
+)
 
 composite_sources(p3pstatserver P3PSTATSERVER_SOURCES)
 add_library(p3pstatserver STATIC ${P3PSTATSERVER_HEADERS} ${P3PSTATSERVER_SOURCES})