diff --git a/direct/src/dcparser/CMakeLists.txt b/direct/src/dcparser/CMakeLists.txt
index 36ef2541e0..cfb105bfcf 100644
--- a/direct/src/dcparser/CMakeLists.txt
+++ b/direct/src/dcparser/CMakeLists.txt
@@ -46,10 +46,10 @@ set(P3DCPARSER_PARSER_SOURCES
     dcLexer.cxx)
 
 composite_sources(p3dcparser P3DCPARSER_SOURCES)
-add_library(p3dcparser ${P3DCPARSER_SOURCES} ${P3DCPARSER_HEADERS}
+add_library(p3dcparser ${P3DCPARSER_HEADERS} ${P3DCPARSER_SOURCES}
   ${P3DCPARSER_PARSER_SOURCES})
 set_target_properties(p3dcparser PROPERTIES COMPILE_DEFINITIONS WITHIN_PANDA)
 target_link_libraries(p3dcparser p3directbase p3express p3pstatclient p3prc)
-target_interrogate(p3dcparser ${P3DCPARSER_SOURCES} ${P3DCPARSER_HEADERS})
+target_interrogate(p3dcparser ${P3DCPARSER_HEADERS} ${P3DCPARSER_SOURCES})
 
 install(TARGETS p3dcparser DESTINATION lib)
diff --git a/direct/src/directbase/CMakeLists.txt b/direct/src/directbase/CMakeLists.txt
index 3e1d332ab5..d8722cb41d 100644
--- a/direct/src/directbase/CMakeLists.txt
+++ b/direct/src/directbase/CMakeLists.txt
@@ -7,7 +7,7 @@ set(P3DIRECTBASE_HEADERS
 )
 
 # Not worth compositing sources, there's really only one.
-add_library(p3directbase ${P3DIRECTBASE_SOURCES} ${P3DIRECTBASE_HEADERS})
+add_library(p3directbase ${P3DIRECTBASE_HEADERS} ${P3DIRECTBASE_SOURCES})
 target_link_libraries(p3directbase p3pandabase)
 
 install(TARGETS p3directbase DESTINATION lib)
diff --git a/panda/src/cocoadisplay/CMakeLists.txt b/panda/src/cocoadisplay/CMakeLists.txt
index d8fb78d894..82c5539d72 100644
--- a/panda/src/cocoadisplay/CMakeLists.txt
+++ b/panda/src/cocoadisplay/CMakeLists.txt
@@ -16,7 +16,7 @@ if(APPLE AND HAVE_GL AND HAVE_COCOA)
       cocoaPandaWindowDelegate.mm)
 
   #composite_sources(p3cocoadisplay P3COCOADISPLAY_SOURCES)
-  add_library(p3cocoadisplay ${P3COCOADISPLAY_SOURCES} ${P3COCOADISPLAY_HEADERS})
+  add_library(p3cocoadisplay ${P3COCOADISPLAY_HEADERS} ${P3COCOADISPLAY_SOURCES})
   target_link_libraries(p3cocoadisplay p3display p3putil p3glgsg)
 
   # Frameworks:
diff --git a/panda/src/collide/CMakeLists.txt b/panda/src/collide/CMakeLists.txt
index dd3994ff9b..5ba2b5cae7 100644
--- a/panda/src/collide/CMakeLists.txt
+++ b/panda/src/collide/CMakeLists.txt
@@ -63,7 +63,7 @@ set(P3COLLIDE_SOURCES
 )
 
 composite_sources(p3collide P3COLLIDE_SOURCES)
-add_library(p3collide ${P3COLLIDE_SOURCES} ${P3COLLIDE_HEADERS})
+add_library(p3collide ${P3COLLIDE_HEADERS} ${P3COLLIDE_SOURCES})
 target_link_libraries(p3collide p3tform)
 target_interrogate(p3collide ALL)
 
diff --git a/panda/src/device/CMakeLists.txt b/panda/src/device/CMakeLists.txt
index 16dc4b9164..91e7dfbee1 100644
--- a/panda/src/device/CMakeLists.txt
+++ b/panda/src/device/CMakeLists.txt
@@ -27,7 +27,7 @@ set(P3DEVICE_SOURCES
 )
 
 composite_sources(p3device P3DEVICE_SOURCES)
-add_library(p3device ${P3DEVICE_SOURCES} ${P3DEVICE_HEADERS})
+add_library(p3device ${P3DEVICE_HEADERS} ${P3DEVICE_SOURCES})
 target_link_libraries(p3device p3dgraph p3display)
 target_interrogate(p3device ALL)
 
diff --git a/panda/src/dgraph/CMakeLists.txt b/panda/src/dgraph/CMakeLists.txt
index c085c0e8e1..592d34acff 100644
--- a/panda/src/dgraph/CMakeLists.txt
+++ b/panda/src/dgraph/CMakeLists.txt
@@ -12,7 +12,7 @@ set(P3DGRAPH_SOURCES
 )
 
 composite_sources(p3dgraph P3DGRAPH_SOURCES)
