diff --git a/pandatool/src/mayaprogs/Sources.pp b/pandatool/src/mayaprogs/Sources.pp
index 9c4b306f33..dd9cd6d5f0 100644
--- a/pandatool/src/mayaprogs/Sources.pp
+++ b/pandatool/src/mayaprogs/Sources.pp
@@ -104,10 +104,6 @@
   #define USE_PACKAGES maya
   #define TARGET mayasavepview
 
-  // Since mayasavepview doesn't include pandatoolbase.h, we have to
-  // pass in HAVE_IOSTREAM on the command line.
-  #define EXTRA_CDEFS $[EXTRA_CDEFS] $[if $[HAVE_IOSTREAM],HAVE_IOSTREAM]
-
   #if $[WINDOWS_PLATFORM]
     #define dlllib mll
   #endif
diff --git a/pandatool/src/mayaprogs/mayaSavePview.h b/pandatool/src/mayaprogs/mayaSavePview.h
index a5f98be498..60500b58e2 100644
--- a/pandatool/src/mayaprogs/mayaSavePview.h
+++ b/pandatool/src/mayaprogs/mayaSavePview.h
@@ -29,6 +29,11 @@
 #define _BOOL 1
 #endif
 
+// Even though we don't include any Panda headers, it's safe to
+// include this one, since it only defines some macros that we need to
+// make this program platform-independent.
+#include "dtool_config.h"
+
 #ifdef HAVE_IOSTREAM
 // This will ask Maya 5.0 or better to use the new <iostream> library
 // instead of the old <iostream.h> library.
@@ -39,12 +44,6 @@
 #include <maya/MPxCommand.h>
 #include <maya/MObject.h>
 
-// Even though we don't include any Panda headers, it's safe to
-// include this one, since it only defines some macros that we need to
-// make this program platform-independent.
-#include "dtool_config.h"
-
-
 ////////////////////////////////////////////////////////////////////
 //       Class : MayaSavePview
 // Description : This class serves as a plug-in to Maya to save the