diff --git a/pandatool/src/maya/Sources.pp b/pandatool/src/maya/Sources.pp
index d9855c5ab2..c0ee0e04d2 100644
--- a/pandatool/src/maya/Sources.pp
+++ b/pandatool/src/maya/Sources.pp
@@ -8,7 +8,8 @@
   #define OTHER_LIBS \
     putil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m
+    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m \
+    pipeline:c interrogatedb:c
 
   #define SOURCES \
     config_maya.cxx config_maya.h \
diff --git a/pandatool/src/maya/pre_maya_include.h b/pandatool/src/maya/pre_maya_include.h
index 7f7c7be68e..2154aa930d 100644
--- a/pandatool/src/maya/pre_maya_include.h
+++ b/pandatool/src/maya/pre_maya_include.h
@@ -61,5 +61,10 @@ typedef istream maya_istream;
 #define REQUIRE_IOSTREAM
 #endif  // HAVE_IOSTREAM
 
+#ifdef __MACH__
+#undef _BOOL
+#include "maya/OpenMayaMac.h"
+#endif
+
 #endif  // MAYA_PRE_5_0
 
diff --git a/pandatool/src/mayaegg/Sources.pp b/pandatool/src/mayaegg/Sources.pp
index e16615fcef..d1d045ef3b 100644
--- a/pandatool/src/mayaegg/Sources.pp
+++ b/pandatool/src/mayaegg/Sources.pp
@@ -9,7 +9,8 @@
     egg:c pandaegg:m \
     linmath:c putil:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub \
+    pipeline:c interrogatedb:c
 
   #define UNIX_SYS_LIBS \
     m
diff --git a/pandatool/src/mayaprogs/Sources.pp b/pandatool/src/mayaprogs/Sources.pp
index ebfc27780a..a70f8d294b 100644
--- a/pandatool/src/mayaprogs/Sources.pp
+++ b/pandatool/src/mayaprogs/Sources.pp
@@ -50,7 +50,8 @@
     egg:c pandaegg:m \
     linmath:c putil:c panda:m \
     express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub \
+    pipeline:c pnmimage:c
 
   // Irix requires this to be named explicitly.
   #define UNIX_SYS_LIBS \
@@ -70,7 +71,8 @@
     egg:c pandaegg:m \
     linmath:c putil:c panda:m \
     express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub \
+    pipeline:c pnmimage:c
 
   // Irix requires this to be named explicitly.
   #define UNIX_SYS_LIBS \
@@ -91,7 +93,8 @@
     egg:c pandaegg:m \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub \
+    putil:c pipeline:c pnmimage:c
 
   // Irix requires this to be named explicitly.
   #define UNIX_SYS_LIBS \
@@ -113,7 +116,8 @@
     framework:m \
     linmath:c putil:c panda:m \
     express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub \
+    pipeline:c
 
   #define BUILDING_DLL BUILDING_MISC
 
@@ -152,7 +156,8 @@
     framework:m \
     linmath:c putil:c panda:m \
     express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub \
+    pipeline:c
 
   #define BUILDING_DLL BUILDING_MISC
 
@@ -175,7 +180,11 @@
     egg2pg:c egg:c pandaegg:m \
     mathutil:c linmath:c putil:c panda:m \
     express:c pandaexpress:m \
-    dtoolconfig dtool
+    dtoolconfig dtool \
+    event:c gobj:c chan:c pgraph:c parametrics:c char:c prc:c dtoolutil:c \
+    interrogatedb:c dtoolbase:c collide:c pnmimage:c dgraph:c tform:c \
+    pipeline:c pstatclient:c grutil:c gsgbase:c net:c lerp:c display:c \
+    cull:c text:c nativenet:c pnmtext:c
 
   #define SOURCES \
     config_mayaloader.cxx
diff --git a/pandatool/src/mayaprogs/config_mayaloader.cxx b/pandatool/src/mayaprogs/config_mayaloader.cxx
index 2df2a93f08..d0760433e4 100644
--- a/pandatool/src/mayaprogs/config_mayaloader.cxx
+++ b/pandatool/src/mayaprogs/config_mayaloader.cxx
@@ -16,6 +16,10 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef __MACH__
+#define __OPENTRANSPORTPROVIDERS__
+#endif
+
 #include "pandatoolbase.h"
 #include "loaderFileTypePandatool.h"
 #include "config_mayaegg.h"
diff --git a/pandatool/src/mayaprogs/mayaPview.cxx b/pandatool/src/mayaprogs/mayaPview.cxx
index 057912d1d3..50b5f76a2b 100755
--- a/pandatool/src/mayaprogs/mayaPview.cxx
+++ b/pandatool/src/mayaprogs/mayaPview.cxx
@@ -16,6 +16,10 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef __MACH__
+#define __OPENTRANSPORTPROVIDERS__
+#endif
+
 #include "mayaPview.h"
 #include "mayaToEggConverter.h"
 #include "eggData.h"
diff --git a/pandatool/src/mayaprogs/mayaSavePview.h b/pandatool/src/mayaprogs/mayaSavePview.h
index 0021b3ee89..a35f04c69e 100644
--- a/pandatool/src/mayaprogs/mayaSavePview.h
+++ b/pandatool/src/mayaprogs/mayaSavePview.h
@@ -29,6 +29,11 @@
 #define _BOOL 1
 #endif
 
+#ifdef __MACH__
+#undef _BOOL
+#include "maya/OpenMayaMac.h"
+#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.