diff --git a/plugins/example_history.c b/plugins/example_history.c
index 3ebf7434..c08d0cae 100644
--- a/plugins/example_history.c
+++ b/plugins/example_history.c
@@ -29,8 +29,8 @@
 #include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/history.h>
+#include <ofono/types.h>
 
-#include "driver.h"
 #include "common.h"
 
 static int example_history_probe(struct ofono_history_context *context)
diff --git a/src/common.c b/src/common.c
index 14bf7f98..ff94fc0e 100644
--- a/src/common.c
+++ b/src/common.c
@@ -29,7 +29,7 @@
 
 #include <glib.h>
 
-#include "driver.h"
+#include <ofono/types.h>
 #include "common.h"
 
 struct error_entry {
diff --git a/src/simutil.c b/src/simutil.c
index 1dc310bf..99f28bda 100644
--- a/src/simutil.c
+++ b/src/simutil.c
@@ -27,7 +27,7 @@
 
 #include <glib.h>
 
-#include "driver.h"
+#include <ofono/types.h>
 #include "simutil.h"
 #include "util.h"
 #include "smsutil.h"
diff --git a/unit/test-common.c b/unit/test-common.c
index 96509bd1..37d06103 100644
--- a/unit/test-common.c
+++ b/unit/test-common.c
@@ -25,7 +25,8 @@
 #include <assert.h>
 #include <glib.h>
 
-#include "driver.h"
+#include <ofono/types.h>
+
 #include "common.h"
 
 static const char *invalid_strings[] = {
diff --git a/unit/test-simutil.c b/unit/test-simutil.c
index 0a0fa7c0..adea9ecf 100644
--- a/unit/test-simutil.c
+++ b/unit/test-simutil.c
@@ -24,7 +24,8 @@
 #include <assert.h>
 #include <glib.h>
 
-#include "driver.h"
+#include <ofono/types.h>
+
 #include "simutil.h"
 
 const unsigned char valid_efopl[] = {