Remove all uses of modem.h

diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c
index 01cbbab..fc255b3 100644 (file)
--- a/drivers/atmodem/atmodem.c
+++ b/drivers/atmodem/atmodem.c
@@ -31,11 +31,11 @@
 #include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/dbus.h>
+#include <ofono/modem.h>
 
 #include "driver.h"
 
 #include "at.h"
-#include "modem.h"
 #include "session.h"
 
 #define AT_MANAGER_INTERFACE "org.ofono.at.Manager"

diff --git a/src/call-barring.c b/src/call-barring.c
index 6e78db4..36deaf7 100644 (file)
--- a/src/call-barring.c
+++ b/src/call-barring.c
@@ -35,7 +35,6 @@
 
 #include "driver.h"
 #include "common.h"
-#include "modem.h"
 #include "cssn.h"
 #include "ussd.h"
 

diff --git a/src/call-forwarding.c b/src/call-forwarding.c
index 5676881..d001bca 100644 (file)
--- a/src/call-forwarding.c
+++ b/src/call-forwarding.c
@@ -32,7 +32,6 @@
 
 #include "ofono.h"
 
-#include "modem.h"
 #include "driver.h"
 #include "common.h"
 #include "ussd.h"

diff --git a/src/call-meter.c b/src/call-meter.c
index 4657fe4..421fe0c 100644 (file)
--- a/src/call-meter.c
+++ b/src/call-meter.c
@@ -34,7 +34,6 @@
 
 #include "driver.h"
 #include "common.h"
-#include "modem.h"
 
 #define CALL_METER_INTERFACE "org.ofono.CallMeter"
 

diff --git a/src/call-settings.c b/src/call-settings.c
index 8601992..18e8189 100644 (file)
--- a/src/call-settings.c
+++ b/src/call-settings.c
@@ -34,7 +34,6 @@
 
 #include "driver.h"
 #include "common.h"
-#include "modem.h"
 #include "ussd.h"
 
 #define CALL_SETTINGS_INTERFACE "org.ofono.CallSettings"

diff --git a/src/cssn.c b/src/cssn.c
index e8b681a..1e5e335 100644 (file)
--- a/src/cssn.c
+++ b/src/cssn.c
@@ -31,7 +31,6 @@
 #include "ofono.h"
 
 #include "driver.h"
-#include "modem.h"
 #include "common.h"
 #include "cssn.h"
 

diff --git a/src/history.c b/src/history.c
index 4f1284b..bfc82b4 100644 (file)
--- a/src/history.c
+++ b/src/history.c
@@ -30,8 +30,6 @@
 
 #include "ofono.h"
 
-#include "modem.h"
-
 static GSList *history_drivers = NULL;
 
 static struct ofono_history_context *history_context_create(

diff --git a/src/manager.c b/src/manager.c
index 8a1bd04..07df0e0 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -29,7 +29,6 @@
 
 #include "ofono.h"
 
-#include "modem.h"
 #include "driver.h"
 
 static DBusMessage *manager_get_properties(DBusConnection *conn,

diff --git a/src/modem.c b/src/modem.c
index 5b19b93..f06639a 100644 (file)
--- a/src/modem.c
+++ b/src/modem.c
@@ -31,7 +31,6 @@
 
 #include "ofono.h"
 
-#include "modem.h"
 #include "driver.h"
 #include "common.h"
 #include "cssn.h"

diff --git a/src/network.c b/src/network.c
index 312f348..8135fd2 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -31,7 +31,6 @@
 
 #include "ofono.h"
 
-#include "modem.h"
 #include "driver.h"
 #include "common.h"
 #include "sim.h"

diff --git a/src/phonebook.c b/src/phonebook.c
index cfdf3d8..546c80f 100644 (file)
--- a/src/phonebook.c
+++ b/src/phonebook.c
@@ -34,11 +34,9 @@
 
 #include "ofono.h"
 
-#include "modem.h"
 #include "driver.h"
 #include "common.h"
 
-
 #define PHONEBOOK_INTERFACE "org.ofono.Phonebook"
 #define LEN_MAX 128
 #define TYPE_INTERNATIONAL 145

diff --git a/src/sim.c b/src/sim.c
index 73ed7e4..bdc0728 100644 (file)
--- a/src/sim.c
+++ b/src/sim.c
@@ -36,7 +36,6 @@
 
 #include "ofono.h"
 
-#include "modem.h"
 #include "driver.h"
 #include "common.h"
 #include "util.h"

diff --git a/src/sms.c b/src/sms.c
index 87b6dcd..3a471e3 100644 (file)
--- a/src/sms.c
+++ b/src/sms.c
@@ -31,7 +31,6 @@
 
 #include "ofono.h"
 
-#include "modem.h"
 #include "driver.h"
 #include "common.h"
 #include "util.h"

diff --git a/src/ussd.c b/src/ussd.c
index b0d9285..6e31cb3 100644 (file)
--- a/src/ussd.c
+++ b/src/ussd.c
@@ -32,7 +32,6 @@
 
 #include "ofono.h"
 
-#include "modem.h"
 #include "driver.h"
 #include "common.h"
 #include "ussd.h"

diff --git a/src/voicecall.c b/src/voicecall.c
index f71e906..a06797d 100644 (file)
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -34,7 +34,6 @@
 
 #include "driver.h"
 #include "common.h"
-#include "modem.h"
 #include "cssn.h"
 
 #define VOICECALL_MANAGER_INTERFACE "org.ofono.VoiceCallManager"