diff --git a/Makefile.am b/Makefile.am
index afe47cae..cfd832de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,11 @@
+XSLTPROC = xsltproc --xinclude --nonet
+
+XMLS = $(wildcard introspection/mm-*.xml)
+
 if WITH_DOCS
 
 all:
 
-XSLTPROC = xsltproc --xinclude --nonet
-
-XMLS = $(wildcard introspection/mm-*.xml)
 # Figure out if we need ASYNC_INTROSPECT and add it later
 
 GENERATED_FILES = \
@@ -42,6 +43,14 @@ dbusactivationdir = $(datadir)/dbus-1/system-services
 dbusactivation_in_files = org.freedesktop.ModemManager.service.in
 dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
 
+includedir = @includedir@/mm
+
+include_HEADERS = include/mm-modem.h
+
+include/mm-modem.h: $(XMLS) introspection/all.xml header-generator.xsl
+	@install -d include
+	$(XSLTPROC) header-generator.xsl introspection/all.xml > $@
+
 %service: %service.in
 	$(edit) $< >$@
 
diff --git a/header-generator.xsl b/header-generator.xsl
new file mode 100644
index 00000000..c32f4b65
--- /dev/null
+++ b/header-generator.xsl
@@ -0,0 +1,204 @@
+<!-- Generate a C header file from the Modem Manager specification.
+
+Copyright (C) 2006, 2007 Collabora Limited
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
+  exclude-result-prefixes="tp">
+  <!--Don't move the declaration of the HTML namespace up here - XMLNSs
+  don't work ideally in the presence of two things that want to use the
+  absence of a prefix, sadly. -->
+
+  <xsl:template match="*" mode="identity">
+    <xsl:copy>
+      <xsl:apply-templates mode="identity"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="tp:docstring">
+  </xsl:template>
+
+  <xsl:template match="tp:realdocstring">
+/* <xsl:apply-templates select="node()" mode="identity"/> */
+  </xsl:template>
+
+  <xsl:template match="tp:errors">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="tp:generic-types">
+    <xsl:call-template name="do-types"/>
+  </xsl:template>
+
+  <xsl:template name="do-types">
+    <xsl:if test="tp:simple-type">
+      <xsl:apply-templates select="tp:simple-type"/>
+    </xsl:if>
+
+    <xsl:if test="tp:enum">
+      <xsl:apply-templates select="tp:enum"/>
+    </xsl:if>
+
+    <xsl:if test="tp:flags">
+      <xsl:apply-templates select="tp:flags"/>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="tp:error">
+    <xsl:apply-templates select="tp:docstring"/>
+    <xsl:variable name="nameprefix">
+        <xsl:value-of select="translate(substring-after(../@namespace, 'org.freedesktop.ModemManager.'),
+			      'abcdefghijklmnopqrstuvwxyz. ',
+			      'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
+      </xsl:variable>
+    <xsl:variable name="name">
+      <xsl:value-of select="translate(@name,
+			    'abcdefghijklmnopqrstuvwxyz. ',
+			    'ABCDEFGHIJKLMNOPQRSTUVWXYZ__')"/>
+      </xsl:variable>
+#define <xsl:value-of select="concat('MM_ERROR_', $nameprefix, '_', $name, ' ')"/> "<xsl:value-of select="translate(@name, ' ', '')"/>"
+  </xsl:template>
+
+  <xsl:template match="tp:flags">
+/* <xsl:value-of select="@name"/> */
+    <xsl:apply-templates select="tp:docstring" />
+        <xsl:variable name="value-prefix">
+          <xsl:choose>
+            <xsl:when test="@value-prefix">
+              <xsl:value-of select="@value-prefix"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="@name"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+      <xsl:for-each select="tp:flag">
+        <xsl:choose>
+          <xsl:when test="tp:docstring">
+	    <xsl:apply-templates select="tp:docstring" />
+	  </xsl:when>
+        </xsl:choose>
+#define <xsl:value-of select="concat($value-prefix, '_', @suffix, ' ') "/><xsl:value-of select="@value"/>
+
+      </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="tp:enum">
+/* <xsl:value-of select="@name"/> */
+<xsl:apply-templates select="tp:docstring" />
+        <xsl:variable name="value-prefix">
+          <xsl:choose>
+            <xsl:when test="@value-prefix">
+              <xsl:value-of select="@value-prefix"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="@name"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+      <xsl:for-each select="tp:enumvalue">
+        <xsl:choose>
+          <xsl:when test="tp:docstring">
+	    <xsl:apply-templates select="tp:docstring" />
+          </xsl:when>
+        </xsl:choose>
+#define <xsl:value-of select="concat($value-prefix, '_', @suffix, ' ')"/><xsl:value-of select="@value"/>
+      </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="tp:possible-errors/tp:error">
+    <xsl:variable name="name" select="@name"/>
+    <xsl:choose>
+      <xsl:when test="tp:docstring">
+        <xsl:apply-templates select="tp:docstring"/>
+      </xsl:when>
+      <xsl:when test="//tp:errors/tp:error[concat(../@namespace, '.', translate(@name, ' ', ''))=$name]/tp:docstring">
+        <xsl:apply-templates select="//tp:errors/tp:error[concat(../@namespace, '.', translate(@name, ' ', ''))=$name]/tp:docstring"/> <em xmlns="http://www.w3.org/1999/xhtml">(generic description)</em>
+      </xsl:when>
+      <xsl:otherwise>
+        (Undocumented.)
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="signal">
+  </xsl:template>
+
+  <xsl:template match="method">
+    <xsl:variable name="varname">
+      <xsl:value-of select="translate(@name,
+			    'abcdefghijklmnopqrstuvwxyz. ',
+			    'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
+    </xsl:variable>
+#define <xsl:value-of select="concat('MM_METHOD_', $varname)"/> "<xsl:value-of select="@name"/>"
+  </xsl:template>
+
+  <xsl:template match="tp:copyright">
+  </xsl:template>
+
+  <xsl:output method="text" indent="no" encoding="ascii"
+    omit-xml-declaration="yes" />
+
+  <xsl:template match="/tp:spec">
+/* Generated Header file do not edit */
+/* <xsl:value-of select="tp:title"/> */
+
+<xsl:if test="tp:version">
+/*
+ * <xsl:text> version </xsl:text> <xsl:value-of select="tp:version"/>
+ */
+</xsl:if>
+
+#define MM_MODEMMANAGER_PATH    "/org/freedesktop/ModemManager"
+#define MM_MODEMMANAGER_SERVICE "org.freedesktop.ModemManager"
+
+/**************
+ * Interfaces *
+ **************/
+<xsl:for-each select="node/interface">
+  <xsl:apply-templates select="tp:docstring"/>
+  <xsl:variable name="varname">
+    <xsl:choose>
+      <xsl:when test="contains(@name, 'org.freedesktop.ModemManager.')">
+	<xsl:value-of select="translate(substring-after(@name, 'org.freedesktop.ModemManager.'),
+			      'abcdefghijklmnopqrstuvwxyz. ',
+			      'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
+      </xsl:when>
+      <xsl:otherwise>
+	<xsl:value-of select="translate(substring-after(@name, 'org.freedesktop.'),
+			      'abcdefghijklmnopqrstuvwxyz. ',
+			      'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+#define <xsl:value-of select="concat('MM_', $varname, '_INTERFACE ')"/> "<xsl:value-of select="@name"/>"</xsl:for-each>
+
+/***************
+ * Enums/Flags *
+ ***************/
+<xsl:apply-templates select="node"/>
+
+/**********
+ * Errors *
+ **********/
+<xsl:apply-templates select="tp:errors"/>
+
+</xsl:template>
+</xsl:stylesheet>
+
+<!-- vim:set sw=2 sts=2 et: -->