Index: cairomm/Makefile.in
--- cairomm/Makefile.in.orig	2009-10-19 16:07:30 +0200
+++ cairomm/Makefile.in	2009-10-21 17:40:42 +0200
@@ -312,7 +312,7 @@
 libcairomm_1_0_la_SOURCES = $(cairomm_cc) $(cairomm_private_h)
 libcairomm_1_0_la_LDFLAGS = -no-undefined -version-info $(CAIROMM_SO_VERSION)
 libcairomm_1_0_la_LIBADD = $(CAIROMM_LIBS)
-cairomm_includedir = $(includedir)/$(CAIROMM_MODULE_NAME)/cairomm
+cairomm_includedir = $(includedir)/cairomm
 cairomm_include_HEADERS = $(cairomm_public_h)
 all: all-am
 
Index: data/cairomm-1.0.pc.in
--- data/cairomm-1.0.pc.in.orig	2009-08-13 18:08:52 +0200
+++ data/cairomm-1.0.pc.in	2009-10-21 17:41:07 +0200
@@ -16,4 +16,4 @@
 URL: http://www.cairographics.org/cairomm/
 Requires: @CAIROMM_MODULES@
 Libs: -L${libdir} -lcairomm-@CAIROMM_API_VERSION@
-Cflags: -I${includedir}/@CAIROMM_MODULE_NAME@ -I${libdir}/@CAIROMM_MODULE_NAME@/include
+Cflags: -I${includedir}