-add_library(p3dgraph ${P3DGRAPH_SOURCES} ${P3DGRAPH_HEADERS})
+add_library(p3dgraph ${P3DGRAPH_HEADERS} ${P3DGRAPH_SOURCES})
 target_link_libraries(p3dgraph p3pgraph)
 target_interrogate(p3dgraph ALL)
 
diff --git a/panda/src/downloader/CMakeLists.txt b/panda/src/downloader/CMakeLists.txt
index cc4c747f92..5095ee9323 100644
--- a/panda/src/downloader/CMakeLists.txt
+++ b/panda/src/downloader/CMakeLists.txt
@@ -63,7 +63,7 @@ set(P3DOWNLOADER_SOURCES
 )
 
 composite_sources(p3downloader P3DOWNLOADER_SOURCES)
-add_library(p3downloader ${P3DOWNLOADER_SOURCES} ${P3DOWNLOADER_HEADERS})
+add_library(p3downloader ${P3DOWNLOADER_HEADERS} ${P3DOWNLOADER_SOURCES})
 target_link_libraries(p3downloader p3express)
 target_interrogate(p3downloader ALL)
 
diff --git a/panda/src/express/CMakeLists.txt b/panda/src/express/CMakeLists.txt
index dc6ec21b51..db3b0a3696 100644
--- a/panda/src/express/CMakeLists.txt
+++ b/panda/src/express/CMakeLists.txt
@@ -133,7 +133,7 @@ set(P3EXPRESS_IGATEEXT
 
 composite_sources(p3express P3EXPRESS_SOURCES)
 
-add_library(p3express ${P3EXPRESS_SOURCES} ${P3EXPRESS_HEADERS} ${P3EXPRESS_IGATEEXT})
+add_library(p3express ${P3EXPRESS_HEADERS} ${P3EXPRESS_SOURCES} ${P3EXPRESS_IGATEEXT})
 target_link_libraries(p3express p3pandabase p3dtool p3dtoolconfig
   ${_TAR_LIBRARY} ${_ZLIB_LIBRARY})
 target_interrogate(p3express ALL)
diff --git a/panda/src/grutil/CMakeLists.txt b/panda/src/grutil/CMakeLists.txt
index cb9bfa75d8..d65d9cc349 100644
--- a/panda/src/grutil/CMakeLists.txt
+++ b/panda/src/grutil/CMakeLists.txt
@@ -36,7 +36,7 @@ set(P3GRUTIL_SOURCES
 )
 
 composite_sources(p3grutil P3GRUTIL_SOURCES)
-add_library(p3grutil ${P3GRUTIL_SOURCES} ${P3GRUTIL_HEADERS})
+add_library(p3grutil ${P3GRUTIL_HEADERS} ${P3GRUTIL_SOURCES})
 target_link_libraries(p3grutil p3display p3text p3movies)
 if(HAVE_AUDIO)
   target_link_libraries(p3grutil p3audio)
diff --git a/panda/src/ode/CMakeLists.txt b/panda/src/ode/CMakeLists.txt
index 5405857def..da1c5df4e7 100755
--- a/panda/src/ode/CMakeLists.txt
+++ b/panda/src/ode/CMakeLists.txt
@@ -81,7 +81,7 @@ if(HAVE_ODE)
   list(REMOVE_ITEM P3ODE_IGATE_SOURCES "odeHelperStructs.h")
 
   composite_sources(p3ode P3ODE_SOURCES)
-  add_library(p3ode ${P3ODE_SOURCES} ${P3ODE_HEADERS} ${P3ODE_IGATEEXT})
+  add_library(p3ode ${P3ODE_HEADERS} ${P3ODE_SOURCES} ${P3ODE_IGATEEXT})
   set_target_properties(p3ode PROPERTIES COMPILE_DEFINITIONS dSINGLE)
   target_link_libraries(p3ode p3pgraph p3physics ${ODE_LIBRARY})
   target_interrogate(p3ode ${P3ODE_IGATE_SOURCES} ${P3ODE_IGATEEXT})
diff --git a/panda/src/osxdisplay/CMakeLists.txt b/panda/src/osxdisplay/CMakeLists.txt
index 2a16f6c3ce..8727804cdd 100644
--- a/panda/src/osxdisplay/CMakeLists.txt
+++ b/panda/src/osxdisplay/CMakeLists.txt
@@ -10,7 +10,7 @@ if(APPLE AND HAVE_GL AND HAVE_CARBON)
       osxGraphicsBuffer.cxx)
 
   composite_sources(p3osxdisplay P3OSXDISPLAY_SOURCES)
-  add_library(p3osxdisplay ${P3OSXDISPLAY_SOURCES} ${P3OSXDISPLAY_HEADERS})
+  add_library(p3osxdisplay ${P3OSXDISPLAY_HEADERS} ${P3OSXDISPLAY_SOURCES})
   target_link_libraries(p3osxdisplay p3display p3putil p3glgsg)
 
   # Frameworks:
