diff --git a/direct/src/plugin/Sources.pp b/direct/src/plugin/Sources.pp
index d9f01479bd..b71be6273d 100644
--- a/direct/src/plugin/Sources.pp
+++ b/direct/src/plugin/Sources.pp
@@ -143,6 +143,8 @@
     dtoolutil:c dtoolbase:c dtool:m \
     interrogatedb:c dconfig:c dtoolconfig:m \
     express:c pandaexpress:m \
+    pgraph:c pgraphnodes:c cull:c gsgbase:c gobj:c \
+    mathutil:c lerp:c downloader:c pnmimage:c \
     prc:c pstatclient:c pandabase:c linmath:c putil:c \
     pipeline:c event:c nativenet:c net:c display:c panda:m
 
@@ -165,6 +167,13 @@
   #define EXTRA_LIBS $[EXTRA_P3DPYTHON_LIBS]
   #define OSX_SYS_FRAMEWORKS Carbon
 
+  #if $[OSX_PLATFORM]
+    // Not entirely sure why this option is required for OSX, but we
+    // get objections about ___dso_handle otherwise--but only when
+    // building universal binaries.
+    #define LFLAGS $[LFLAGS] -undefined dynamic_lookup
+  #endif
+
   #define WIN_SYS_LIBS user32.lib
 #end bin_target
 
@@ -190,6 +199,11 @@
 
   #define SOURCES p3dCert.cxx
   #define OSX_SYS_FRAMEWORKS Carbon
+
+  #if $[OSX_PLATFORM]
+    // Squelch objections about ___dso_handle.
+    #define LFLAGS $[LFLAGS] -undefined dynamic_lookup
+  #endif
 #end bin_target
 
 
diff --git a/direct/src/plugin_standalone/Sources.pp b/direct/src/plugin_standalone/Sources.pp
index af17f234d6..e2673d12c3 100644
--- a/direct/src/plugin_standalone/Sources.pp
+++ b/direct/src/plugin_standalone/Sources.pp
@@ -20,5 +20,9 @@
     panda3d.cxx panda3d.h panda3d.I
 
   #define WIN_SYS_LIBS user32.lib gdi32.lib shell32.lib ole32.lib
+  #if $[OSX_PLATFORM]
+    // Squelch objections about ___dso_handle.
+    #define LFLAGS $[LFLAGS] -undefined dynamic_lookup
+  #endif
 
 #end bin_target