diff --git a/wxPython/src/msw/gdi.cpp b/wxPython/src/msw/gdi.cpp
index 785772d1ed..d1570e664e 100644
--- a/wxPython/src/msw/gdi.cpp
+++ b/wxPython/src/msw/gdi.cpp
@@ -62,9 +62,6 @@ extern PyObject *SWIG_newvarlink(void);
 #include <wx/fontutil.h>
 #include <wx/dcbuffer.h>
 #include <wx/iconbndl.h>
-#ifdef __WXMAC__
-#include <wx/mac/private.h>
-#endif
 
 
 static PyObject* t_output_helper(PyObject* target, PyObject* o) {
diff --git a/wxPython/src/msw/html.cpp b/wxPython/src/msw/html.cpp
index 27b9c8e6f9..5859813940 100644
--- a/wxPython/src/msw/html.cpp
+++ b/wxPython/src/msw/html.cpp
@@ -1473,7 +1473,6 @@ static PyObject *_wrap_wxHtmlWinParser_GetWindow(PyObject *self, PyObject *args,
     wxHtmlWinParser * _arg0;
     PyObject * _argo0 = 0;
     char *_kwnames[] = { "self", NULL };
-    char _ptemp[128];
 
     self = self;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlWinParser_GetWindow",_kwnames,&_argo0)) 
@@ -1491,13 +1490,7 @@ static PyObject *_wrap_wxHtmlWinParser_GetWindow(PyObject *self, PyObject *args,
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
-}    if (_result) {
-        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyHtmlWindow_p");
-        _resultobj = Py_BuildValue("s",_ptemp);
-    } else {
-        Py_INCREF(Py_None);
-        _resultobj = Py_None;
-    }
+}{ _resultobj = wxPyMake_wxObject(_result); }
     return _resultobj;
 }
 
diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py
index 6fc232d903..bee666b5fa 100644
--- a/wxPython/src/msw/html.py
+++ b/wxPython/src/msw/html.py
@@ -177,7 +177,6 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
         return val
     def GetWindow(self, *_args, **_kwargs):
         val = htmlc.wxHtmlWinParser_GetWindow(self, *_args, **_kwargs)
-        if val: val = wxHtmlWindowPtr(val) 
         return val
     def SetFonts(self, *_args, **_kwargs):
         val = htmlc.wxHtmlWinParser_SetFonts(self, *_args, **_kwargs)