diff --git a/panda/src/parametrics/CMakeLists.txt b/panda/src/parametrics/CMakeLists.txt
index 1a61873e96..ed92d61f8c 100644
--- a/panda/src/parametrics/CMakeLists.txt
+++ b/panda/src/parametrics/CMakeLists.txt
@@ -34,7 +34,7 @@ set(P3PARAMETRICS_SOURCES
 )
 
 composite_sources(p3parametrics P3PARAMETRICS_SOURCES)
-add_library(p3parametrics ${P3PARAMETRICS_SOURCES} ${P3PARAMETRICS_HEADERS})
+add_library(p3parametrics ${P3PARAMETRICS_HEADERS} ${P3PARAMETRICS_SOURCES})
 target_link_libraries(p3parametrics p3pgraph)
 target_interrogate(p3parametrics ALL)
 
diff --git a/panda/src/pgui/CMakeLists.txt b/panda/src/pgui/CMakeLists.txt
index 15bbfdb736..19b83ad110 100644
--- a/panda/src/pgui/CMakeLists.txt
+++ b/panda/src/pgui/CMakeLists.txt
@@ -40,7 +40,7 @@ set(P3PGUI_SOURCES
 )
 
 composite_sources(p3pgui P3PGUI_SOURCES)
-add_library(p3pgui ${P3PGUI_SOURCES} ${P3PGUI_HEADERS})
+add_library(p3pgui ${P3PGUI_HEADERS} ${P3PGUI_SOURCES})
 target_link_libraries(p3pgui p3tform)
 target_interrogate(p3pgui ALL)
 
diff --git a/panda/src/pnmtext/CMakeLists.txt b/panda/src/pnmtext/CMakeLists.txt
index 1ad94e17ee..86764755d2 100644
--- a/panda/src/pnmtext/CMakeLists.txt
+++ b/panda/src/pnmtext/CMakeLists.txt
@@ -15,7 +15,7 @@ if(HAVE_FREETYPE)
   )
 
   composite_sources(p3pnmtext P3PNMTEXT_SOURCES)
-  add_library(p3pnmtext ${P3PNMTEXT_SOURCES} ${P3PNMTEXT_HEADERS})
+  add_library(p3pnmtext ${P3PNMTEXT_HEADERS} ${P3PNMTEXT_SOURCES})
   target_link_libraries(p3pnmtext p3pnmimage ${_FREETYPE_LIBRARIES})
   target_interrogate(p3pnmtext ALL)
 
diff --git a/panda/src/recorder/CMakeLists.txt b/panda/src/recorder/CMakeLists.txt
index 8590e3ab83..b7b982136b 100644
--- a/panda/src/recorder/CMakeLists.txt
+++ b/panda/src/recorder/CMakeLists.txt
@@ -17,7 +17,7 @@ set(P3RECORDER_SOURCES
 )
 
 composite_sources(p3recorder P3RECORDER_SOURCES)
-add_library(p3recorder ${P3RECORDER_SOURCES} ${P3RECORDER_HEADERS})
+add_library(p3recorder ${P3RECORDER_HEADERS} ${P3RECORDER_SOURCES})
 target_link_libraries(p3recorder p3dgraph p3downloader)
 target_interrogate(p3recorder ALL)
 
diff --git a/panda/src/text/CMakeLists.txt b/panda/src/text/CMakeLists.txt
index 82b9030695..4feb48af74 100644
--- a/panda/src/text/CMakeLists.txt
+++ b/panda/src/text/CMakeLists.txt
@@ -33,7 +33,7 @@ set(P3TEXT_SOURCES
 )
 
 composite_sources(p3text P3TEXT_SOURCES)
-add_library(p3text ${P3TEXT_SOURCES} ${P3TEXT_HEADERS})
+add_library(p3text ${P3TEXT_HEADERS} ${P3TEXT_SOURCES})
 target_link_libraries(p3text p3parametrics)
 if(HAVE_FREETYPE)
   target_link_libraries(p3text p3pnmtext ${_FREETYPE_LIBRARIES})
diff --git a/panda/src/tform/CMakeLists.txt b/panda/src/tform/CMakeLists.txt
index abc730148b..a814cb415c 100644
--- a/panda/src/tform/CMakeLists.txt
+++ b/panda/src/tform/CMakeLists.txt
@@ -25,7 +25,7 @@ set(P3TFORM_SOURCES
 )
 
 composite_sources(p3tform P3TFORM_SOURCES)
-add_library(p3tform ${P3TFORM_SOURCES} ${P3TFORM_HEADERS})
+add_library(p3tform ${P3TFORM_HEADERS} ${P3TFORM_SOURCES})
 target_link_libraries(p3tform p3device p3grutil)
 target_interrogate(p3tform ALL)