libmm-glib: remove the `libmm-common.h' header

Both the ModemManager daemon and the mmcli will now include `libmm-glib.h' only.

We also handle two new special `_LIBMM_INSIDE_MM' and `LIBMM_INSIDE_MMCLI'
symbols, which if included before the `libmm-glib.h' library allow us to:

 * Don't include the libmm-glib high level API in the ModemManager daemon, as
   the object names would clash with those in the core.

 * Define some of the methods of helper objects to be included only if compiling
   ModemManager daemon or the mmcli.

117 files changed, 292 insertions, 165 deletions

diff --git a/cli/mmcli-bearer.c b/cli/mmcli-bearer.c
index e7aa6e79..0da8f5b2 100644
--- a/cli/mmcli-bearer.c
+++ b/cli/mmcli-bearer.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-common.c b/cli/mmcli-common.c
index 57a43a6a..103ee35e 100644
--- a/cli/mmcli-common.c
+++ b/cli/mmcli-common.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli-common.h"
diff --git a/cli/mmcli-common.h b/cli/mmcli-common.h
index 6d7b3ba7..615f5218 100644
--- a/cli/mmcli-common.h
+++ b/cli/mmcli-common.h
@@ -17,6 +17,8 @@
 #define _MMCLI_COMMON_H_
 
 #include <gio/gio.h>
+
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 void       mmcli_get_manager        (GDBusConnection *connection,
diff --git a/cli/mmcli-manager.c b/cli/mmcli-manager.c
index 70a7050e..d3bd48e7 100644
--- a/cli/mmcli-manager.c
+++ b/cli/mmcli-manager.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include "libmm-glib.h"
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-3gpp.c b/cli/mmcli-modem-3gpp.c
index 6d7be868..f88ce625 100644
--- a/cli/mmcli-modem-3gpp.c
+++ b/cli/mmcli-modem-3gpp.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-cdma.c b/cli/mmcli-modem-cdma.c
index b5183462..8841f7e8 100644
--- a/cli/mmcli-modem-cdma.c
+++ b/cli/mmcli-modem-cdma.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-firmware.c b/cli/mmcli-modem-firmware.c
index e12a3359..52f5c0d9 100644
--- a/cli/mmcli-modem-firmware.c
+++ b/cli/mmcli-modem-firmware.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-location.c b/cli/mmcli-modem-location.c
index 0b83a419..d96aabae 100644
--- a/cli/mmcli-modem-location.c
+++ b/cli/mmcli-modem-location.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-messaging.c b/cli/mmcli-modem-messaging.c
index bd02b7e0..604bf904 100644
--- a/cli/mmcli-modem-messaging.c
+++ b/cli/mmcli-modem-messaging.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-simple.c b/cli/mmcli-modem-simple.c
index b961a6e2..a8ef711d 100644
--- a/cli/mmcli-modem-simple.c
+++ b/cli/mmcli-modem-simple.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem-time.c b/cli/mmcli-modem-time.c
index 6918833c..8dde6f4f 100644
--- a/cli/mmcli-modem-time.c
+++ b/cli/mmcli-modem-time.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-modem.c b/cli/mmcli-modem.c
index 9ec17a15..bcce2639 100644
--- a/cli/mmcli-modem.c
+++ b/cli/mmcli-modem.c
@@ -27,6 +27,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-sim.c b/cli/mmcli-sim.c
index 1bde2b74..085f3355 100644
--- a/cli/mmcli-sim.c
+++ b/cli/mmcli-sim.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli-sms.c b/cli/mmcli-sms.c
index 798c2538..8520d50e 100644
--- a/cli/mmcli-sms.c
+++ b/cli/mmcli-sms.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/cli/mmcli.c b/cli/mmcli.c
index 8e81452f..da68780f 100644
--- a/cli/mmcli.c
+++ b/cli/mmcli.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#define _LIBMM_INSIDE_MMCLI
 #include <libmm-glib.h>
 
 #include "mmcli.h"
diff --git a/docs/reference/libmm-glib/libmm-glib-docs.xml b/docs/reference/libmm-glib/libmm-glib-docs.xml
index 94ecde9f..91e02d85 100644
--- a/docs/reference/libmm-glib/libmm-glib-docs.xml
+++ b/docs/reference/libmm-glib/libmm-glib-docs.xml
@@ -49,13 +49,6 @@
   </bookinfo>
 
   <part>
-    <title>Helper types</title>
-    <xi:include href="xml/mm-firmware-properties.xml"/>
-    <xi:include href="xml/mm-bearer-properties.xml"/>
-    <xi:include href="xml/mm-bearer-ip-config.xml"/>
-  </part>
-
-  <part>
     <title>High level API</title>
 
     <chapter>
@@ -66,20 +59,48 @@
     <chapter>
       <title>The Modem object</title>
       <xi:include href="xml/mm-object.xml"/>
-      <xi:include href="xml/mm-modem.xml"/>
-      <xi:include href="xml/mm-modem-3gpp.xml"/>
-      <xi:include href="xml/mm-modem-3gpp-ussd.xml"/>
-      <xi:include href="xml/mm-modem-cdma.xml"/>
-      <xi:include href="xml/mm-modem-location.xml"/>
-      <xi:include href="xml/mm-modem-messaging.xml"/>
-      <xi:include href="xml/mm-modem-time.xml"/>
-      <xi:include href="xml/mm-modem-firmware.xml"/>
-      <xi:include href="xml/mm-modem-simple.xml"/>
+      <section>
+        <title>Generic interfaces</title>
+        <xi:include href="xml/mm-modem.xml"/>
+        <xi:include href="xml/mm-modem-3gpp.xml"/>
+        <xi:include href="xml/mm-modem-3gpp-ussd.xml"/>
+        <xi:include href="xml/mm-modem-cdma.xml"/>
+        <xi:include href="xml/mm-unlock-retries.xml"/>
+      </section>
+      <section>
+        <title>Simple interface support</title>
+        <xi:include href="xml/mm-modem-simple.xml"/>
+        <xi:include href="xml/mm-simple-connect-properties.xml"/>
+        <xi:include href="xml/mm-simple-status.xml"/>
+      </section>
+      <section>
+        <title>Location support</title>
+        <xi:include href="xml/mm-modem-location.xml"/>
+        <xi:include href="xml/mm-location-3gpp.xml"/>
+        <xi:include href="xml/mm-location-gps-nmea.xml"/>
+        <xi:include href="xml/mm-location-gps-raw.xml"/>
+      </section>
+      <section>
+        <title>Messaging support</title>
+        <xi:include href="xml/mm-modem-messaging.xml"/>
+      </section>
+      <section>
+        <title>Time support</title>
+        <xi:include href="xml/mm-modem-time.xml"/>
+        <xi:include href="xml/mm-network-timezone.xml"/>
+      </section>
+      <section>
+        <title>Firmware support</title>
+        <xi:include href="xml/mm-modem-firmware.xml"/>
+        <xi:include href="xml/mm-firmware-properties.xml"/>
+      </section>
     </chapter>
 
     <chapter>
       <title>The Bearer object</title>
       <xi:include href="xml/mm-bearer.xml"/>
+      <xi:include href="xml/mm-bearer-properties.xml"/>
+      <xi:include href="xml/mm-bearer-ip-config.xml"/>
     </chapter>
 
     <chapter>
@@ -90,6 +111,7 @@
     <chapter>
       <title>The SMS object</title>
       <xi:include href="xml/mm-sms.xml"/>
+      <xi:include href="xml/mm-sms-properties.xml"/>
     </chapter>
 
   </part>
diff --git a/libmm-glib/libmm-common.h b/libmm-glib/libmm-common.h
deleted file mode 100644
index 0404c892..00000000
--- a/libmm-glib/libmm-common.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * libmm-common -- Common library used by libmm-glib and ModemManager
- *
- * 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 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 Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2011 Google, Inc.
- */
-
-#ifndef _LIBMM_COMMON_H_
-#define _LIBMM_COMMON_H_
-
-#include "mm-errors-types.h"
-#include "mm-enums-types.h"
-#include "mm-common-helpers.h"
-#include "mm-simple-status.h"
-#include "mm-simple-connect-properties.h"
-#include "mm-sms-properties.h"
-#include "mm-bearer-properties.h"
-#include "mm-bearer-ip-config.h"
-#include "mm-location-3gpp.h"
-#include "mm-location-gps-raw.h"
-#include "mm-location-gps-nmea.h"
-#include "mm-unlock-retries.h"
-#include "mm-network-timezone.h"
-#include "mm-firmware-properties.h"
-#include "mm-gdbus-manager.h"
-#include "mm-gdbus-modem.h"
-#include "mm-gdbus-bearer.h"
-#include "mm-gdbus-sim.h"
-#include "mm-gdbus-sms.h"
-
-#endif /* _LIBMM_COMMON_H_ */
diff --git a/libmm-glib/libmm-glib.h b/libmm-glib/libmm-glib.h
index 7b26d394..62401bb6 100644
--- a/libmm-glib/libmm-glib.h
+++ b/libmm-glib/libmm-glib.h
@@ -26,11 +26,43 @@
 /* ModemManager generic headers */
 #include <ModemManager.h>
 
-/* libmm-common specific headers */
-#include <libmm-common.h>
-
 /* libmm-glib headers */
-#include <mm-manager.h>
-#include <mm-object.h>
+
+#if !defined (_LIBMM_INSIDE_MM)
+/* This headers are not exported within ModemManager */
+# include <mm-manager.h>
+# include <mm-object.h>
+# include <mm-modem.h>
+# include <mm-modem-3gpp.h>
+# include <mm-modem-3gpp-ussd.h>
+# include <mm-modem-cdma.h>
+# include <mm-modem-simple.h>
+# include <mm-modem-location.h>
+# include <mm-modem-messaging.h>
+# include <mm-modem-time.h>
+# include <mm-modem-firmware.h>
+#endif
+
+#include <mm-common-helpers.h>
+#include <mm-simple-status.h>
+#include <mm-simple-connect-properties.h>
+#include <mm-sms-properties.h>
+#include <mm-bearer-properties.h>
+#include <mm-bearer-ip-config.h>
+#include <mm-location-3gpp.h>
+#include <mm-location-gps-raw.h>
+#include <mm-location-gps-nmea.h>
+#include <mm-unlock-retries.h>
+#include <mm-network-timezone.h>
+#include <mm-firmware-properties.h>
+
+/* generated */
+#include <mm-errors-types.h>
+#include <mm-enums-types.h>
+#include <mm-gdbus-manager.h>
+#include <mm-gdbus-modem.h>
+#include <mm-gdbus-bearer.h>
+#include <mm-gdbus-sim.h>
+#include <mm-gdbus-sms.h>
 
 #endif /* _LIBMM_GLIB_H_ */
diff --git a/libmm-glib/mm-bearer.h b/libmm-glib/mm-bearer.h
index 585746b7..4f90ae2a 100644
--- a/libmm-glib/mm-bearer.h
+++ b/libmm-glib/mm-bearer.h
@@ -25,7 +25,10 @@
 #define _MM_BEARER_H_
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+
+#include "mm-gdbus-bearer.h"
+#include "mm-bearer-properties.h"
+#include "mm-bearer-ip-config.h"
 
 G_BEGIN_DECLS
 
diff --git a/libmm-glib/mm-manager.c b/libmm-glib/mm-manager.c
index 3b2582ec..7dc914f8 100644
--- a/libmm-glib/mm-manager.c
+++ b/libmm-glib/mm-manager.c
@@ -23,8 +23,10 @@
  * Author: Aleksander Morgado <aleksander@lanedo.com>
  */
 
-#include "ModemManager.h"
-#include <mm-gdbus-manager.h>
+#include <ModemManager.h>
+
+#include "mm-errors-types.h"
+#include "mm-gdbus-manager.h"
 #include "mm-manager.h"
 #include "mm-object.h"
 
diff --git a/libmm-glib/mm-manager.h b/libmm-glib/mm-manager.h
index 41670255..f298c928 100644
--- a/libmm-glib/mm-manager.h
+++ b/libmm-glib/mm-manager.h
@@ -27,7 +27,8 @@
 #define _MM_MANAGER_H_
 
 #include <ModemManager.h>
-#include <mm-gdbus-modem.h>
+
+#include "mm-gdbus-modem.h"
 
 G_BEGIN_DECLS
 
diff --git a/libmm-glib/mm-modem-3gpp-ussd.c b/libmm-glib/mm-modem-3gpp-ussd.c
index 993c7e25..f77a7f7a 100644
--- a/libmm-glib/mm-modem-3gpp-ussd.c
+++ b/libmm-glib/mm-modem-3gpp-ussd.c
@@ -24,6 +24,7 @@
 #include <gio/gio.h>
 
 #include "mm-helpers.h"
+#include "mm-errors-types.h"
 #include "mm-modem-3gpp-ussd.h"
 
 /**
diff --git a/libmm-glib/mm-modem-3gpp-ussd.h b/libmm-glib/mm-modem-3gpp-ussd.h
index 22a2abfa..d05e7148 100644
--- a/libmm-glib/mm-modem-3gpp-ussd.h
+++ b/libmm-glib/mm-modem-3gpp-ussd.h
@@ -25,7 +25,8 @@
 #define _MM_MODEM_3GPP_USSD_H_
 
 #include <ModemManager.h>
-#include <mm-gdbus-modem.h>
+
+#include "mm-gdbus-modem.h"
 
 G_BEGIN_DECLS
 
diff --git a/libmm-glib/mm-modem-3gpp.c b/libmm-glib/mm-modem-3gpp.c
index 70aab426..40c7e862 100644
--- a/libmm-glib/mm-modem-3gpp.c
+++ b/libmm-glib/mm-modem-3gpp.c
@@ -24,6 +24,7 @@
 #include <gio/gio.h>
 
 #include "mm-helpers.h"
+#include "mm-errors-types.h"
 #include "mm-modem-3gpp.h"
 
 /**
diff --git a/libmm-glib/mm-modem-3gpp.h b/libmm-glib/mm-modem-3gpp.h
index c9108c6f..e68d43d4 100644
--- a/libmm-glib/mm-modem-3gpp.h
+++ b/libmm-glib/mm-modem-3gpp.h
@@ -25,7 +25,8 @@
 #define _MM_MODEM_3GPP_H_
 
 #include <ModemManager.h>
-#include <mm-gdbus-modem.h>
+
+#include "mm-gdbus-modem.h"
 
 G_BEGIN_DECLS
 
diff --git a/libmm-glib/mm-modem-cdma.c b/libmm-glib/mm-modem-cdma.c
index d86db317..e12c080b 100644
--- a/libmm-glib/mm-modem-cdma.c
+++ b/libmm-glib/mm-modem-cdma.c
@@ -24,6 +24,7 @@
 #include <gio/gio.h>
 
 #include "mm-helpers.h"
+#include "mm-errors-types.h"
 #include "mm-modem-cdma.h"
 
 /**
diff --git a/libmm-glib/mm-modem-cdma.h b/libmm-glib/mm-modem-cdma.h
index 86b28eb0..b8aaa7dc 100644
--- a/libmm-glib/mm-modem-cdma.h
+++ b/libmm-glib/mm-modem-cdma.h
@@ -25,7 +25,8 @@
 #define _MM_MODEM_CDMA_H_
 
 #include <ModemManager.h>
-#include <mm-gdbus-modem.h>
+
+#include "mm-gdbus-modem.h"
 
 G_BEGIN_DECLS
 
diff --git a/libmm-glib/mm-modem-firmware.c b/libmm-glib/mm-modem-firmware.c
index 5302a040..0b059dd1 100644
--- a/libmm-glib/mm-modem-firmware.c
+++ b/libmm-glib/mm-modem-firmware.c
@@ -24,6 +24,7 @@
 #include <gio/gio.h>
 
 #include "mm-helpers.h"
+#include "mm-errors-types.h"
 #include "mm-modem-firmware.h"
 
 /**
diff --git a/libmm-glib/mm-modem-firmware.h b/libmm-glib/mm-modem-firmware.h
index da7e4f87..e72e9206 100644
--- a/libmm-glib/mm-modem-firmware.h
+++ b/libmm-glib/mm-modem-firmware.h
@@ -24,7 +24,9 @@
 #define _MM_MODEM_FIRMWARE_H_
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+
+#include "mm-gdbus-modem.h"
+#include "mm-firmware-properties.h"
 
 G_BEGIN_DECLS
 
diff --git a/libmm-glib/mm-modem-location.c b/libmm-glib/mm-modem-location.c
index c7866045..f77dcf58 100644
--- a/libmm-glib/mm-modem-location.c
+++ b/libmm-glib/mm-modem-location.c
@@ -24,6 +24,7 @@
 #include <gio/gio.h>
 
 #include "mm-helpers.h"
+#include "mm-errors-types.h"
 #include "mm-modem-location.h"
 
 /**
diff --git a/libmm-glib/mm-modem-location.h b/libmm-glib/mm-modem-location.h
index f2d2eae7..86644763 100644
--- a/libmm-glib/mm-modem-location.h
+++ b/libmm-glib/mm-modem-location.h
@@ -25,7 +25,11 @@
 #define _MM_MODEM_LOCATION_H_
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+
+#include "mm-gdbus-modem.h"
+#include "mm-location-3gpp.h"
+#include "mm-location-gps-nmea.h"
+#include "mm-location-gps-raw.h"
 
 G_BEGIN_DECLS
 
diff --git a/libmm-glib/mm-modem-messaging.c b/libmm-glib/mm-modem-messaging.c
index 62b180d6..50c525c8 100644
--- a/libmm-glib/mm-modem-messaging.c
+++ b/libmm-glib/mm-modem-messaging.c
@@ -24,6 +24,8 @@
 #include <gio/gio.h>
 
 #include "mm-helpers.h"
+#include "mm-common-helpers.h"
+#include "mm-errors-types.h"
 #include "mm-modem-messaging.h"
 
 /**
diff --git a/libmm-glib/mm-modem-messaging.h b/libmm-glib/mm-modem-messaging.h
index 8dc37340..e911c005 100644
--- a/libmm-glib/mm-modem-messaging.h
+++ b/libmm-glib/mm-modem-messaging.h
@@ -25,8 +25,8 @@
 #define _MM_MODEM_MESSAGING_H_
 
 #include <ModemManager.h>
-#include <mm-gdbus-modem.h>
 
+#include "mm-gdbus-modem.h"
 #include "mm-sms.h"
 #include "mm-sms-properties.h"
 
diff --git a/libmm-glib/mm-modem-simple.c b/libmm-glib/mm-modem-simple.c
index dd3ec84b..b96e31da 100644
--- a/libmm-glib/mm-modem-simple.c
+++ b/libmm-glib/mm-modem-simple.c
@@ -24,6 +24,7 @@
 #include <gio/gio.h>
 
 #include "mm-helpers.h"
+#include "mm-errors-types.h"
 #include "mm-modem-simple.h"
 
 /**
diff --git a/libmm-glib/mm-modem-simple.h b/libmm-glib/mm-modem-simple.h
index 7763cd99..83c2081e 100644
--- a/libmm-glib/mm-modem-simple.h
+++ b/libmm-glib/mm-modem-simple.h
@@ -25,8 +25,10 @@
 #define _MM_MODEM_SIMPLE_H_
 
 #include <ModemManager.h>
-#include <mm-gdbus-modem.h>
 
+#include "mm-gdbus-modem.h"
+#include "mm-simple-connect-properties.h"
+#include "mm-simple-status.h"
 #include "mm-bearer.h"
 
 G_BEGIN_DECLS
diff --git a/libmm-glib/mm-modem-time.c b/libmm-glib/mm-modem-time.c
index a9cab084..c2d16d44 100644
--- a/libmm-glib/mm-modem-time.c
+++ b/libmm-glib/mm-modem-time.c
@@ -24,6 +24,7 @@
 #include <gio/gio.h>
 
 #include "mm-helpers.h"
+#include "mm-errors-types.h"
 #include "mm-modem-time.h"
 
 /**
diff --git a/libmm-glib/mm-modem-time.h b/libmm-glib/mm-modem-time.h
index 8718f014..76f346f3 100644
--- a/libmm-glib/mm-modem-time.h
+++ b/libmm-glib/mm-modem-time.h
@@ -25,7 +25,9 @@
 #define _MM_MODEM_TIME_H_
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+
+#include "mm-gdbus-modem.h"
+#include "mm-network-timezone.h"
 
 G_BEGIN_DECLS
 
diff --git a/libmm-glib/mm-modem.c b/libmm-glib/mm-modem.c
index 0f2f420a..6b9357a0 100644
--- a/libmm-glib/mm-modem.c
+++ b/libmm-glib/mm-modem.c
@@ -23,8 +23,8 @@
 
 #include <gio/gio.h>
 
-#include <mm-common-helpers.h>
-
+#include "mm-common-helpers.h"
+#include "mm-errors-types.h"
 #include "mm-helpers.h"
 #include "mm-modem.h"
 
diff --git a/libmm-glib/mm-modem.h b/libmm-glib/mm-modem.h
index 78306522..21436008 100644
--- a/libmm-glib/mm-modem.h
+++ b/libmm-glib/mm-modem.h
@@ -25,8 +25,9 @@
 #define _MM_MODEM_H_
 
 #include <ModemManager.h>
-#include <libmm-common.h>
 
+#include "mm-gdbus-modem.h"
+#include "mm-unlock-retries.h"
 #include "mm-sim.h"
 #include "mm-bearer.h"
 
diff --git a/libmm-glib/mm-object.c b/libmm-glib/mm-object.c
index 9cc281f7..8d549bc0 100644
--- a/libmm-glib/mm-object.c
+++ b/libmm-glib/mm-object.c
@@ -21,6 +21,7 @@
  * Copyright (C) 2012 Google, Inc.
  */
 
+#include "mm-errors-types.h"
 #include "mm-object.h"
 
 /**
diff --git a/libmm-glib/mm-object.h b/libmm-glib/mm-object.h
index f258c60a..26f7c0b9 100644
--- a/libmm-glib/mm-object.h
+++ b/libmm-glib/mm-object.h
@@ -25,8 +25,8 @@
 #define _MM_OBJECT_H_
 
 #include <ModemManager.h>
-#include <mm-gdbus-modem.h>
 
+#include "mm-gdbus-modem.h"
 #include "mm-modem.h"
 #include "mm-modem-3gpp.h"
 #include "mm-modem-3gpp-ussd.h"
diff --git a/libmm-glib/mm-sim.h b/libmm-glib/mm-sim.h
index 43b5d971..3743e728 100644
--- a/libmm-glib/mm-sim.h
+++ b/libmm-glib/mm-sim.h
@@ -25,7 +25,8 @@
 #define _MM_SIM_H_
 
 #include <ModemManager.h>
-#include <mm-gdbus-sim.h>
+
+#include "mm-gdbus-sim.h"
 
 G_BEGIN_DECLS
 
diff --git a/libmm-glib/mm-sms.h b/libmm-glib/mm-sms.h
index 6a252a94..c90e1191 100644
--- a/libmm-glib/mm-sms.h
+++ b/libmm-glib/mm-sms.h
@@ -24,7 +24,9 @@
 #define _MM_SMS_H_
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+
+#include "mm-gdbus-sms.h"
+#include "mm-sms-properties.h"
 
 G_BEGIN_DECLS
 
diff --git a/libmm-glib/tests/test-common-helpers.c b/libmm-glib/tests/test-common-helpers.c
index a54fe2d8..9b71e6b9 100644
--- a/libmm-glib/tests/test-common-helpers.c
+++ b/libmm-glib/tests/test-common-helpers.c
@@ -13,9 +13,9 @@
  * Copyright (C) 2012 Google, Inc.
  */
 
-#include <glib.h>
+#include <glib-object.h>
 
-#include <libmm-common.h>
+#include <libmm-glib.h>
 
 /********************* KEY VALUE PARSER TESTS *********************/
 
diff --git a/plugins/anydata/mm-plugin-anydata.c b/plugins/anydata/mm-plugin-anydata.c
index 3229ddc6..ffa3afdb 100644
--- a/plugins/anydata/mm-plugin-anydata.c
+++ b/plugins/anydata/mm-plugin-anydata.c
@@ -18,7 +18,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-log.h"
 #include "mm-plugin-anydata.h"
diff --git a/plugins/cinterion/mm-plugin-cinterion.c b/plugins/cinterion/mm-plugin-cinterion.c
index 22945d6c..d7ba3d62 100644
--- a/plugins/cinterion/mm-plugin-cinterion.c
+++ b/plugins/cinterion/mm-plugin-cinterion.c
@@ -24,7 +24,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-plugin-cinterion.h"
 #include "mm-broadband-modem-cinterion.h"
diff --git a/plugins/generic/mm-plugin-generic.c b/plugins/generic/mm-plugin-generic.c
index 6721fe04..1a48f033 100644
--- a/plugins/generic/mm-plugin-generic.c
+++ b/plugins/generic/mm-plugin-generic.c
@@ -25,7 +25,8 @@
 
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-plugin-generic.h"
 #include "mm-broadband-modem.h"
diff --git a/plugins/gobi/mm-plugin-gobi.c b/plugins/gobi/mm-plugin-gobi.c
index 9498d7a6..6f2280d0 100644
--- a/plugins/gobi/mm-plugin-gobi.c
+++ b/plugins/gobi/mm-plugin-gobi.c
@@ -17,7 +17,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-plugin-gobi.h"
 #include "mm-broadband-modem-gobi.h"
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c
index 685b5f8c..56adba53 100644
--- a/plugins/huawei/mm-broadband-modem-huawei.c
+++ b/plugins/huawei/mm-broadband-modem-huawei.c
@@ -23,10 +23,12 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include "ModemManager.h"
+#include <ModemManager.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
+
 #include "mm-log.h"
 #include "mm-errors-types.h"
-#include "mm-common-helpers.h"
 #include "mm-modem-helpers.h"
 #include "mm-base-modem-at.h"
 #include "mm-iface-modem.h"
diff --git a/plugins/huawei/mm-plugin-huawei.c b/plugins/huawei/mm-plugin-huawei.c
index f51a61ea..428ece5a 100644
--- a/plugins/huawei/mm-plugin-huawei.c
+++ b/plugins/huawei/mm-plugin-huawei.c
@@ -20,7 +20,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-serial-enums-types.h"
 #include "mm-log.h"
diff --git a/plugins/icera/mm-broadband-bearer-icera.c b/plugins/icera/mm-broadband-bearer-icera.c
index 2b9ebb35..0e5193f0 100644
--- a/plugins/icera/mm-broadband-bearer-icera.c
+++ b/plugins/icera/mm-broadband-bearer-icera.c
@@ -24,7 +24,8 @@
 #include <arpa/inet.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-broadband-bearer-icera.h"
 #include "mm-base-modem-at.h"
diff --git a/plugins/icera/mm-broadband-bearer-icera.h b/plugins/icera/mm-broadband-bearer-icera.h
index 058dbddb..4edd1896 100644
--- a/plugins/icera/mm-broadband-bearer-icera.h
+++ b/plugins/icera/mm-broadband-bearer-icera.h
@@ -22,7 +22,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-broadband-bearer.h"
 
diff --git a/plugins/iridium/mm-bearer-iridium.c b/plugins/iridium/mm-bearer-iridium.c
index 5f3c03cb..fe2013bd 100644
--- a/plugins/iridium/mm-bearer-iridium.c
+++ b/plugins/iridium/mm-bearer-iridium.c
@@ -21,7 +21,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-bearer-iridium.h"
 #include "mm-base-modem-at.h"
diff --git a/plugins/iridium/mm-bearer-iridium.h b/plugins/iridium/mm-bearer-iridium.h
index 191de0f8..3b2b06d2 100644
--- a/plugins/iridium/mm-bearer-iridium.h
+++ b/plugins/iridium/mm-bearer-iridium.h
@@ -21,7 +21,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-broadband-bearer.h"
 #include "mm-broadband-modem-iridium.h"
diff --git a/plugins/iridium/mm-plugin-iridium.c b/plugins/iridium/mm-plugin-iridium.c
index bbdec81f..3f504a24 100644
--- a/plugins/iridium/mm-plugin-iridium.c
+++ b/plugins/iridium/mm-plugin-iridium.c
@@ -23,7 +23,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-plugin-iridium.h"
 #include "mm-broadband-modem-iridium.h"
diff --git a/plugins/iridium/mm-sim-iridium.c b/plugins/iridium/mm-sim-iridium.c
index 519b6f90..9d77d785 100644
--- a/plugins/iridium/mm-sim-iridium.c
+++ b/plugins/iridium/mm-sim-iridium.c
@@ -22,7 +22,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-sim-iridium.h"
 
diff --git a/plugins/linktop/mm-broadband-modem-linktop.c b/plugins/linktop/mm-broadband-modem-linktop.c
index 74793b22..c34cf09a 100644
--- a/plugins/linktop/mm-broadband-modem-linktop.c
+++ b/plugins/linktop/mm-broadband-modem-linktop.c
@@ -23,7 +23,8 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "ModemManager.h"
 #include "mm-serial-parsers.h"
diff --git a/plugins/linktop/mm-plugin-linktop.c b/plugins/linktop/mm-plugin-linktop.c
index 61bbb0e4..8919d4b5 100644
--- a/plugins/linktop/mm-plugin-linktop.c
+++ b/plugins/linktop/mm-plugin-linktop.c
@@ -17,7 +17,9 @@
 
 #include <string.h>
 #include <gmodule.h>
-#include <libmm-common.h>
+
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-plugin-linktop.h"
 #include "mm-broadband-modem-linktop.h"
diff --git a/plugins/longcheer/mm-plugin-longcheer.c b/plugins/longcheer/mm-plugin-longcheer.c
index ddfb83f5..6f79d9f5 100644
--- a/plugins/longcheer/mm-plugin-longcheer.c
+++ b/plugins/longcheer/mm-plugin-longcheer.c
@@ -18,7 +18,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-log.h"
 #include "mm-modem-helpers.h"
diff --git a/plugins/mbm/mm-broadband-bearer-mbm.c b/plugins/mbm/mm-broadband-bearer-mbm.c
index 08c72846..ee9399db 100644
--- a/plugins/mbm/mm-broadband-bearer-mbm.c
+++ b/plugins/mbm/mm-broadband-bearer-mbm.c
@@ -32,7 +32,8 @@
 #include <arpa/inet.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-base-modem-at.h"
 #include "mm-broadband-bearer-mbm.h"
diff --git a/plugins/mbm/mm-broadband-bearer-mbm.h b/plugins/mbm/mm-broadband-bearer-mbm.h
index ca798008..dcbeeecf 100644
--- a/plugins/mbm/mm-broadband-bearer-mbm.h
+++ b/plugins/mbm/mm-broadband-bearer-mbm.h
@@ -28,7 +28,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-broadband-bearer.h"
 #include "mm-broadband-modem-mbm.h"
diff --git a/plugins/mbm/mm-plugin-mbm.c b/plugins/mbm/mm-plugin-mbm.c
index 09ba5ccd..d776265f 100644
--- a/plugins/mbm/mm-plugin-mbm.c
+++ b/plugins/mbm/mm-plugin-mbm.c
@@ -20,7 +20,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-log.h"
 #include "mm-plugin-mbm.h"
diff --git a/plugins/motorola/mm-plugin-motorola.c b/plugins/motorola/mm-plugin-motorola.c
index 203320f6..f25d9a29 100644
--- a/plugins/motorola/mm-plugin-motorola.c
+++ b/plugins/motorola/mm-plugin-motorola.c
@@ -18,7 +18,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-private-boxed-types.h"
 #include "mm-plugin-motorola.h"
diff --git a/plugins/nokia/mm-plugin-nokia-icera.c b/plugins/nokia/mm-plugin-nokia-icera.c
index b85e7d5f..3840bbac 100644
--- a/plugins/nokia/mm-plugin-nokia-icera.c
+++ b/plugins/nokia/mm-plugin-nokia-icera.c
@@ -17,7 +17,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-log.h"
 #include "mm-plugin-nokia-icera.h"
diff --git a/plugins/nokia/mm-plugin-nokia.c b/plugins/nokia/mm-plugin-nokia.c
index e65eca67..3a767737 100644
--- a/plugins/nokia/mm-plugin-nokia.c
+++ b/plugins/nokia/mm-plugin-nokia.c
@@ -18,7 +18,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-log.h"
 #include "mm-plugin-nokia.h"
diff --git a/plugins/nokia/mm-sim-nokia.c b/plugins/nokia/mm-sim-nokia.c
index c0ecfb14..6497b041 100644
--- a/plugins/nokia/mm-sim-nokia.c
+++ b/plugins/nokia/mm-sim-nokia.c
@@ -21,7 +21,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-sim-nokia.h"
 
diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.c b/plugins/novatel/mm-broadband-bearer-novatel-lte.c
index f0208ba8..e7e76f64 100644
--- a/plugins/novatel/mm-broadband-bearer-novatel-lte.c
+++ b/plugins/novatel/mm-broadband-bearer-novatel-lte.c
@@ -24,7 +24,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-base-modem-at.h"
 #include "mm-broadband-bearer-novatel-lte.h"
diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.h b/plugins/novatel/mm-broadband-bearer-novatel-lte.h
index 362c1306..b304789a 100644
--- a/plugins/novatel/mm-broadband-bearer-novatel-lte.h
+++ b/plugins/novatel/mm-broadband-bearer-novatel-lte.h
@@ -21,7 +21,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-broadband-bearer.h"
 #include "mm-broadband-modem-novatel-lte.h"
diff --git a/plugins/novatel/mm-sim-novatel-lte.c b/plugins/novatel/mm-sim-novatel-lte.c
index 9e185b81..b5bccdb0 100644
--- a/plugins/novatel/mm-sim-novatel-lte.c
+++ b/plugins/novatel/mm-sim-novatel-lte.c
@@ -21,7 +21,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 #include "mm-log.h"
 #include "mm-modem-helpers.h"
 #include "mm-base-modem-at.h"
diff --git a/plugins/option/mm-broadband-bearer-hso.c b/plugins/option/mm-broadband-bearer-hso.c
index 4f1c2509..999964ae 100644
--- a/plugins/option/mm-broadband-bearer-hso.c
+++ b/plugins/option/mm-broadband-bearer-hso.c
@@ -25,7 +25,8 @@
 #include <arpa/inet.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-base-modem-at.h"
 #include "mm-broadband-bearer-hso.h"
diff --git a/plugins/option/mm-broadband-bearer-hso.h b/plugins/option/mm-broadband-bearer-hso.h
index 24e7aa3b..584fc03d 100644
--- a/plugins/option/mm-broadband-bearer-hso.h
+++ b/plugins/option/mm-broadband-bearer-hso.h
@@ -19,7 +19,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-broadband-bearer.h"
 #include "mm-broadband-modem-hso.h"
diff --git a/plugins/option/mm-plugin-hso.c b/plugins/option/mm-plugin-hso.c
index 7e1a8ec2..ce80a122 100644
--- a/plugins/option/mm-plugin-hso.c
+++ b/plugins/option/mm-plugin-hso.c
@@ -18,7 +18,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-private-boxed-types.h"
 #include "mm-plugin-hso.h"
diff --git a/plugins/option/mm-plugin-option.c b/plugins/option/mm-plugin-option.c
index 7579f628..24b8a4bc 100644
--- a/plugins/option/mm-plugin-option.c
+++ b/plugins/option/mm-plugin-option.c
@@ -18,7 +18,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-private-boxed-types.h"
 #include "mm-plugin-option.h"
diff --git a/plugins/pantech/mm-plugin-pantech.c b/plugins/pantech/mm-plugin-pantech.c
index 843a315d..774a5b9d 100644
--- a/plugins/pantech/mm-plugin-pantech.c
+++ b/plugins/pantech/mm-plugin-pantech.c
@@ -16,7 +16,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-log.h"
 #include "mm-plugin-pantech.h"
diff --git a/plugins/sierra/mm-broadband-bearer-sierra.c b/plugins/sierra/mm-broadband-bearer-sierra.c
index a28feca7..4b20380f 100644
--- a/plugins/sierra/mm-broadband-bearer-sierra.c
+++ b/plugins/sierra/mm-broadband-bearer-sierra.c
@@ -24,7 +24,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-base-modem-at.h"
 #include "mm-broadband-bearer-sierra.h"
diff --git a/plugins/sierra/mm-broadband-bearer-sierra.h b/plugins/sierra/mm-broadband-bearer-sierra.h
index 20ebc26d..92a5acc8 100644
--- a/plugins/sierra/mm-broadband-bearer-sierra.h
+++ b/plugins/sierra/mm-broadband-bearer-sierra.h
@@ -21,7 +21,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-broadband-bearer.h"
 #include "mm-broadband-modem-sierra.h"
diff --git a/plugins/sierra/mm-plugin-sierra.c b/plugins/sierra/mm-plugin-sierra.c
index 1a583977..0817f9cc 100644
--- a/plugins/sierra/mm-plugin-sierra.c
+++ b/plugins/sierra/mm-plugin-sierra.c
@@ -19,7 +19,8 @@
 #include <stdlib.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-log.h"
 #include "mm-plugin-sierra.h"
diff --git a/plugins/sierra/mm-sim-sierra.c b/plugins/sierra/mm-sim-sierra.c
index 3c852a9d..1b741de6 100644
--- a/plugins/sierra/mm-sim-sierra.c
+++ b/plugins/sierra/mm-sim-sierra.c
@@ -23,7 +23,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 #include "mm-log.h"
 #include "mm-modem-helpers.h"
 #include "mm-base-modem-at.h"
diff --git a/plugins/simtech/mm-broadband-modem-simtech.c b/plugins/simtech/mm-broadband-modem-simtech.c
index 5d41c80f..359dde50 100644
--- a/plugins/simtech/mm-broadband-modem-simtech.c
+++ b/plugins/simtech/mm-broadband-modem-simtech.c
@@ -23,7 +23,8 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "ModemManager.h"
 #include "mm-modem-helpers.h"
diff --git a/plugins/simtech/mm-plugin-simtech.c b/plugins/simtech/mm-plugin-simtech.c
index 3b4f69f7..80eca362 100644
--- a/plugins/simtech/mm-plugin-simtech.c
+++ b/plugins/simtech/mm-plugin-simtech.c
@@ -17,7 +17,9 @@
 
 #include <string.h>
 #include <gmodule.h>
-#include <libmm-common.h>
+
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-plugin-simtech.h"
 #include "mm-broadband-modem-simtech.h"
diff --git a/plugins/wavecom/mm-broadband-modem-wavecom.c b/plugins/wavecom/mm-broadband-modem-wavecom.c
index ca9f29ca..e6afb730 100644
--- a/plugins/wavecom/mm-broadband-modem-wavecom.c
+++ b/plugins/wavecom/mm-broadband-modem-wavecom.c
@@ -23,7 +23,8 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "ModemManager.h"
 #include "mm-log.h"
diff --git a/plugins/wavecom/mm-plugin-wavecom.c b/plugins/wavecom/mm-plugin-wavecom.c
index 82eec9bc..80b6ed71 100644
--- a/plugins/wavecom/mm-plugin-wavecom.c
+++ b/plugins/wavecom/mm-plugin-wavecom.c
@@ -25,7 +25,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-plugin-wavecom.h"
 #include "mm-broadband-modem-wavecom.h"
diff --git a/plugins/x22x/mm-plugin-x22x.c b/plugins/x22x/mm-plugin-x22x.c
index 859fc4b4..09606907 100644
--- a/plugins/x22x/mm-plugin-x22x.c
+++ b/plugins/x22x/mm-plugin-x22x.c
@@ -18,7 +18,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-log.h"
 #include "mm-modem-helpers.h"
diff --git a/plugins/zte/mm-plugin-zte.c b/plugins/zte/mm-plugin-zte.c
index 241e5b2c..75c879cf 100644
--- a/plugins/zte/mm-plugin-zte.c
+++ b/plugins/zte/mm-plugin-zte.c
@@ -18,7 +18,8 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-log.h"
 #include "mm-plugin-zte.h"
diff --git a/src/mm-auth-provider-polkit.c b/src/mm-auth-provider-polkit.c
index d8438c68..c914e3d0 100644
--- a/src/mm-auth-provider-polkit.c
+++ b/src/mm-auth-provider-polkit.c
@@ -18,8 +18,6 @@
 
 #include <config.h>
 
-#include <libmm-common.h>
-
 #include "mm-log.h"
 #include "mm-auth-provider-polkit.h"
 
diff --git a/src/mm-bearer-list.c b/src/mm-bearer-list.c
index d5cb1e9a..43ccf8f7 100644
--- a/src/mm-bearer-list.c
+++ b/src/mm-bearer-list.c
@@ -23,7 +23,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-bearer-list.h"
 #include "mm-log.h"
diff --git a/src/mm-bearer-qmi.c b/src/mm-bearer-qmi.c
index 3d91ad74..ed1c79b3 100644
--- a/src/mm-bearer-qmi.c
+++ b/src/mm-bearer-qmi.c
@@ -21,8 +21,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
-#include <libqmi-glib.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-bearer-qmi.h"
 #include "mm-serial-enums-types.h"
diff --git a/src/mm-bearer-qmi.h b/src/mm-bearer-qmi.h
index 65a83d59..915e1708 100644
--- a/src/mm-bearer-qmi.h
+++ b/src/mm-bearer-qmi.h
@@ -21,7 +21,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-bearer.h"
 #include "mm-broadband-modem-qmi.h"
diff --git a/src/mm-bearer.c b/src/mm-bearer.c
index 9720fc87..61ccbf0e 100644
--- a/src/mm-bearer.c
+++ b/src/mm-bearer.c
@@ -23,7 +23,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-daemon-enums-types.h"
 #include "mm-iface-modem.h"
diff --git a/src/mm-bearer.h b/src/mm-bearer.h
index 1791b356..dfcf1724 100644
--- a/src/mm-bearer.h
+++ b/src/mm-bearer.h
@@ -21,7 +21,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-base-modem.h"
 
diff --git a/src/mm-broadband-bearer.c b/src/mm-broadband-bearer.c
index fa3ba664..341f9886 100644
--- a/src/mm-broadband-bearer.c
+++ b/src/mm-broadband-bearer.c
@@ -23,7 +23,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-broadband-bearer.h"
 #include "mm-iface-modem.h"
diff --git a/src/mm-broadband-bearer.h b/src/mm-broadband-bearer.h
index a891fbfd..2cce5708 100644
--- a/src/mm-broadband-bearer.h
+++ b/src/mm-broadband-bearer.h
@@ -21,7 +21,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-bearer.h"
 #include "mm-broadband-modem.h"
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 76eec7c9..f9131c6f 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -23,7 +23,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-base-modem-at.h"
 #include "mm-broadband-modem.h"
diff --git a/src/mm-charsets.c b/src/mm-charsets.c
index b6937cbd..023879be 100644
--- a/src/mm-charsets.c
+++ b/src/mm-charsets.c
@@ -20,7 +20,8 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-charsets.h"
 
diff --git a/src/mm-device.c b/src/mm-device.c
index d7ff1fb0..c5491008 100644
--- a/src/mm-device.c
+++ b/src/mm-device.c
@@ -20,7 +20,8 @@
 #include <string.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-device.h"
 #include "mm-plugin.h"
diff --git a/src/mm-iface-modem-3gpp-ussd.c b/src/mm-iface-modem-3gpp-ussd.c
index d92362c4..0763c08e 100644
--- a/src/mm-iface-modem-3gpp-ussd.c
+++ b/src/mm-iface-modem-3gpp-ussd.c
@@ -18,7 +18,8 @@
 #include <string.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-iface-modem.h"
 #include "mm-iface-modem-3gpp.h"
diff --git a/src/mm-iface-modem-3gpp-ussd.h b/src/mm-iface-modem-3gpp-ussd.h
index 3d99185f..9e1dc433 100644
--- a/src/mm-iface-modem-3gpp-ussd.h
+++ b/src/mm-iface-modem-3gpp-ussd.h
@@ -20,7 +20,8 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-at-serial-port.h"
 
diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c
index a3dcb86f..961495b2 100644
--- a/src/mm-iface-modem-3gpp.c
+++ b/src/mm-iface-modem-3gpp.c
@@ -17,7 +17,8 @@
 #include <string.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-iface-modem.h"
 #include "mm-iface-modem-location.h"
diff --git a/src/mm-iface-modem-3gpp.h b/src/mm-iface-modem-3gpp.h
index aaf727cd..d706f1aa 100644
--- a/src/mm-iface-modem-3gpp.h
+++ b/src/mm-iface-modem-3gpp.h
@@ -18,8 +18,8 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-at-serial-port.h"
 
diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c
index 2ba55a6a..ab4ea4ce 100644
--- a/src/mm-iface-modem-cdma.c
+++ b/src/mm-iface-modem-cdma.c
@@ -14,7 +14,8 @@
  */
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "libqcdm/src/commands.h"
 
diff --git a/src/mm-iface-modem-cdma.h b/src/mm-iface-modem-cdma.h
index 8fb334b4..37f81636 100644
--- a/src/mm-iface-modem-cdma.h
+++ b/src/mm-iface-modem-cdma.h
@@ -19,7 +19,8 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-at-serial-port.h"
 
diff --git a/src/mm-iface-modem-location.c b/src/mm-iface-modem-location.c
index b58f1e78..d6e897c2 100644
--- a/src/mm-iface-modem-location.c
+++ b/src/mm-iface-modem-location.c
@@ -15,7 +15,8 @@
  */
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-iface-modem.h"
 #include "mm-iface-modem-location.h"
diff --git a/src/mm-iface-modem-messaging.c b/src/mm-iface-modem-messaging.c
index 5861b373..d94f6c14 100644
--- a/src/mm-iface-modem-messaging.c
+++ b/src/mm-iface-modem-messaging.c
@@ -14,7 +14,8 @@
  */
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-iface-modem.h"
 #include "mm-iface-modem-messaging.h"
diff --git a/src/mm-iface-modem-simple.c b/src/mm-iface-modem-simple.c
index cfec2805..952a3c03 100644
--- a/src/mm-iface-modem-simple.c
+++ b/src/mm-iface-modem-simple.c
@@ -16,7 +16,8 @@
  */
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-bearer-list.h"
 #include "mm-sim.h"
diff --git a/src/mm-iface-modem-time.c b/src/mm-iface-modem-time.c
index f9c61d76..9a5d1d98 100644
--- a/src/mm-iface-modem-time.c
+++ b/src/mm-iface-modem-time.c
@@ -14,7 +14,8 @@
  */
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-iface-modem.h"
 #include "mm-iface-modem-time.h"
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c
index 41036a26..a4f44fdd 100644
--- a/src/mm-iface-modem.c
+++ b/src/mm-iface-modem.c
@@ -15,7 +15,8 @@
 
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-modem-helpers.h"
 #include "mm-iface-modem.h"
diff --git a/src/mm-iface-modem.h b/src/mm-iface-modem.h
index d4d9db4f..b5e7ddc4 100644
--- a/src/mm-iface-modem.h
+++ b/src/mm-iface-modem.h
@@ -19,7 +19,8 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-charsets.h"
 #include "mm-at-serial-port.h"
diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c
index 6692b6fd..fe30317c 100644
--- a/src/mm-modem-helpers.c
+++ b/src/mm-modem-helpers.c
@@ -25,7 +25,8 @@
 #include <arpa/inet.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-modem-helpers.h"
 #include "mm-log.h"
diff --git a/src/mm-sim-qmi.c b/src/mm-sim-qmi.c
index c2f28c63..63111b54 100644
--- a/src/mm-sim-qmi.c
+++ b/src/mm-sim-qmi.c
@@ -21,7 +21,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-log.h"
 #include "mm-sim-qmi.h"
diff --git a/src/mm-sim.c b/src/mm-sim.c
index 6503d342..8f50edd7 100644
--- a/src/mm-sim.c
+++ b/src/mm-sim.c
@@ -23,7 +23,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-iface-modem.h"
 #include "mm-sim.h"
diff --git a/src/mm-sms-list.c b/src/mm-sms-list.c
index a34bd679..258470eb 100644
--- a/src/mm-sms-list.c
+++ b/src/mm-sms-list.c
@@ -21,7 +21,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-iface-modem-messaging.h"
 #include "mm-marshal.h"
diff --git a/src/mm-sms-part.c b/src/mm-sms-part.c
index 7cac9b88..f3957d05 100644
--- a/src/mm-sms-part.c
+++ b/src/mm-sms-part.c
@@ -20,8 +20,8 @@
 #include <glib.h>
 
 #include <ModemManager.h>
-#include <mm-errors-types.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-sms-part.h"
 #include "mm-charsets.h"
diff --git a/src/mm-sms-qmi.c b/src/mm-sms-qmi.c
index afa307f8..2b167ed2 100644
--- a/src/mm-sms-qmi.c
+++ b/src/mm-sms-qmi.c
@@ -21,7 +21,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-modem-helpers-qmi.h"
 #include "mm-iface-modem-messaging.h"
diff --git a/src/mm-sms-qmi.h b/src/mm-sms-qmi.h
index d6871d3f..bceb300f 100644
--- a/src/mm-sms-qmi.h
+++ b/src/mm-sms-qmi.h
@@ -21,7 +21,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-sms.h"
 
diff --git a/src/mm-sms.c b/src/mm-sms.c
index b0f9a11a..c540692e 100644
--- a/src/mm-sms.c
+++ b/src/mm-sms.c
@@ -23,7 +23,8 @@
 #include <ctype.h>
 
 #include <ModemManager.h>
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-broadband-modem.h"
 #include "mm-iface-modem.h"
diff --git a/src/mm-sms.h b/src/mm-sms.h
index 0f96e380..0a3339f8 100644
--- a/src/mm-sms.h
+++ b/src/mm-sms.h
@@ -21,7 +21,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-sms-part.h"
 #include "mm-base-modem.h"
diff --git a/src/tests/test-sms-part.c b/src/tests/test-sms-part.c
index f052913c..c23497b1 100644
--- a/src/tests/test-sms-part.c
+++ b/src/tests/test-sms-part.c
@@ -20,7 +20,8 @@
 #include <stdio.h>
 #include <locale.h>
 
-#include <libmm-common.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #include "mm-sms-part.h"
 #include "mm-log.h"