diff --git a/include/usbmuxd-proto.h b/include/usbmuxd-proto.h
index be9e709..c260310 100644
--- a/include/usbmuxd-proto.h
+++ b/include/usbmuxd-proto.h
@@ -22,8 +22,8 @@
 */
 
 /* 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
@@ -94,4 +94,4 @@
 }
 #endif
 
-#endif /* __USBMUXD_PROTO_H */
+#endif /* USBMUXD_PROTO_H */
diff --git a/include/usbmuxd.h b/include/usbmuxd.h
index 75a42f5..3f61fae 100644
--- a/include/usbmuxd.h
+++ b/include/usbmuxd.h
@@ -21,8 +21,8 @@
 
 */
 
-#ifndef __USBMUXD_H
-#define __USBMUXD_H
+#ifndef USBMUXD_H
+#define USBMUXD_H
 #include <stdint.h>
 
 #ifdef __cplusplus
@@ -231,4 +231,4 @@
 }
 #endif
 
-#endif /* __USBMUXD_H */
+#endif /* USBMUXD_H */
diff --git a/src/collection.h b/src/collection.h
index e9b6403..2edc842 100644
--- a/src/collection.h
+++ b/src/collection.h
@@ -20,8 +20,8 @@
 
 */
 
-#ifndef __COLLECTION_H__
-#define __COLLECTION_H__
+#ifndef COLLECTION_H
+#define COLLECTION_H
 
 struct collection {
 	void **list;
diff --git a/src/socket.h b/src/socket.h
index c2b2599..a2c1354 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
  */
 
-#ifndef __SOCKET_SOCKET_H
-#define __SOCKET_SOCKET_H
+#ifndef SOCKET_SOCKET_H
+#define SOCKET_SOCKET_H
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -62,4 +62,4 @@
 
 void socket_set_verbose(int level);
 
-#endif	/* __SOCKET_SOCKET_H */
+#endif	/* SOCKET_SOCKET_H */