diff --git a/include/helper.h b/include/helper.h
index 99b1bf7d..8a7ddfc5 100644
--- a/include/helper.h
+++ b/include/helper.h
@@ -1,5 +1,5 @@
-#ifndef __HELPER_H__
-#define __HELPER_H__
+#ifndef HELPER_H
+#define HELPER_H
 #include "rofi.h"
 /**
  * @param string The input string.
@@ -149,4 +149,4 @@ char helper_parse_char ( const char *arg );
  * Set the application arguments.
  */
 void cmd_set_arguments ( int argc, char **argv );
-#endif // __HELPER_H__
+#endif // HELPER_H
diff --git a/include/history.h b/include/history.h
index 8384d10f..0a501ab7 100644
--- a/include/history.h
+++ b/include/history.h
@@ -24,8 +24,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#ifndef __HISTORY_H__
-#define __HISTORY_H__
+#ifndef HISTORY_H
+#define HISTORY_H
 
 /**
  * @param filename The filename of the history cache.
diff --git a/include/i3-support.h b/include/i3-support.h
index 4187fc26..9030f804 100644
--- a/include/i3-support.h
+++ b/include/i3-support.h
@@ -1,5 +1,5 @@
-#ifndef __ROFI_I3_H__
-#define __ROFI_I3_H__
+#ifndef ROFI_I3_H
+#define ROFI_I3_H
 
 /**
  * These functions are dummies when i3 support is not compiled in.
@@ -29,4 +29,4 @@ int i3_support_initialize ( Display *display );
  * Cleanup.
  */
 void i3_support_free_internals ( void );
-#endif // __ROFI_I3_H__
+#endif // ROFI_I3_H
diff --git a/include/keyb.h b/include/keyb.h
index 452205d2..4a74ab09 100644
--- a/include/keyb.h
+++ b/include/keyb.h
@@ -1,5 +1,5 @@
-#ifndef __KEYB_H__
-#define __KEYB_H__
+#ifndef KEYB_H
+#define KEYB_H
 
 typedef enum _KeyBindingAction
 {
@@ -69,4 +69,4 @@ void cleanup_abe ( void );
  * @returns TRUE if key combo matches, FALSE otherwise.
  */
 int abe_test_action ( KeyBindingAction action, unsigned int mask, KeySym key );
-#endif // __KEYB_H__
+#endif // KEYB_H
diff --git a/include/rofi.h b/include/rofi.h
index e627d199..f235dd50 100644
--- a/include/rofi.h
+++ b/include/rofi.h
@@ -1,5 +1,5 @@
-#ifndef __SIMPLESWITCHER_H__
-#define __SIMPLESWITCHER_H__
+#ifndef SIMPLESWITCHER_H
+#define SIMPLESWITCHER_H
 #include <X11/X.h>
 #include <glib.h>
 #include <textbox.h>
diff --git a/include/textbox.h b/include/textbox.h
index 37b4fbef..5b35472a 100644
--- a/include/textbox.h
+++ b/include/textbox.h
@@ -1,5 +1,5 @@
-#ifndef __TEXTBOX_H__
-#define __TEXTBOX_H__
+#ifndef TEXTBOX_H
+#define TEXTBOX_H
 #include <X11/Xft/Xft.h>
 
 #include <pango/pango.h>
@@ -246,4 +246,4 @@ int textbox_get_estimated_char_height ( void );
 
 
 void textbox_text_markup ( textbox *tb, const char *text );
-#endif //__TEXTBOX_H__
+#endif //TEXTBOX_H
diff --git a/include/x11-helper.h b/include/x11-helper.h
index 2cf94e81..d2d5a99d 100644
--- a/include/x11-helper.h
+++ b/include/x11-helper.h
@@ -1,5 +1,5 @@
-#ifndef __X11_HELPER_H__
-#define __X11_HELPER_H__
+#ifndef X11_HELPER_H
+#define X11_HELPER_H
 
 
 int window_get_prop ( Display *display, Window w, Atom prop,
diff --git a/include/xrmoptions.h b/include/xrmoptions.h
index be9496c1..d809e035 100644
--- a/include/xrmoptions.h
+++ b/include/xrmoptions.h
@@ -1,5 +1,5 @@
-#ifndef __XRMOPTIONS_H__
-#define __XRMOPTIONS_H__
+#ifndef XRMOPTIONS_H
+#define XRMOPTIONS_H
 
 // Big thanks to Sean Pringle for this code.
 // This maps xresource options to config structure.