diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas.cpp b/wxPython/contrib/glcanvas/gtk/glcanvas.cpp
index b0410dfdb5..9131be07ce 100644
--- a/wxPython/contrib/glcanvas/gtk/glcanvas.cpp
+++ b/wxPython/contrib/glcanvas/gtk/glcanvas.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "glcanvasc"
 
-#include "export.h"
+#include "wxPython.h"
 #ifdef __WXMSW__
 #include "myglcanvas.h"
 #else
diff --git a/wxPython/contrib/stc/gtk/stc_.cpp b/wxPython/contrib/stc/gtk/stc_.cpp
index 812318ba9c..37013bbac2 100644
--- a/wxPython/contrib/stc/gtk/stc_.cpp
+++ b/wxPython/contrib/stc/gtk/stc_.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "stc_c"
 
-#include "export.h"
+#include "wxPython.h"
 #include "wx/stc/stc.h"
 
 
diff --git a/wxPython/samples/embedded/.cvsignore b/wxPython/samples/embedded/.cvsignore
index c2ebffa091..74070d84d9 100644
--- a/wxPython/samples/embedded/.cvsignore
+++ b/wxPython/samples/embedded/.cvsignore
@@ -1 +1,2 @@
+embedded
 embedded.dsp
diff --git a/wxPython/samples/embedded/embedded.cpp b/wxPython/samples/embedded/embedded.cpp
index 73a79512c9..4683cf2baf 100644
--- a/wxPython/samples/embedded/embedded.cpp
+++ b/wxPython/samples/embedded/embedded.cpp
@@ -108,8 +108,8 @@ enum
 
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(ID_EXIT,      OnExit)
-    EVT_MENU(ID_PYFRAME,   OnPyFrame)
+    EVT_MENU(ID_EXIT,      MyFrame::OnExit)
+    EVT_MENU(ID_PYFRAME,   MyFrame::OnPyFrame)
 END_EVENT_TABLE()
 
 
diff --git a/wxPython/samples/embedded/makefile.unx b/wxPython/samples/embedded/makefile.unx
index ab17be9ca0..df4f369f9e 100644
--- a/wxPython/samples/embedded/makefile.unx
+++ b/wxPython/samples/embedded/makefile.unx
@@ -12,18 +12,20 @@
 PROGRAM = embedded
 OBJECTS = $(PROGRAM).o
 
+EXTRAINC=-I../../src -I/usr/include/python2.2
+EXTRALIB=-L/usr/lib/python2.2/config -lpython2.2
 CXX = $(shell wx-config --cxx)
 
 
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CXX) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` $(EXTRAINC) -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` $(EXTRALIB)
 
 clean:
 	rm -f *.o $(PROGRAM)
diff --git a/wxPython/src/gtk/calendar.cpp b/wxPython/src/gtk/calendar.cpp
index 42f7ca51b4..2251d3f2f4 100644
--- a/wxPython/src/gtk/calendar.cpp
+++ b/wxPython/src/gtk/calendar.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "calendarc"
 
-#include "export.h"
+#include "wxPython.h"
 #include <wx/calctrl.h>
 
 
diff --git a/wxPython/src/gtk/grid.cpp b/wxPython/src/gtk/grid.cpp
index 23660e2746..8285f417b9 100644
--- a/wxPython/src/gtk/grid.cpp
+++ b/wxPython/src/gtk/grid.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "gridc"
 
-#include "export.h"
+#include "wxPython.h"
 #include <wx/grid.h>
 #include <wx/generic/gridctrl.h>
 
diff --git a/wxPython/src/gtk/help.cpp b/wxPython/src/gtk/help.cpp
index 0a34f441a7..987adc95a2 100644
--- a/wxPython/src/gtk/help.cpp
+++ b/wxPython/src/gtk/help.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "helpc"
 
-#include "export.h"
+#include "wxPython.h"
 #include <wx/cshelp.h>
 
 
diff --git a/wxPython/src/gtk/html.cpp b/wxPython/src/gtk/html.cpp
index a92126552f..1c8f38e178 100644
--- a/wxPython/src/gtk/html.cpp
+++ b/wxPython/src/gtk/html.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "htmlc"
 
-#include "export.h"
+#include "wxPython.h"
 #include <wx/html/htmlwin.h>
 #include <wx/html/htmprint.h>
 #include <wx/image.h>
diff --git a/wxPython/src/gtk/htmlhelp.cpp b/wxPython/src/gtk/htmlhelp.cpp
index 788c79e27f..263c8eef25 100644
--- a/wxPython/src/gtk/htmlhelp.cpp
+++ b/wxPython/src/gtk/htmlhelp.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "htmlhelpc"
 
-#include "export.h"
+#include "wxPython.h"
 #include <wx/html/htmlwin.h>
 #include <wx/html/helpctrl.h>
 #include <wx/image.h>
diff --git a/wxPython/src/gtk/wx.cpp b/wxPython/src/gtk/wx.cpp
index 51a9199a2f..1566a70510 100644
--- a/wxPython/src/gtk/wx.cpp
+++ b/wxPython/src/gtk/wx.cpp
@@ -596,7 +596,7 @@ PyObject *ptrfree(PyObject *_PTRVALUE) {
 
     wxPyApp* wxGetApp() {
         //return wxPythonApp;
-        return (wxPyApp*)wxGetApp();
+        return (wxPyApp*)wxTheApp;
     }
 
     void wxApp_CleanUp() {