diff --git a/panda/metalibs/pandagl/Sources.pp b/panda/metalibs/pandagl/Sources.pp
index 919b4ceae1..d73d7c3d55 100644
--- a/panda/metalibs/pandagl/Sources.pp
+++ b/panda/metalibs/pandagl/Sources.pp
@@ -10,7 +10,7 @@
 #define BUILDING_DLL BUILDING_PANDAGL
 
 #define COMPONENT_LIBS \
-    glgsg glxdisplay // sgiglxdisplay
+    glgsg glxdisplay wgldisplay // sgiglxdisplay
 #define LOCAL_LIBS gsgbase display express
 #define OTHER_LIBS dtool
 
diff --git a/panda/src/framework/config_framework.h b/panda/src/framework/config_framework.h
index de10c5f272..8e95048d70 100644
--- a/panda/src/framework/config_framework.h
+++ b/panda/src/framework/config_framework.h
@@ -10,10 +10,10 @@
 #include <notifyCategoryProxy.h>
 #include <collideMask.h>
 
-NotifyCategoryDecl(framework, EXPCL_FRAMEWORK, EXPTP_FRAMEWORK);
+NotifyCategoryDecl(framework, EXPCL_EMPTY, EXPCL_EMPTY);
 
 // Configure variables for framework package.
-extern const double EXPCL_FRAMEWORK drive_height;
-extern const CollideMask EXPCL_FRAMEWORK drive_mask;
+extern const double drive_height;
+extern const CollideMask drive_mask;
 
 #endif
diff --git a/panda/src/framework/framework.h b/panda/src/framework/framework.h
index f35a3353bf..1658010c8c 100644
--- a/panda/src/framework/framework.h
+++ b/panda/src/framework/framework.h
@@ -20,25 +20,24 @@
 #include <mouseWatcher.h>
 #include <chancfg.h>
 
-EXPCL_FRAMEWORK extern EventHandler event_handler;
-EXPCL_FRAMEWORK extern PT_NamedNode lights;
-EXPCL_FRAMEWORK extern PT_NamedNode root;
-EXPCL_FRAMEWORK extern PT_NamedNode data_root;
-EXPCL_FRAMEWORK extern PT_NamedNode render;
-EXPCL_FRAMEWORK extern PT_NamedNode cameras;
-EXPCL_FRAMEWORK extern PT(MouseAndKeyboard) mak;
-EXPCL_FRAMEWORK extern PT(MouseWatcher) mouse_watcher;
-EXPCL_FRAMEWORK extern PT(Trackball) trackball;
-EXPCL_FRAMEWORK extern PT(GraphicsWindow) main_win;
-EXPCL_FRAMEWORK extern PT(DirectionalLight) dlight;
-EXPCL_FRAMEWORK extern bool have_dlight;
-EXPCL_FRAMEWORK extern Loader loader;
+extern EventHandler event_handler;
+extern PT_NamedNode lights;
+extern PT_NamedNode root;
+extern PT_NamedNode data_root;
+extern PT_NamedNode render;
+extern PT_NamedNode cameras;
+extern PT(MouseAndKeyboard) mak;
+extern PT(MouseWatcher) mouse_watcher;
+extern PT(Trackball) trackball;
+extern PT(GraphicsWindow) main_win;
+extern PT(DirectionalLight) dlight;
+extern bool have_dlight;
+extern Loader loader;
 
-EXPCL_FRAMEWORK extern void set_alt_trackball(Node*);
-EXPCL_FRAMEWORK extern int framework_main(int argc, char *argv[]);
-EXPCL_FRAMEWORK extern void (*define_keys)(EventHandler&);
-EXPCL_FRAMEWORK extern void (*additional_idle)();
-EXPCL_FRAMEWORK extern void (*extra_overrides_func)(ChanCfgOverrides&,
-						    std::string&);
+extern void set_alt_trackball(Node*);
+extern int framework_main(int argc, char *argv[]);
+extern void (*define_keys)(EventHandler&);
+extern void (*additional_idle)();
+extern void (*extra_overrides_func)(ChanCfgOverrides&, std::string&);
 
 #endif
diff --git a/panda/src/pandabase/pandasymbols.h b/panda/src/pandabase/pandasymbols.h
index 4012b70790..2bbd177c70 100644
--- a/panda/src/pandabase/pandasymbols.h
+++ b/panda/src/pandabase/pandasymbols.h
@@ -84,14 +84,6 @@
   #define EXPTP_SHADER extern
 #endif
 
-#ifdef BUILDING_FRAMEWORK
-  #define EXPCL_FRAMEWORK __declspec(dllexport)
-  #define EXPTP_FRAMEWORK
-#else
-  #define EXPCL_FRAMEWORK __declspec(dllimport)
-  #define EXPTP_FRAMEWORK extern
-#endif
-
 /* These are temporarily here until we move them to their proper homes. */
 #ifdef BUILDING_DIRECT
   #define EXPCL_DIRECT __declspec(dllexport)
diff --git a/panda/src/testbed/Configrc b/panda/src/testbed/Configrc
deleted file mode 100644
index 1a36e6dd2f..0000000000
--- a/panda/src/testbed/Configrc
+++ /dev/null
@@ -1,2 +0,0 @@
-load-display glgsg
-load-display glxdisplay