diff --git a/gst/Makefile.am b/gst/Makefile.am
index 0833ae7a29..4426a3a679 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -22,10 +22,10 @@ defs_DATA = gst-types.defs \
 	pbutils.defs
 defsdir = $(pkgdatadir)/$(GST_MAJORMINOR)/defs
 
-noinst_HEADERS = pygst-private.h
+noinst_HEADERS = common.h pygst-private.h
 
 pygst_installdir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/
-pygst_install_HEADERS = pygst.h common.h pygstvalue.h pygstminiobject.h pygstexception.h
+pygst_install_HEADERS = pygst.h pygstvalue.h pygstminiobject.h pygstexception.h
 
 versioned_overrides = \
 	gst-0.10.21.ignore 	\
diff --git a/gst/audio.override b/gst/audio.override
index 13addc09c8..f25234679e 100644
--- a/gst/audio.override
+++ b/gst/audio.override
@@ -25,6 +25,7 @@ headers
 #endif
 
 #define NO_IMPORT_PYGOBJECT
+#include "common.h"
 #include "pygst.h"
 
 #include <gst/gst.h>
diff --git a/gst/common.h b/gst/common.h
index f5228417c7..5d2185478e 100644
--- a/gst/common.h
+++ b/gst/common.h
@@ -28,7 +28,6 @@
 #include <glib-object.h>
 #include <gst/gst.h>
 
-#include <pygobject.h>
 #include "pygstminiobject.h"
 
 #if (defined HAVE_OLD_PYGTK && (PY_VERSION_HEX < 0x02030000))
diff --git a/gst/interfaces.override b/gst/interfaces.override
index ed522dedc2..ad067389fe 100644
--- a/gst/interfaces.override
+++ b/gst/interfaces.override
@@ -26,7 +26,7 @@ headers
 #endif
 
 #define NO_IMPORT_PYGOBJECT
-
+#include "common.h"
 #include "pygst.h"
 
 #include <gst/gst.h>
diff --git a/gst/pbutils.override b/gst/pbutils.override
index 832115583f..a3de2802e6 100644
--- a/gst/pbutils.override
+++ b/gst/pbutils.override
@@ -25,6 +25,7 @@ headers
 #endif
 
 #define NO_IMPORT_PYGOBJECT
+#include "common.h"
 #include "pygst.h"
 
 #include <gst/gst.h>
diff --git a/gst/pygst-private.h b/gst/pygst-private.h
index a032b90274..cb7c6bef5f 100644
--- a/gst/pygst-private.h
+++ b/gst/pygst-private.h
@@ -27,6 +27,7 @@
 
 #define _INSIDE_PYGST_
 #include "pygst.h"
+#include "common.h"
 
 extern PyTypeObject PyGstMiniObject_Type;
 
diff --git a/gst/pygst.h b/gst/pygst.h
index 83b6849551..23b4b8a49c 100644
--- a/gst/pygst.h
+++ b/gst/pygst.h
@@ -27,8 +27,6 @@
 #include <glib-object.h>
 #include <gst/gst.h>
 
-#include "common.h"
-
 G_BEGIN_DECLS
 
 struct _PyGst_Functions {
diff --git a/gst/pygstminiobject.c b/gst/pygstminiobject.c
index 94f28fef14..443d245b6c 100644
--- a/gst/pygstminiobject.c
+++ b/gst/pygstminiobject.c
@@ -22,6 +22,7 @@
 
 #define NO_IMPORT_PYGOBJECT
 #define _INSIDE_PYGST_
+#include "common.h"
 #include "pygstminiobject.h"
 #include "pygst.h"
 #include <gst/gst.h>
diff --git a/gst/pygstminiobject.h b/gst/pygstminiobject.h
index 3eb3d4a745..08a5304fce 100644
--- a/gst/pygstminiobject.h
+++ b/gst/pygstminiobject.h
@@ -8,8 +8,6 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "common.h"
-
 G_BEGIN_DECLS
 
 /* Work around bugs in PyGILState api fixed in 2.4.0a4 */
diff --git a/gst/pygstvalue.h b/gst/pygstvalue.h
index 6083f59f8c..a65f00be7d 100644
--- a/gst/pygstvalue.h
+++ b/gst/pygstvalue.h
@@ -19,7 +19,7 @@
  * Author: Andy Wingo <wingo@pobox.com>
  */
 
-#include "common.h"
+#include <Python.h>
 #include <gst/gst.h>
 
 
diff --git a/gst/tag.override b/gst/tag.override
index 3daf564f15..813c44d24a 100644
--- a/gst/tag.override
+++ b/gst/tag.override
@@ -25,6 +25,7 @@ headers
 #endif
 
 #define NO_IMPORT_PYGOBJECT
+#include "common.h"
 #include "pygst.h"
 
 #include <gst/gst.h>
diff --git a/gst/video.override b/gst/video.override
index ce4b201d5b..ad2acd67d1 100644
--- a/gst/video.override
+++ b/gst/video.override
@@ -25,6 +25,7 @@ headers
 #endif
 
 #define NO_IMPORT_PYGOBJECT
+#include "common.h"
 #include "pygst.h"
 
 #include <gst/gst.h>