Index: src/af/xap/gtk/Makefile.am
===================================================================
--- src/af/xap/gtk/Makefile.am	(revision 22727)
+++ src/af/xap/gtk/Makefile.am	(working copy)
@@ -8,6 +8,7 @@
 	$(IMPEXP_CPPFLAGS) \
 	-I$(top_srcdir)/src/wp/ap/gtk \
 	-I$(top_srcdir)/src/wp/ap/xp \
+	-I$(top_srcdir)/src/af/xap/gtk/hildon \
 	-DDATADIR="\"$(datadir)\""
 
 # list all conditional source files here so they end up in the dist tarball
Index: src/wp/ap/gtk/Makefile.am
===================================================================
--- src/wp/ap/gtk/Makefile.am	(revision 22727)
+++ src/wp/ap/gtk/Makefile.am	(working copy)
@@ -4,6 +4,8 @@
 libgtk_la_CPPFLAGS = 						\
 	$(WP_CPPFLAGS) 						\
 	-I$(top_srcdir)/src/wp/ap/xp/ToolbarIcons 		\
+	-I$(top_srcdir)/src/af/xap/gtk/hildon	\
+	-I$(top_srcdir)/src/wp/ap/gtk/hildon 	\
 	-DPREFIX=\""$(prefix)"\" 				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
 	-DABIWORD_PLUGINSDIR="\"$(ABIWORD_PLUGINSDIR)"\"
Index: src/wp/ap/xp/Makefile.am
===================================================================
--- src/wp/ap/xp/Makefile.am	(revision 22727)
+++ src/wp/ap/xp/Makefile.am	(working copy)
@@ -8,7 +8,8 @@
 
 libxp_la_CPPFLAGS = \
 	$(WP_CPPFLAGS) \
-	-I$(srcdir)/ToolbarIcons
+	-I$(srcdir)/ToolbarIcons \
+	-I$(top_srcdir)/src/af/xap/gtk/hildon
 
 # list all conditional source files here so they end up in the dist tarball
 conditional_src = \
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 22727)
+++ src/Makefile.am	(working copy)
@@ -32,6 +32,7 @@
 
 libabiword_2_7_la_CPPFLAGS = \
 	$(WP_CPPFLAGS) \
+	-I$(top_srcdir)/src/af/xap/gtk/hildon \
 	-DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\""
 
 libabiword_2_7_la_LDFLAGS = \
Index: configure.in
===================================================================
--- configure.in	(revision 22727)
+++ configure.in	(working copy)
@@ -34,7 +34,7 @@
 goffice_req='libgoffice-0.4'
 gucharmap_req='gucharmap >= 1.4'
 libgnomeprintui_req='libgnomeprintui-2.2 >= 2.2.0'
-hildon_pkgs='hildon-libs hildon-fm dbus-1 libosso libosso-gsf-1'
+hildon_pkgs='hildon-1 hildon-fm-2 dbus-1 libosso libosso-gsf-1'
 # placeholder for accumulated optional deps
 opt_pkgs=''