diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac
--- NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac	2009-07-28 13:11:39.261718877 -0400
@@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
 PKG_CHECK_MODULES(NMA,
 		[dbus-glib-1 >= 0.74
 		 glib-2.0 >= 2.16
-		 NetworkManager >= 0.8.996
-		 libnm-glib >= 0.8.996
-		 libnm-util >= 0.8.996
-		 libnm-glib-vpn >= 0.8.996
 		 gmodule-export-2.0])
 
 PKG_CHECK_MODULES(GCONF, [gconf-2.0])
@@ -192,9 +188,7 @@ AC_SUBST(DBUS_SYS_DIR)
 	*)
 		AC_MSG_CHECKING(for gnome-bluetooth)
 		PKG_CHECK_MODULES(GNOME_BLUETOOTH,
-				  gnome-bluetooth-1.0 >= 2.27.6
-				  libnm-util >= 0.8.995
-				  libnm-glib >= 0.8.995,
+				  gnome-bluetooth-1.0 >= 2.27.6,
 				  have_gbt=yes, have_gbt=no)
 		;;
 esac
 
diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/connection-editor/Makefile.am
--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
@@ -1,5 +1,9 @@
 bin_PROGRAMS = nm-connection-editor
 
+INCLUDES = -I${top_srcdir}/../include \
+           -I${top_srcdir}/../libnm-util \
+           -I${top_srcdir}/../libnm-glib
+
 nm_connection_editor_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(NMA_CFLAGS) \
@@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \
 	${top_builddir}/src/marshallers/libmarshallers.la \
 	$(GTK_LIBS) \
 	$(NMA_LIBS) \
-	-lm
+	-lm \
+	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
 
 uidir = $(datadir)/nm-applet
 ui_DATA = \
diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/Makefile.am
--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@
 SUBDIRS=. tests
 
+INCLUDES = -I${top_srcdir}/../include \
+           -I${top_srcdir}/../libnm-util \
+           -I${top_srcdir}/../libnm-glib
+
 noinst_LTLIBRARIES = \
 	libgconf-helpers.la \
 	libgconf-helpers-test.la
@@ -23,7 +27,9 @@ libgconf_helpers_la_LIBADD = \
 	$(GTK_LIBS) \
 	$(NMA_LIBS) \
 	$(GCONF_LIBS) \
-	$(GNOME_KEYRING_LIBS)
+	$(GNOME_KEYRING_LIBS) \
+	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
 
 #########################
 # Test library
@@ -40,5 +46,7 @@ libgconf_helpers_test_la_CPPFLAGS = \
 
 # no keyring or gconf libs since we'll override them
 libgconf_helpers_test_la_LIBADD = \
-	$(NMA_LIBS)
+	$(NMA_LIBS) \
+	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
 
diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/tests/Makefile.am
--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/tests/Makefile.am.buildfix	2011-03-10 02:19:03.664936744 -0600
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/tests/Makefile.am	2011-03-10 02:20:10.784097638 -0600
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
+           -I${top_srcdir}/../include \
+           -I${top_srcdir}/../libnm-util \
+           -I${top_srcdir}/../libnm-glib
 
 noinst_PROGRAMS = test-upgrade
 
diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetooth/Makefile.am
--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
@@ -6,6 +6,9 @@ INCLUDES = \
 	-I$(top_builddir) \
 	-I${top_builddir}/src/marshallers \
 	-I${top_srcdir}/src/utils \
+	-I${top_srcdir}/../include \
+	-I${top_srcdir}/../libnm-util \
+	-I${top_srcdir}/../libnm-glib \
 	$(GNOME_BLUETOOTH_CFLAGS) \
 	$(DISABLE_DEPRECATED) \
 	$(WARN_CFLAGS)
@@ -14,7 +17,9 @@ plugin_LTLIBRARIES = libnma.la
 libnma_la_LIBADD = \
 	$(top_builddir)/src/marshallers/libmarshallers.la \
 	$(top_builddir)/src/utils/libutils.la \
-	$(GNOME_BLUETOOTH_LIBS)
+	$(GNOME_BLUETOOTH_LIBS) \
+	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
 endif
 
 EXTRA_DIST = $(BT_WIDGET_SOURCES)
diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am
--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
 
 bin_PROGRAMS = nm-applet
 
+INCLUDES = -I${top_srcdir}/../include \
+           -I${top_srcdir}/../libnm-util \
+           -I${top_srcdir}/../libnm-glib
+
 nm_applet_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(NMA_CFLAGS) \
@@ -54,7 +58,9 @@ nm_applet_LDADD = \
 	${top_builddir}/src/marshallers/libmarshallers.la \
 	${top_builddir}/src/utils/libutils.la \
 	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
-	${top_builddir}/src/wireless-security/libwireless-security.la
+	${top_builddir}/src/wireless-security/libwireless-security.la \
+	-L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+	-L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
 
 uidir = $(datadir)/nm-applet
 ui_DATA = applet.ui keyring.png
diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/Makefile.am
--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@
 SUBDIRS=. tests
 
+INCLUDES = -I${top_srcdir}/../include \
+           -I${top_srcdir}/../libnm-util \
+           -I${top_srcdir}/../libnm-glib
+
 noinst_LTLIBRARIES = libutils.la
 
 libutils_la_SOURCES = \
@@ -18,4 +22,7 @@ libutils_la_CPPFLAGS = \
 	$(DISABLE_DEPRECATED) \
 	-I${top_srcdir}/src
 
 libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS)
+libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS) \
+	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
+
diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/tests/Makefile.am
--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/tests/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/tests/Makefile.am	2009-07-28 11:29:11.686841642 -0400
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
+           -I${top_srcdir}/../include \
+           -I${top_srcdir}/../libnm-util \
+           -I${top_srcdir}/../libnm-glib
 
 noinst_PROGRAMS = test-utils
 
diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-security/Makefile.am
--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
@@ -1,5 +1,9 @@
 noinst_LTLIBRARIES = libwireless-security.la
 
+INCLUDES = -I${top_srcdir}/../include \
+           -I${top_srcdir}/../libnm-util \
+           -I${top_srcdir}/../libnm-glib
+
 libwireless_security_la_SOURCES = \
 	wireless-security.h \
 	wireless-security.c \
@@ -36,7 +40,9 @@ libwireless_security_la_CPPFLAGS = \
 	$(GTK_LIBS) \
 	$(NMA_LIBS) \
 	$(GCONF_LIBS) \
-	${top_builddir}/src/utils/libutils.la
+	${top_builddir}/src/utils/libutils.la \
+	-L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+	-L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
 
 uidir = $(datadir)/nm-applet
 ui_DATA = \