rilmodem: Don't include grilunsol.h

drivers/rilmodem/gprs-context.c

@@ -38,9 +38,9 @@
 #include <ofono/gprs-context.h>
 #include <ofono/types.h>
 
-#include "ofono.h"
+#include <gril/gril.h>
 
-#include "grilunsol.h"
+#include "ofono.h"
 
 #include "rilmodem.h"
 

drivers/rilmodem/gprs.c

@@ -39,12 +39,12 @@
 #include <ofono/gprs.h>
 #include <ofono/types.h>
 
-#include "gril.h"
-#include "grilutil.h"
+#include <gril/gril.h>
+#include <gril/grilutil.h>
+
 #include "common.h"
 #include "rilmodem.h"
 
-#include "grilunsol.h"
 #include "gprs.h"
 
 /* Time between get data status retries */

drivers/rilmodem/network-registration.c

@@ -37,11 +37,10 @@
 #include <ofono/modem.h>
 #include <ofono/netreg.h>
 
-#include "common.h"
-#include "gril.h"
-#include "rilmodem.h"
+#include <gril/gril.h>
 
-#include "grilunsol.h"
+#include "common.h"
+#include "rilmodem.h"
 
 struct netreg_data {
 	GRil *ril;

drivers/rilmodem/sim.c

@@ -37,19 +37,16 @@
 #include <ofono/modem.h>
 #include <ofono/sim.h>
 
+#include <gril/gril.h>
+#include <gril/grilutil.h>
+
 #include "ofono.h"
 
 #include "simutil.h"
 #include "util.h"
 
-#include "gril.h"
-#include "grilutil.h"
-#include "parcel.h"
-#include "ril_constants.h"
 #include "rilmodem.h"
 
-#include "grilunsol.h"
-
 #include <drivers/infineonmodem/infineon_constants.h>
 
 /* Number of passwords in EPINC response */

drivers/rilmodem/voicecall.c

@@ -39,8 +39,7 @@
 #include <ofono/modem.h>
 #include <ofono/voicecall.h>
 
-#include "gril.h"
-#include "grilunsol.h"
+#include <gril/gril.h>
 
 #include "common.h"
 #include "rilmodem.h"