diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp
index 35da0e1b50..3fe763ea36 100644
--- a/dtool/pptempl/Global.pp
+++ b/dtool/pptempl/Global.pp
@@ -283,7 +283,7 @@
 // is.
 #defer active_target $[if $[build_target],$[TARGET]]
 
-#if $[and $[or $[eq $[BUILD_TYPE],msvc], $[and $[eq $[BUILD_TYPE],gmsvc], $[eq $[NUMBER_OF_PROCESSORS],1]]], $[eq $[NO_COMBINED_SOURCES],]]
+#if $[USE_SINGLE_COMPOSITE_SOURCEFILE]
  // for non-composite dirs, want to avoid returning the composite default name
 #defer get_combined_sources $[if $[ne $[COMBINED_SOURCES],], $[TARGET]_composite.cxx,]
 #else
@@ -326,7 +326,7 @@
   $[IF_IPC_SOURCES] \
   $[IF_PYTHON_SOURCES]
 
-#defer included_sources $[INCLUDED_SOURCES] $[if $[HAVE_ZLIB],$[IF_ZLIB_INCLUDED_SOURCES]] $[if $[HAVE_NET],$[IF_NET_INCLUDED_SOURCES]] $[if $[and $[eq $[NUMBER_OF_PROCESSORS],1], $[eq $[NO_COMBINED_SOURCES],]], $[COMBINED_SOURCES]]
+#defer included_sources $[INCLUDED_SOURCES] $[if $[HAVE_ZLIB],$[IF_ZLIB_INCLUDED_SOURCES]] $[if $[HAVE_NET],$[IF_NET_INCLUDED_SOURCES]] $[if $[USE_SINGLE_COMPOSITE_SOURCEFILE], $[COMBINED_SOURCES]]
   
 // This variable returns the set of sources that are to be
 // interrogated for the current target.
diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp
index c308e315a9..ad01907cd4 100644
--- a/dtool/pptempl/Template.gmsvc.pp
+++ b/dtool/pptempl/Template.gmsvc.pp
@@ -174,7 +174,7 @@
 // for single-processor builds, write out *_composite.cxx files that include all composite
 // files into 1 in order to speed the build of our heavily templated source
 #forscopes lib_target bin_target static_lib_target
-#if $[and $[eq $[NUMBER_OF_PROCESSORS],1], $[eq $[NO_COMBINED_SOURCES],], $[ne $[COMBINED_SOURCES],]]
+#if $[and $[<= $[NUMBER_OF_PROCESSORS],2], $[eq $[NO_COMBINED_SOURCES],], $[ne $[COMBINED_SOURCES],]]
 #output $[TARGET]_composite.cxx notouch
 #format collapse
 /* Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. */
@@ -237,7 +237,7 @@ $[TAB] rm -f $[patsubst %.yxx %.lxx,%.cxx,$[yxx_so_sources] $[yxx_st_sources] $[
 #if $[ne $[DEPENDENCY_CACHE_FILENAME],]
 $[TAB] rm -f $[DEPENDENCY_CACHE_FILENAME]
 #endif
-#if $[eq $[NUMBER_OF_PROCESSORS],1]
+#if $[<= $[NUMBER_OF_PROCESSORS],2]
 $[TAB] rm -f *_composite.cxx  // eliminate generated *_composite.cxx files for uniprocessor builds
 #endif