diff --git a/pandaapp/src/stitch/Sources.pp b/pandaapp/src/stitch/Sources.pp
index b563f3a560..371836d302 100644
--- a/pandaapp/src/stitch/Sources.pp
+++ b/pandaapp/src/stitch/Sources.pp
@@ -33,6 +33,8 @@
 #end bin_target
 
 #begin bin_target
+  // Temporarily commented out until we can bring this to new scene graph.
+  #define BUILD_TARGET
   #define TARGET stitch-viewer
   #define LOCAL_LIBS \
     stitchviewer stitchbase
diff --git a/pandaapp/src/stitchbase/Sources.pp b/pandaapp/src/stitchbase/Sources.pp
index 1ecae6ecac..11b9fa0973 100644
--- a/pandaapp/src/stitchbase/Sources.pp
+++ b/pandaapp/src/stitchbase/Sources.pp
@@ -6,7 +6,7 @@
   #define LOCAL_LIBS pandaappbase
   #define OTHER_LIBS \
     progbase \
-    putil:c express:c mathutil:c linmath:c pnmimage:c pnm:c panda:m
+    putil:c express:c mathutil:c linmath:c pnmimage:c panda:m
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandaapp/src/stitchbase/stitchImage.cxx b/pandaapp/src/stitchbase/stitchImage.cxx
index cc3df3a0f7..2d3a27a609 100644
--- a/pandaapp/src/stitchbase/stitchImage.cxx
+++ b/pandaapp/src/stitchbase/stitchImage.cxx
@@ -25,6 +25,8 @@
 #include "rotate_to.h"
 #include "executionEnvironment.h"
 
+#include <stdio.h>  // for sprintf()
+
 StitchImage::
 StitchImage(const string &name, const string &filename,
             StitchLens *lens, const LVecBase2d &size_pixels,
diff --git a/pandaapp/src/stitchbase/stitcher.cxx b/pandaapp/src/stitchbase/stitcher.cxx
index 41e4035b76..521daacc2a 100644
--- a/pandaapp/src/stitchbase/stitcher.cxx
+++ b/pandaapp/src/stitchbase/stitcher.cxx
@@ -20,8 +20,9 @@
 #include "stitchImage.h"
 #include "stitchPoint.h"
 
-#include <rotate_to.h>
-#include <compose_matrix.h>
+#include "rotate_to.h"
+#include "compose_matrix.h"
+#include <algorithm>
 
 
 Stitcher::MatchingPoint::
diff --git a/pandaapp/src/stitchviewer/Sources.pp b/pandaapp/src/stitchviewer/Sources.pp
index 2afc539d6d..249a7f3f70 100644
--- a/pandaapp/src/stitchviewer/Sources.pp
+++ b/pandaapp/src/stitchviewer/Sources.pp
@@ -1,3 +1,7 @@
+// This directory is temporarily commented out until it can be brought
+// into the new scene graph.
+#define BUILD_DIRECTORY
+
 #begin ss_lib_target
   #define TARGET stitchviewer
   #define LOCAL_LIBS stitchbase