8 files changed, 18 insertions, 18 deletions

diff --git a/src/client.h b/src/client.h
index 60d8348..516d552 100644
--- a/src/client.h
+++ b/src/client.h
@@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-#ifndef __CLIENT_H__
-#define __CLIENT_H__
+#ifndef CLIENT_H
+#define CLIENT_H
 
 #include <stdint.h>
 #include "usbmuxd-proto.h"
diff --git a/src/conf.h b/src/conf.h
index fd74607..8cdcbb4 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-#ifndef __CONF_H__
-#define __CONF_H__
+#ifndef CONF_H
+#define CONF_H
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/device.h b/src/device.h
index cb5bc24..37f0c3c 100644
--- a/src/device.h
+++ b/src/device.h
@@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-#ifndef __DEVICE_H__
-#define __DEVICE_H__
+#ifndef DEVICE_H
+#define DEVICE_H
 
 #include "usb.h"
 #include "client.h"
@@ -52,4 +52,5 @@ void device_check_timeouts(void);
 void device_init(void);
 void device_kill_connections(void);
 void device_shutdown(void);
+
 #endif
diff --git a/src/log.h b/src/log.h
index 1fb77ee..3068600 100644
--- a/src/log.h
+++ b/src/log.h
@@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-#ifndef __LOG_H__
-#define __LOG_H__
+#ifndef LOG_H
+#define LOG_H
 
 enum loglevel {
         LL_FATAL = 0,
@@ -40,5 +40,4 @@ void log_disable_syslog();
 
 void usbmuxd_log(enum loglevel level, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
 
-
 #endif
diff --git a/src/preflight.h b/src/preflight.h
index 4c8aa60..0a449e5 100644
--- a/src/preflight.h
+++ b/src/preflight.h
@@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-#ifndef __PREFLIGHT_H__
-#define __PREFLIGHT_H__
+#ifndef PREFLIGHT_H
+#define PREFLIGHT_H
 
 #include "device.h"
 
diff --git a/src/usb.h b/src/usb.h
index 6fe7ee6..50898c9 100644
--- a/src/usb.h
+++ b/src/usb.h
@@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-#ifndef __USB_H__
-#define __USB_H__
+#ifndef USB_H
+#define USB_H
 
 #include <stdint.h>
 #include "utils.h"
diff --git a/src/usbmuxd-proto.h b/src/usbmuxd-proto.h
index 7842975..58ff4ea 100644
--- a/src/usbmuxd-proto.h
+++ b/src/usbmuxd-proto.h
@@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 /* Protocol defintion for usbmuxd proxy protocol */
-#ifndef __USBMUXD_PROTO_H
-#define __USBMUXD_PROTO_H
+#ifndef USBMUXD_PROTO_H
+#define USBMUXD_PROTO_H
 
 #include <stdint.h>
 #define USBMUXD_PROTOCOL_VERSION 0
@@ -93,4 +93,4 @@ struct usbmuxd_device_record {
 }
 #endif
 
-#endif /* __USBMUXD_PROTO_H */
+#endif /* USBMUXD_PROTO_H */
diff --git a/src/utils.h b/src/utils.h
index 92a7d68..0a3093e 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-#ifndef __UTILS_H__
-#define __UTILS_H__
+#ifndef UTILS_H
+#define UTILS_H
 
 #include <poll.h>
 #include <plist/plist.h>