diff --git a/panda/src/display/nativeWindowHandle.h b/panda/src/display/nativeWindowHandle.h
index b2bf25ae7d..4162d9a139 100644
--- a/panda/src/display/nativeWindowHandle.h
+++ b/panda/src/display/nativeWindowHandle.h
@@ -60,7 +60,7 @@ public:
 #endif  // WIN32
   
 public:
-  class IntHandle : public OSHandle {
+  class EXPCL_PANDA_DISPLAY IntHandle : public OSHandle {
   public:
     INLINE IntHandle(size_t handle);
     virtual size_t get_int_handle() const;
@@ -89,7 +89,7 @@ public:
     static TypeHandle _type_handle;
   };
 
-  class SubprocessHandle : public OSHandle {
+  class EXPCL_PANDA_DISPLAY SubprocessHandle : public OSHandle {
   public:
     INLINE SubprocessHandle(const Filename &filename);
     virtual void output(ostream &out) const;
@@ -118,7 +118,7 @@ public:
   };
 
 #if defined(HAVE_X11) && !defined(CPPPARSER)
-  class X11Handle : public OSHandle {
+  class EXPCL_PANDA_DISPLAY X11Handle : public OSHandle {
   public:
     INLINE X11Handle(Window handle);
     virtual size_t get_int_handle() const;
diff --git a/panda/src/windisplay/config_windisplay.cxx b/panda/src/windisplay/config_windisplay.cxx
index 1c21aafa76..852aecfce1 100644
--- a/panda/src/windisplay/config_windisplay.cxx
+++ b/panda/src/windisplay/config_windisplay.cxx
@@ -77,6 +77,5 @@ init_libwindisplay() {
   initialized = true;
 
   WinGraphicsPipe::init_type();
-  WinGraphicsPipe::WinHandle::init_type();
   WinGraphicsWindow::init_type();
 }
diff --git a/panda/src/windisplay/winGraphicsPipe.cxx b/panda/src/windisplay/winGraphicsPipe.cxx
index 5a486897a9..5bdbf0ab1a 100644
--- a/panda/src/windisplay/winGraphicsPipe.cxx
+++ b/panda/src/windisplay/winGraphicsPipe.cxx
@@ -27,7 +27,6 @@
 
 
 TypeHandle WinGraphicsPipe::_type_handle;
-TypeHandle WinGraphicsPipe::WinHandle::_type_handle;
 
 #define MAXIMUM_PROCESSORS 32
 
diff --git a/panda/src/windisplay/winGraphicsWindow.cxx b/panda/src/windisplay/winGraphicsWindow.cxx
index 7662017a8c..f74be43b39 100644
--- a/panda/src/windisplay/winGraphicsWindow.cxx
+++ b/panda/src/windisplay/winGraphicsWindow.cxx
@@ -880,10 +880,10 @@ open_regular_window() {
         << "os_handle type " << os_handle->get_type() << "\n";
       
       if (os_handle->is_of_type(NativeWindowHandle::WinHandle::get_class_type())) {
-        WinGraphicsPipe::WinHandle *win_handle = DCAST(NativeWindowHandle::WinHandle, os_handle);
+        NativeWindowHandle::WinHandle *win_handle = DCAST(NativeWindowHandle::WinHandle, os_handle);
         _hparent = win_handle->get_handle();
         } else if (os_handle->is_of_type(NativeWindowHandle::IntHandle::get_class_type())) {
-        WindowHandle::IntHandle *int_handle = DCAST(NativeWindowHandle::IntHandle, os_handle);
+        NativeWindowHandle::IntHandle *int_handle = DCAST(NativeWindowHandle::IntHandle, os_handle);
         _hparent = (HWND)int_handle->get_handle();
       }
     }