diff --git a/configure.ac b/configure.ac
index e0acaf19..4363ac90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,10 @@ PKG_CHECK_MODULES(SHELL, pygtk-2.0 gtk+-2.0)
 
 PKG_CHECK_MODULES(NATIVE_FACTORY, dbus-1)
 
-PKG_CHECK_MODULES(LIB, gtk+-2.0)
-PKG_CHECK_MODULES(LIB_BINDINGS, pygtk-2.0)
+PKG_CHECK_MODULES(LIBUI, gtk+-2.0)
+PKG_CHECK_MODULES(LIBUI_BINDINGS, pygtk-2.0)
+
+PKG_CHECK_MODULES(LIB_BINDINGS, pygobject-2.0)
 
 PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
 AC_SUBST(PYGTK_DEFSDIR)
diff --git a/sugar/Makefile.am b/sugar/Makefile.am
index 5fcb3874..dffca334 100644
--- a/sugar/Makefile.am
+++ b/sugar/Makefile.am
@@ -12,21 +12,19 @@ sugar_PYTHON =		\
 	util.py		\
 	wm.py
 
-INCLUDES = 				\
-	$(LIB_CFLAGS)			\
-	$(LIB_BINDINGS_CFLAGS)		\
-	$(PYTHON_INCLUDES)		\
-	-I$(top_srcdir)/lib		\
-	-I$(top_srcdir)/lib/ui
-
 pkgpyexecdir = $(pythondir)/sugar
 
 pkgpyexec_LTLIBRARIES = _sugarext.la _sugaruiext.la
 
+_sugarext_la_CFLAGS = 			\
+	$(LIB_CFLAGS)			\
+	$(LIB_BINDINGS_CFLAGS)		\
+	$(PYTHON_INCLUDES)		\
+	-I$(top_srcdir)/lib
+
 _sugarext_la_LDFLAGS = -module -avoid-version
 _sugarext_la_LIBADD =				\
 	$(LIB_BINDINGS_LIBS)			\
-	$(LIB_LIBS)				\
 	$(top_builddir)/lib/libsugar.la
 
 _sugarext_la_SOURCES = 		\
@@ -36,10 +34,16 @@ nodist__sugarext_la_SOURCES = _sugarext.c
 
 _sugarext.c: _sugarext.defs _sugarext.override
 
+_sugaruiext_la_CFLAGS = 		\
+	$(LIBUI_CFLAGS)			\
+	$(LIBUI_BINDINGS_CFLAGS)	\
+	$(PYTHON_INCLUDES)		\
+	-I$(top_srcdir)/lib/ui
+
 _sugaruiext_la_LDFLAGS = -module -avoid-version
 _sugaruiext_la_LIBADD =				\
-	$(LIB_BINDINGS_LIBS)			\
-	$(LIB_LIBS)				\
+	$(LIBUI_BINDINGS_LIBS)			\
+	$(LIBUI_LIBS)				\
 	$(top_builddir)/lib/ui/libsugarui.la
 
 _sugaruiext_la_SOURCES = 		\