Remove common code in favor of new libimobiledevice-glue

13 files changed, 16 insertions, 13 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 96fe963..183a745 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,7 @@ AM_CFLAGS = \
         $(GLOBAL_CFLAGS) \
         $(libusbmuxd_CFLAGS) \
         $(libplist_CFLAGS) \
+        $(limd_glue_CFLAGS) \
         $(ssl_lib_CFLAGS) \
         $(LFS_CFLAGS) \
         $(PTHREAD_CFLAGS)
@@ -13,6 +14,7 @@ AM_CFLAGS = \
 AM_LDFLAGS = \
         $(libusbmuxd_LIBS) \
         $(libplist_LIBS) \
+        $(limd_glue_LIBS) \
         $(ssl_lib_LIBS) \
         $(PTHREAD_LIBS)
 
diff --git a/src/afc.h b/src/afc.h
index 3e4ef67..6bfdf56 100644
--- a/src/afc.h
+++ b/src/afc.h
@@ -28,7 +28,7 @@
 #include "libimobiledevice/afc.h"
 #include "service.h"
 #include "endianness.h"
-#include "common/thread.h"
+#include <libimobiledevice-glue/thread.h>
 
 #define AFC_MAGIC "CFA6LPAA"
 #define AFC_MAGIC_LEN (8)
diff --git a/src/companion_proxy.c b/src/companion_proxy.c
index f09b416..92bc7f1 100644
--- a/src/companion_proxy.c
+++ b/src/companion_proxy.c
@@ -29,7 +29,6 @@
 #include "companion_proxy.h"
 #include "lockdown.h"
 #include "common/debug.h"
-#include "common/thread.h"
 
 /**
  * Convert a property_list_service_error_t value to a companion_proxy_error_t value.
diff --git a/src/companion_proxy.h b/src/companion_proxy.h
index 0314b67..0226640 100644
--- a/src/companion_proxy.h
+++ b/src/companion_proxy.h
@@ -24,7 +24,7 @@
 
 #include "libimobiledevice/companion_proxy.h"
 #include "property_list_service.h"
-#include "common/thread.h"
+#include <libimobiledevice-glue/thread.h>
 
 struct companion_proxy_client_private {
         property_list_service_client_t parent;
diff --git a/src/debugserver.c b/src/debugserver.c
index 1774087..b6a8b62 100644
--- a/src/debugserver.c
+++ b/src/debugserver.c
@@ -29,10 +29,11 @@
 #define __USE_GNU 1
 #include <stdio.h>
 
+#include <libimobiledevice-glue/utils.h>
+
 #include "debugserver.h"
 #include "lockdown.h"
 #include "common/debug.h"
-#include "common/utils.h"
 #include "asprintf.h"
 
 /**
diff --git a/src/idevice.c b/src/idevice.c
index 869ecac..4545bfa 100644
--- a/src/idevice.c
+++ b/src/idevice.c
@@ -48,10 +48,11 @@
 #error No supported TLS/SSL library enabled
 #endif
 
+#include <libimobiledevice-glue/socket.h>
+#include <libimobiledevice-glue/thread.h>
+
 #include "idevice.h"
 #include "common/userpref.h"
-#include "common/socket.h"
-#include "common/thread.h"
 #include "common/debug.h"
 
 #ifdef WIN32
diff --git a/src/installation_proxy.h b/src/installation_proxy.h
index 66dd5d0..033bdef 100644
--- a/src/installation_proxy.h
+++ b/src/installation_proxy.h
@@ -25,7 +25,7 @@
 
 #include "libimobiledevice/installation_proxy.h"
 #include "property_list_service.h"
-#include "common/thread.h"
+#include <libimobiledevice-glue/thread.h>
 
 struct instproxy_client_private {
         property_list_service_client_t parent;
diff --git a/src/lockdown.c b/src/lockdown.c
index 8fc2c49..70db834 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -34,13 +34,13 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <plist/plist.h>
+#include <libimobiledevice-glue/utils.h>
 
 #include "property_list_service.h"
 #include "lockdown.h"
 #include "idevice.h"
 #include "common/debug.h"
 #include "common/userpref.h"
-#include "common/utils.h"
 #include "asprintf.h"
 
 #ifdef WIN32
diff --git a/src/mobile_image_mounter.h b/src/mobile_image_mounter.h
index e9754e4..55c9cf2 100644
--- a/src/mobile_image_mounter.h
+++ b/src/mobile_image_mounter.h
@@ -24,7 +24,7 @@
 
 #include "libimobiledevice/mobile_image_mounter.h"
 #include "property_list_service.h"
-#include "common/thread.h"
+#include <libimobiledevice-glue/thread.h>
 
 struct mobile_image_mounter_client_private {
         property_list_service_client_t parent;
diff --git a/src/notification_proxy.h b/src/notification_proxy.h
index f641e25..ea85149 100644
--- a/src/notification_proxy.h
+++ b/src/notification_proxy.h
@@ -24,7 +24,7 @@
 
 #include "libimobiledevice/notification_proxy.h"
 #include "property_list_service.h"
-#include "common/thread.h"
+#include <libimobiledevice-glue/thread.h>
 
 struct np_client_private {
         property_list_service_client_t parent;
diff --git a/src/preboard.h b/src/preboard.h
index c5143a9..61263fc 100644
--- a/src/preboard.h
+++ b/src/preboard.h
@@ -24,7 +24,7 @@
 
 #include "libimobiledevice/preboard.h"
 #include "property_list_service.h"
-#include "common/thread.h"
+#include <libimobiledevice-glue/thread.h>
 
 struct preboard_client_private {
         property_list_service_client_t parent;
diff --git a/src/sbservices.h b/src/sbservices.h
index 6c047ce..39d822c 100644
--- a/src/sbservices.h
+++ b/src/sbservices.h
@@ -24,7 +24,7 @@
 
 #include "libimobiledevice/sbservices.h"
 #include "property_list_service.h"
-#include "common/thread.h"
+#include <libimobiledevice-glue/thread.h>
 
 struct sbservices_client_private {
         property_list_service_client_t parent;
diff --git a/src/syslog_relay.h b/src/syslog_relay.h
index 3e48fa4..86d798e 100644
--- a/src/syslog_relay.h
+++ b/src/syslog_relay.h
@@ -24,7 +24,7 @@
 
 #include "libimobiledevice/syslog_relay.h"
 #include "service.h"
-#include "common/thread.h"
+#include <libimobiledevice-glue/thread.h>
 
 struct syslog_relay_client_private {
         service_client_t parent;