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.

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"

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"

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,

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

docs/reference/libmm-glib/libmm-glib-docs.xml

@@ -48,13 +48,6 @@
     </legalnotice>
   </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>
 
@@ -66,20 +59,48 @@
     <chapter>
       <title>The Modem object</title>
       <xi:include href="xml/mm-object.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-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-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>

libmm-glib/libmm-common.h

@@ -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_ */

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 */
+
+#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_ */

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
 

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"
 

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
 

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"
 
 /**

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
 

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"
 
 /**

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
 

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"
 
 /**

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
 

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"
 
 /**

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
 

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"
 
 /**

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
 

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"
 
 /**

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"
 

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"
 
 /**

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

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"
 
 /**

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
 

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"
 

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"
 

libmm-glib/mm-object.c

@@ -21,6 +21,7 @@
  * Copyright (C) 2012 Google, Inc.
  */
 
+#include "mm-errors-types.h"
 #include "mm-object.h"
 
 /**

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"

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
 

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
 

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 *********************/
 

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"
 

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"

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"

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"

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"
 

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"

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"

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"
 

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"

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"
 

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"