diff -ur /p/build/pygobject-2.18.0/gio/Makefile.am pygobject-2.18.0/gio/Makefile.am
--- /p/build/pygobject-2.18.0/gio/Makefile.am	Sun May 24 13:19:34 2009
+++ pygobject-2.18.0/gio/Makefile.am	Mon Jun 15 17:01:45 2009
@@ -56,7 +56,7 @@
 gio.c: $(GIO_DEFS) $(GIO_OVERRIDES)
 _gio_la_CFLAGS = $(GIO_CFLAGS)
 _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio
-_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
+_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.lo
 _gio_la_SOURCES = \
 	giomodule.c \
 	pygio-utils.c \
diff -ur /p/build/pygobject-2.18.0/gio/Makefile.in pygobject-2.18.0/gio/Makefile.in
--- /p/build/pygobject-2.18.0/gio/Makefile.in	Sun May 24 13:37:47 2009
+++ pygobject-2.18.0/gio/Makefile.in	Mon Jun 15 17:01:53 2009
@@ -298,7 +298,7 @@
 GIO_DEFS = gio.defs gio-types.defs $(GIO_OVERRIDES)
 _gio_la_CFLAGS = $(GIO_CFLAGS)
 _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio
-_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
+_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.lo
 _gio_la_SOURCES = \
 	giomodule.c \
 	pygio-utils.c \
diff -ur /p/build/pygobject-2.18.0/glib/Makefile.am pygobject-2.18.0/glib/Makefile.am
--- /p/build/pygobject-2.18.0/glib/Makefile.am	Sun May 24 13:19:34 2009
+++ pygobject-2.18.0/glib/Makefile.am	Mon Jun 15 16:53:12 2009
@@ -28,8 +28,8 @@
 	pyglib-python-compat.h
 
 _glib_la_CFLAGS = $(GLIB_CFLAGS)
-_glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
-_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la
+_glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex '_glib|PyInit__glib'
+_glib_la_LIBADD = $(GLIB_LIBS) libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.lo
 _glib_la_SOURCES = 	 	\
 	glibmodule.c	 	\
 	pygiochannel.c 	 	\
diff -ur /p/build/pygobject-2.18.0/glib/Makefile.in pygobject-2.18.0/glib/Makefile.in
--- /p/build/pygobject-2.18.0/glib/Makefile.in	Sun May 24 13:37:47 2009
+++ pygobject-2.18.0/glib/Makefile.in	Mon Jun 15 16:56:58 2009
@@ -269,8 +269,8 @@
 	pyglib-python-compat.h
 
 _glib_la_CFLAGS = $(GLIB_CFLAGS) $(am__append_2)
-_glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
-_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la
+_glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex '_glib|PyInit__glib'
+_glib_la_LIBADD = $(GLIB_LIBS) libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.lo
 _glib_la_SOURCES = \
 	glibmodule.c	 	\
 	pygiochannel.c 	 	\
diff -ur /p/build/pygobject-2.18.0/glib/pygiochannel.c pygobject-2.18.0/glib/pygiochannel.c
--- /p/build/pygobject-2.18.0/glib/pygiochannel.c	Wed May 13 14:56:45 2009
+++ pygobject-2.18.0/glib/pygiochannel.c	Mon Jun 15 16:29:57 2009
@@ -10,6 +10,7 @@
 
 #include "pyglib.h"
 #include "pyglib-private.h"
+#include "pygsource.h"
 
 typedef struct {
     PyObject_HEAD
diff -ur /p/build/pygobject-2.18.0/gobject/Makefile.am pygobject-2.18.0/gobject/Makefile.am
--- /p/build/pygobject-2.18.0/gobject/Makefile.am	Sun May 24 13:19:34 2009
+++ pygobject-2.18.0/gobject/Makefile.am	Mon Jun 15 17:00:08 2009
@@ -38,11 +38,11 @@
 	$(FFI_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	 -DPY_SSIZE_T_CLEAN
-_gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_gobject|PyInit__gobject"
+_gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex '_gobject|PyInit__gobject'
 _gobject_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(FFI_LIBS) \
-	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
+	$(top_builddir)/glib/libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.lo
 _gobject_la_SOURCES =           \
         gobjectmodule.c         \
         pygboxed.c              \
diff -ur /p/build/pygobject-2.18.0/gobject/Makefile.in pygobject-2.18.0/gobject/Makefile.in
--- /p/build/pygobject-2.18.0/gobject/Makefile.in	Sun May 24 13:37:47 2009
+++ pygobject-2.18.0/gobject/Makefile.in	Mon Jun 15 17:00:30 2009
@@ -275,11 +275,11 @@
 _gobject_la_CFLAGS = -I$(top_srcdir)/glib $(PYTHON_INCLUDES) \
 	$(FFI_CFLAGS) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN \
 	$(am__append_3)
-_gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_gobject|PyInit__gobject"
+_gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex '_gobject|PyInit__gobject'
 _gobject_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(FFI_LIBS) \
-	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
+	$(top_builddir)/glib/libpyglib_2_0_@PYTHON_BASENAME@_la-pyglib.lo
 
 _gobject_la_SOURCES = gobjectmodule.c pygboxed.c pygboxed.h pygenum.c \
 	pygenum.h pygflags.c pygflags.h pyginterface.c pyginterface.h \
