build: fix header dependencies

We shouldn't depend on any header file from the previous implementation.

11 files changed, 12 insertions, 10 deletions

diff --git a/plugins/cinterion/mm-plugin-cinterion.c b/plugins/cinterion/mm-plugin-cinterion.c
index 28de08f1..d6aa54cd 100644
--- a/plugins/cinterion/mm-plugin-cinterion.c
+++ b/plugins/cinterion/mm-plugin-cinterion.c
@@ -24,9 +24,10 @@
 #include <string.h>
 #include <gmodule.h>
 
+#include <libmm-common.h>
+
 #include "mm-plugin-cinterion.h"
 #include "mm-broadband-modem-cinterion.h"
-#include "mm-errors-types.h"
 #include "mm-log.h"
 
 G_DEFINE_TYPE (MMPluginCinterion, mm_plugin_cinterion, MM_TYPE_PLUGIN_BASE)
diff --git a/plugins/generic/mm-plugin-generic.c b/plugins/generic/mm-plugin-generic.c
index d167ec06..41c56e25 100644
--- a/plugins/generic/mm-plugin-generic.c
+++ b/plugins/generic/mm-plugin-generic.c
@@ -26,7 +26,7 @@
 
 #include <gmodule.h>
 
-#include <mm-errors-types.h>
+#include <libmm-common.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 eef27e9c..690b5210 100644
--- a/plugins/gobi/mm-plugin-gobi.c
+++ b/plugins/gobi/mm-plugin-gobi.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <mm-errors-types.h>
+#include <libmm-common.h>
 
 #include "mm-plugin-gobi.h"
 #include "mm-broadband-modem-gobi.h"
diff --git a/plugins/iridium/mm-plugin-iridium.c b/plugins/iridium/mm-plugin-iridium.c
index ff522728..b461ca61 100644
--- a/plugins/iridium/mm-plugin-iridium.c
+++ b/plugins/iridium/mm-plugin-iridium.c
@@ -27,9 +27,10 @@
 #include <string.h>
 #include <gmodule.h>
 
+#include <libmm-common.h>
+
 #include "mm-plugin-iridium.h"
 #include "mm-broadband-modem-iridium.h"
-#include "mm-errors-types.h"
 #include "mm-private-boxed-types.h"
 #include "mm-log.h"
 
diff --git a/plugins/motorola/mm-plugin-motorola.c b/plugins/motorola/mm-plugin-motorola.c
index 4a35d34c..ed26430f 100644
--- a/plugins/motorola/mm-plugin-motorola.c
+++ b/plugins/motorola/mm-plugin-motorola.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <mm-errors-types.h>
+#include <libmm-common.h>
 
 #include "mm-private-boxed-types.h"
 #include "mm-plugin-motorola.h"
diff --git a/plugins/nokia/mm-plugin-nokia.c b/plugins/nokia/mm-plugin-nokia.c
index 343921a3..1e23c444 100644
--- a/plugins/nokia/mm-plugin-nokia.c
+++ b/plugins/nokia/mm-plugin-nokia.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <mm-errors-types.h>
+#include <libmm-common.h>
 
 #include "mm-plugin-nokia.h"
 #include "mm-broadband-modem-nokia.h"
diff --git a/plugins/option/mm-plugin-option.c b/plugins/option/mm-plugin-option.c
index 4b0561fd..24aed6c0 100644
--- a/plugins/option/mm-plugin-option.c
+++ b/plugins/option/mm-plugin-option.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <mm-errors-types.h>
+#include <libmm-common.h>
 
 #include "mm-private-boxed-types.h"
 #include "mm-plugin-option.h"
diff --git a/plugins/option/mm-plugin-option.h b/plugins/option/mm-plugin-option.h
index 3d096c62..5792c78d 100644
--- a/plugins/option/mm-plugin-option.h
+++ b/plugins/option/mm-plugin-option.h
@@ -19,7 +19,6 @@
 #define MM_PLUGIN_OPTION_H
 
 #include "mm-plugin-base.h"
-#include "mm-generic-gsm.h"
 
 #define MM_TYPE_PLUGIN_OPTION            (mm_plugin_option_get_type ())
 #define MM_PLUGIN_OPTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_OPTION, MMPluginOption))
diff --git a/src/mm-base-modem.h b/src/mm-base-modem.h
index cf4f038e..214a51a7 100644
--- a/src/mm-base-modem.h
+++ b/src/mm-base-modem.h
@@ -23,10 +23,11 @@
 
 #include <mm-gdbus-modem.h>
 
+#include "mm-auth-request.h"
+#include "mm-auth-provider.h"
 #include "mm-port.h"
 #include "mm-at-serial-port.h"
 #include "mm-qcdm-serial-port.h"
-#include "mm-modem.h"
 
 #define MM_TYPE_BASE_MODEM            (mm_base_modem_get_type ())
 #define MM_BASE_MODEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BASE_MODEM, MMBaseModem))
diff --git a/src/mm-modem-helpers.h b/src/mm-modem-helpers.h
index 7231c8f4..92b883e1 100644
--- a/src/mm-modem-helpers.h
+++ b/src/mm-modem-helpers.h
@@ -19,7 +19,6 @@
 
 #include <ModemManager.h>
 
-#include "mm-modem-cdma.h"
 #include "mm-charsets.h"
 
 #define MM_MODEM_CAPABILITY_3GPP_LTE    \
diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c
index 07878412..a5f13970 100644
--- a/src/tests/test-modem-helpers.c
+++ b/src/tests/test-modem-helpers.c
@@ -14,6 +14,7 @@
  */
 
 #include <glib.h>
+#include <glib-object.h>
 #include <string.h>
 
 #include "mm-modem-helpers.h"