15 files changed, 17 insertions, 18 deletions

diff --git a/dev/iphoneclient.c b/dev/iphoneclient.c
index 5bd0e6b..dbdf0f1 100644
--- a/dev/iphoneclient.c
+++ b/dev/iphoneclient.c
@@ -29,7 +29,6 @@
 #include <libiphone/lockdown.h>
 #include <libiphone/afc.h>
 #include <libiphone/notification_proxy.h>
-#include "../src/utils.h"
 
 static void notifier(const char *notification)
 {
diff --git a/src/AFC.c b/src/AFC.c
index 956c8fc..fe8e1af 100644
--- a/src/AFC.c
+++ b/src/AFC.c
@@ -25,7 +25,7 @@
 
 #include "AFC.h"
 #include "iphone.h"
-#include "utils.h"
+#include "debug.h"
 
 // This is the maximum size an AFC data packet can be
 static const int MAXIMUM_PACKET_SIZE = (2 << 15);
diff --git a/src/InstallationProxy.c b/src/InstallationProxy.c
index 34777d1..8d994c6 100644
--- a/src/InstallationProxy.c
+++ b/src/InstallationProxy.c
@@ -27,7 +27,7 @@
 
 #include "InstallationProxy.h"
 #include "property_list_service.h"
-#include "utils.h"
+#include "debug.h"
 
 struct instproxy_status_data {
         instproxy_client_t client;
diff --git a/src/Makefile.am b/src/Makefile.am
index bc98de4..bb7252e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,5 +13,5 @@ libiphone_la_SOURCES = iphone.c iphone.h \
                        InstallationProxy.c InstallationProxy.h\
                        SBServices.c SBServices.h\
                        userpref.c userpref.h\
-                       utils.c utils.h\
+                       debug.c debug.h\
                        MobileSync.c MobileSync.h
diff --git a/src/MobileSync.c b/src/MobileSync.c
index 5102619..e904fcc 100644
--- a/src/MobileSync.c
+++ b/src/MobileSync.c
@@ -26,7 +26,7 @@
 
 #include "MobileSync.h"
 #include "device_link_service.h"
-#include "utils.h"
+#include "debug.h"
 
 #define MSYNC_VERSION_INT1 100
 #define MSYNC_VERSION_INT2 100
diff --git a/src/NotificationProxy.c b/src/NotificationProxy.c
index ef2063c..1b13a29 100644
--- a/src/NotificationProxy.c
+++ b/src/NotificationProxy.c
@@ -28,7 +28,7 @@
 
 #include "NotificationProxy.h"
 #include "property_list_service.h"
-#include "utils.h"
+#include "debug.h"
 
 struct np_thread {
         np_client_t client;
diff --git a/src/SBServices.c b/src/SBServices.c
index 2a724d1..2b65785 100644
--- a/src/SBServices.c
+++ b/src/SBServices.c
@@ -27,7 +27,7 @@
 
 #include "SBServices.h"
 #include "property_list_service.h"
-#include "utils.h"
+#include "debug.h"
 
 /** Locks an sbservices client, done for thread safety stuff.
  *
diff --git a/src/utils.c b/src/debug.c
index 3c08351..b5f74ad 100644
--- a/src/utils.c
+++ b/src/debug.c
@@ -1,5 +1,5 @@
 /*
- * utils.c
+ * debug.c
  * contains utilitary methos for logging and debugging
  *
  * Copyright (c) 2008 Jonathan Beck All Rights Reserved.
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "utils.h"
+#include "debug.h"
 #include "libiphone/libiphone.h"
 
 int toto_debug = 0;
diff --git a/src/utils.h b/src/debug.h
index c99730a..96844dd 100644
--- a/src/utils.h
+++ b/src/debug.h
@@ -1,5 +1,5 @@
 /*
- * utils.h
+ * debug.h
  * contains utilitary methos for logging and debugging
  *
  * Copyright (c) 2008 Jonathan Beck All Rights Reserved.
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
  */
 
-#ifndef UTILS_H
-#define UTILS_H
+#ifndef DEBUG_H
+#define DEBUG_H
 
 #include <glib.h>
 
diff --git a/src/device_link_service.c b/src/device_link_service.c
index 83b0676..b1106fe 100644
--- a/src/device_link_service.c
+++ b/src/device_link_service.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include "device_link_service.h"
 #include "property_list_service.h"
-#include "utils.h"
+#include "debug.h"
 
 /**
  * Internally used function to extract the message string from a DLMessage*
diff --git a/src/iphone.c b/src/iphone.c
index 9307b19..7b21bb5 100644
--- a/src/iphone.c
+++ b/src/iphone.c
@@ -27,7 +27,7 @@
 
 #include <usbmuxd.h>
 #include "iphone.h"
-#include "utils.h"
+#include "debug.h"
 
 static iphone_event_cb_t event_cb = NULL;
 
diff --git a/src/lockdown.c b/src/lockdown.c
index f78fbb4..5927192 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -31,7 +31,7 @@
 #include "property_list_service.h"
 #include "lockdown.h"
 #include "iphone.h"
-#include "utils.h"
+#include "debug.h"
 #include "userpref.h"
 
 #define RESULT_SUCCESS 0
diff --git a/src/property_list_service.c b/src/property_list_service.c
index 9d16bbc..b549cb4 100644
--- a/src/property_list_service.c
+++ b/src/property_list_service.c
@@ -25,7 +25,7 @@
 
 #include "property_list_service.h"
 #include "iphone.h"
-#include "utils.h"
+#include "debug.h"
 
 /**
  * Convert an iphone_error_t value to an property_list_service_error_t value.
diff --git a/src/userpref.c b/src/userpref.c
index 54fdafc..c677fda 100644
--- a/src/userpref.c
+++ b/src/userpref.c
@@ -31,7 +31,7 @@
 #include <gcrypt.h>
 
 #include "userpref.h"
-#include "utils.h"
+#include "debug.h"
 
 #define LIBIPHONE_CONF_DIR  "libiphone"
 #define LIBIPHONE_CONF_FILE "libiphonerc"
diff --git a/swig/iphone.i b/swig/iphone.i
index 6b8ef3f..184f7f9 100644
--- a/swig/iphone.i
+++ b/swig/iphone.i
@@ -8,7 +8,7 @@
  #include <libiphone/mobilesync.h>
  #include <plist/plist.h>
  #include <plist/plist++.h>
- #include "../src/utils.h"
+ #include "../src/debug.h"
  typedef struct {
         iphone_device_t dev;
  } iPhone;