diff --git a/dtool/pptempl/Depends.pp b/dtool/pptempl/Depends.pp
index c6ce80a900..5dd886f69f 100644
--- a/dtool/pptempl/Depends.pp
+++ b/dtool/pptempl/Depends.pp
@@ -87,7 +87,7 @@
       #push 1 $[file]_obj
     #end file
 
-    #if $[and $[not $[DONT_COMBINE]],$[or $[USE_SINGLE_COMPOSITE_SOURCEFILE],$[and $[USE_TAU],$[WINDOWS_PLATFORM]]]]
+    #if $[and $[not $[DONT_COMBINE]],$[or $[USE_SINGLE_COMPOSITE_SOURCEFILE],$[USE_TAU]]]
       #if $[> $[words $[cxx_sources]], 1]
         // If we have multiple C++ files, put them together into one
         // composite file.
diff --git a/dtool/pptempl/Template.unix.pp b/dtool/pptempl/Template.unix.pp
index f9eaa1914a..48cd4a243c 100644
--- a/dtool/pptempl/Template.unix.pp
+++ b/dtool/pptempl/Template.unix.pp
@@ -166,7 +166,14 @@
 /* ################################# DO NOT EDIT ########################### */
 
 #foreach file $[$[composite_file]_sources]
+#if $[USE_TAU]
+// For the benefit of Tau, we copy the source file verbatim into the
+// composite file.  (Tau doesn't instrument files picked up via #include.)
+#copy $[DIRPREFIX]$[file]
+
+#else
 ##include "$[file]"
+#endif  // USE_TAU
 #end file
 
 #end $[composite_file]
diff --git a/dtool/src/dconfig/dconfig.cxx b/dtool/src/dconfig/dconfig.cxx
index 83bc3218b1..cf6e7fcb01 100644
--- a/dtool/src/dconfig/dconfig.cxx
+++ b/dtool/src/dconfig/dconfig.cxx
@@ -18,11 +18,7 @@
 
 #include "dconfig.h"
 
-namespace Config {
-
-  clock_t total_time_config_init = 0;
-  clock_t total_time_external_init = 0;
-  int total_num_get = 0;
-
-}
+clock_t Config::total_time_config_init = 0;
+clock_t Config::total_time_external_init = 0;
+int Config::total_num_get = 0;
 
diff --git a/panda/src/pgraph/Sources.pp b/panda/src/pgraph/Sources.pp
index 00a8732bb7..3dbb37bb19 100644
--- a/panda/src/pgraph/Sources.pp
+++ b/panda/src/pgraph/Sources.pp
@@ -7,8 +7,9 @@
 #begin lib_target
   #define TARGET pgraph
 
-  // This directory is too big to combine into a single composite file.
-  #define DONT_COMBINE 1
+  // This directory is too big to combine into a single composite
+  // file--at least on Windows.
+  #define DONT_COMBINE $[WINDOWS_PLATFORM]
 
   #define SOURCES \
     accumulatedAttribs.I accumulatedAttribs.h \