diff --git a/libmm-glib/libmm-glib.h b/libmm-glib/libmm-glib.h
index f2867c69..7b26d394 100644
--- a/libmm-glib/libmm-glib.h
+++ b/libmm-glib/libmm-glib.h
@@ -23,10 +23,13 @@
 #ifndef _LIBMM_GLIB_H_
 #define _LIBMM_GLIB_H_
 
+/* ModemManager generic headers */
 #include <ModemManager.h>
-#include <mm-errors-types.h>
-#include <mm-enums-types.h>
 
+/* libmm-common specific headers */
+#include <libmm-common.h>
+
+/* libmm-glib headers */
 #include <mm-manager.h>
 #include <mm-object.h>
 
diff --git a/src/mm-bearer-3gpp.c b/src/mm-bearer-3gpp.c
index b82c9407..444f36e1 100644
--- a/src/mm-bearer-3gpp.c
+++ b/src/mm-bearer-3gpp.c
@@ -23,9 +23,7 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-
-#include <mm-enums-types.h>
-#include <mm-errors-types.h>
+#include <libmm-common.h>
 
 #include "mm-bearer-3gpp.h"
 #include "mm-base-modem-at.h"
diff --git a/src/mm-bearer-list.c b/src/mm-bearer-list.c
index eae7e7c6..7e972535 100644
--- a/src/mm-bearer-list.c
+++ b/src/mm-bearer-list.c
@@ -23,9 +23,7 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-
-#include <mm-enums-types.h>
-#include <mm-errors-types.h>
+#include <libmm-common.h>
 
 #include "mm-bearer-list.h"
 #include "mm-utils.h"
diff --git a/src/mm-bearer.c b/src/mm-bearer.c
index 6187d01c..fdfad008 100644
--- a/src/mm-bearer.c
+++ b/src/mm-bearer.c
@@ -23,10 +23,7 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-
-#include <mm-enums-types.h>
-#include <mm-errors-types.h>
-#include <mm-gdbus-bearer.h>
+#include <libmm-common.h>
 
 #include "mm-iface-modem.h"
 #include "mm-bearer.h"
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index ccbd7d23..6a5cf342 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -22,9 +22,7 @@
 #include <string.h>
 
 #include <ModemManager.h>
-#include <mm-errors-types.h>
-#include <mm-enums-types.h>
-#include <mm-common-helpers.h>
+#include <libmm-common.h>
 
 #include "mm-base-modem-at.h"
 #include "mm-broadband-modem.h"
diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c
index f24e1a6d..d2777421 100644
--- a/src/mm-iface-modem-3gpp.c
+++ b/src/mm-iface-modem-3gpp.c
@@ -14,10 +14,7 @@
  */
 
 #include <ModemManager.h>
-
-#include <mm-gdbus-modem.h>
-#include <mm-enums-types.h>
-#include <mm-errors-types.h>
+#include <libmm-common.h>
 
 #include "mm-iface-modem.h"
 #include "mm-iface-modem-3gpp.h"
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c
index 2e9911d0..fd820e2c 100644
--- a/src/mm-iface-modem.c
+++ b/src/mm-iface-modem.c
@@ -15,11 +15,7 @@
 
 
 #include <ModemManager.h>
-
-#include <mm-gdbus-modem.h>
-#include <mm-gdbus-sim.h>
-#include <mm-enums-types.h>
-#include <mm-errors-types.h>
+#include <libmm-common.h>
 
 #include "mm-iface-modem.h"
 #include "mm-base-modem.h"
diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c
index 9672c296..9f048302 100644
--- a/src/mm-modem-helpers.c
+++ b/src/mm-modem-helpers.c
@@ -24,8 +24,7 @@
 #include <errno.h>
 
 #include <ModemManager.h>
-#include <mm-errors-types.h>
-#include <mm-enums-types.h>
+#include <libmm-common.h>
 
 #include "mm-modem-helpers.h"
 #include "mm-log.h"
diff --git a/src/mm-sim.c b/src/mm-sim.c
index aa063c9b..16d5fc19 100644
--- a/src/mm-sim.c
+++ b/src/mm-sim.c
@@ -23,11 +23,7 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-
-#include <mm-enums-types.h>
-#include <mm-errors-types.h>
-#include <mm-gdbus-sim.h>
-#include <mm-marshal.h>
+#include <libmm-common.h>
 
 #include "mm-iface-modem.h"
 #include "mm-sim.h"