diff --git a/include/Makefile.am b/include/Makefile.am
index 4f63c777..ced92cf5 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,8 @@
 
 includedir = @includedir@/ofono
 
-include_HEADERS = log.h plugin.h history.h dbus.h modem.h
+include_HEADERS = log.h plugin.h history.h dbus.h modem.h \
+			types.h
 
 nodist_include_HEADERS = version.h
 
diff --git a/include/types.h b/include/types.h
new file mode 100644
index 00000000..76f8fecf
--- /dev/null
+++ b/include/types.h
@@ -0,0 +1,53 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __OFONO_TYPES_H
+#define __OFONO_TYPES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum ofono_error_type {
+	OFONO_ERROR_TYPE_NO_ERROR = 0,
+	OFONO_ERROR_TYPE_CME,
+	OFONO_ERROR_TYPE_CMS,
+	OFONO_ERROR_TYPE_CEER,
+	OFONO_ERROR_TYPE_FAILURE
+};
+
+struct ofono_error {
+	enum ofono_error_type type;
+	int error;
+};
+
+#define OFONO_MAX_PHONE_NUMBER_LENGTH 20
+
+struct ofono_phone_number {
+	char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 1];
+	int type;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __OFONO_TYPES_H */
diff --git a/src/driver.h b/src/driver.h
index f05961be..14f05c34 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -19,13 +19,9 @@
  *
  */
 
-struct ofono_modem;
+#include <ofono/types.h>
 
-#define OFONO_MAX_PHONE_NUMBER_LENGTH 20
-struct ofono_phone_number {
-	char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 1];
-	int type;
-};
+struct ofono_modem;
 
 /* 27.007 Section 6.2 */
 enum ofono_clir_option {
@@ -40,19 +36,6 @@ enum ofono_cug_option {
 	OFONO_CUG_OPTION_INVOCATION = 1,
 };
 
-enum ofono_error_type {
-	OFONO_ERROR_TYPE_NO_ERROR = 0,
-	OFONO_ERROR_TYPE_CME,
-	OFONO_ERROR_TYPE_CMS,
-	OFONO_ERROR_TYPE_CEER,
-	OFONO_ERROR_TYPE_FAILURE
-};
-
-struct ofono_error {
-	enum ofono_error_type type;
-	int error;
-};
-
 enum ofono_disconnect_reason {
 	OFONO_DISCONNECT_REASON_UNKNOWN = 0,
 	OFONO_DISCONNECT_REASON_LOCAL_HANGUP,
diff --git a/src/ofono.h b/src/ofono.h
index 418a29bc..f627da50 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -52,6 +52,8 @@ DBusMessage *__ofono_error_timed_out(DBusMessage *msg);
 
 void __ofono_dbus_pending_reply(DBusMessage **msg, DBusMessage *reply);
 
+#include <ofono/types.h>
+
 #include <ofono/plugin.h>
 
 int __ofono_plugin_init(const char *pattern, const char *exclude);