From c39f08af9aca0f8b86c713345e2055e408b560dd Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Tue, 23 Mar 2010 06:01:02 +0100
Subject: Remove unused and fix some includes

---
 configure.ac                | 2 +-
 src/afc.c                   | 1 +
 src/afc.h                   | 4 ----
 src/idevice.c               | 1 -
 src/idevice.h               | 1 -
 src/installation_proxy.c    | 1 -
 src/lockdown.c              | 2 --
 src/lockdown.h              | 1 -
 src/mobile_image_mounter.c  | 2 --
 src/mobilebackup.c          | 1 -
 src/mobilesync.c            | 1 -
 src/notification_proxy.c    | 2 --
 src/property_list_service.c | 3 +--
 src/sbservices.c            | 1 -
 src/screenshotr.c           | 1 -
 15 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index e7e2cb4..aaad326 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_CHECK_LIB(gcrypt, gcry_control, [AC_SUBST(libgcrypt_LIBS,[-lgcrypt])], ["libg
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h stdint.h stdlib.h string.h gcrypt.h])
+AC_CHECK_HEADERS([netinet/in.h stdint.h stdlib.h string.h gcrypt.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
diff --git a/src/afc.c b/src/afc.c
index 5def00c..555a574 100644
--- a/src/afc.c
+++ b/src/afc.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 
 #include "afc.h"
 #include "idevice.h"
diff --git a/src/afc.h b/src/afc.h
index cde85b4..15ecbd8 100644
--- a/src/afc.h
+++ b/src/afc.h
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
  */
 
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
 #include <glib.h>
 #include <stdint.h>
 
diff --git a/src/idevice.c b/src/idevice.c
index b72b623..4917b42 100644
--- a/src/idevice.c
+++ b/src/idevice.c
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <arpa/inet.h>
 
 #include <usbmuxd.h>
 #include <gnutls/gnutls.h>
diff --git a/src/idevice.h b/src/idevice.h
index 5d83e4c..a4ce251 100644
--- a/src/idevice.h
+++ b/src/idevice.h
@@ -21,7 +21,6 @@
 #ifndef IDEVICE_H
 #define IDEVICE_H
 
-#include <plist/plist.h>
 #include <gnutls/gnutls.h>
 
 #include "libimobiledevice/libimobiledevice.h"
diff --git a/src/installation_proxy.c b/src/installation_proxy.c
index 40e4bc5..c26318a 100644
--- a/src/installation_proxy.c
+++ b/src/installation_proxy.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <arpa/inet.h>
 #include <plist/plist.h>
 
 #include "installation_proxy.h"
diff --git a/src/lockdown.c b/src/lockdown.c
index 515c58e..60b57b1 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <arpa/inet.h>
-#include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
diff --git a/src/lockdown.h b/src/lockdown.h
index bf3ac38..a25e59d 100644
--- a/src/lockdown.h
+++ b/src/lockdown.h
@@ -23,7 +23,6 @@
 #define LOCKDOWND_H
 
 #include <gnutls/gnutls.h>
-#include <string.h>
 
 #include "libimobiledevice/lockdown.h"
 #include "property_list_service.h"
diff --git a/src/mobile_image_mounter.c b/src/mobile_image_mounter.c
index 9c50084..367bee0 100644
--- a/src/mobile_image_mounter.c
+++ b/src/mobile_image_mounter.c
@@ -20,10 +20,8 @@
  */
 
 #include <string.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <arpa/inet.h>
 #include <plist/plist.h>
 
 #include "mobile_image_mounter.h"
diff --git a/src/mobilebackup.c b/src/mobilebackup.c
index 15da0a1..0005284 100644
--- a/src/mobilebackup.c
+++ b/src/mobilebackup.c
@@ -22,7 +22,6 @@
 #include <plist/plist.h>
 #include <string.h>
 #include <stdlib.h>
-#include <arpa/inet.h>
 
 #include "mobilebackup.h"
 #include "device_link_service.h"
diff --git a/src/mobilesync.c b/src/mobilesync.c
index 47fcfdf..b5b9453 100644
--- a/src/mobilesync.c
+++ b/src/mobilesync.c
@@ -22,7 +22,6 @@
 #include <plist/plist.h>
 #include <string.h>
 #include <stdlib.h>
-#include <arpa/inet.h>
 
 #include "mobilesync.h"
 #include "device_link_service.h"
diff --git a/src/notification_proxy.c b/src/notification_proxy.c
index 7d84e30..c0f718e 100644
--- a/src/notification_proxy.c
+++ b/src/notification_proxy.c
@@ -20,10 +20,8 @@
  */
 
 #include <string.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <arpa/inet.h>
 #include <plist/plist.h>
 
 #include "notification_proxy.h"
diff --git a/src/property_list_service.c b/src/property_list_service.c
index 56e735b..eaf0b30 100644
--- a/src/property_list_service.c
+++ b/src/property_list_service.c
@@ -20,8 +20,7 @@
  */
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <arpa/inet.h>
+#include <netinet/in.h>
 
 #include "property_list_service.h"
 #include "idevice.h"
diff --git a/src/sbservices.c b/src/sbservices.c
index 076e25d..2678e24 100644
--- a/src/sbservices.c
+++ b/src/sbservices.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <arpa/inet.h>
 #include <plist/plist.h>
 
 #include "sbservices.h"
diff --git a/src/screenshotr.c b/src/screenshotr.c
index 380d28c..0c4c9b2 100644
--- a/src/screenshotr.c
+++ b/src/screenshotr.c
@@ -22,7 +22,6 @@
 #include <plist/plist.h>
 #include <string.h>
 #include <stdlib.h>
-#include <arpa/inet.h>
 
 #include "screenshotr.h"
 #include "device_link_service.h"
-- 
cgit v1.1-32-gdbae