diff --git a/event/hook/darwin/properties_c.h b/event/hook/darwin/properties_c.h
index bee4caf..0a7679c 100644
--- a/event/hook/darwin/properties_c.h
+++ b/event/hook/darwin/properties_c.h
@@ -1,23 +1,23 @@
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+	#include <config.h>
 #endif
 
 #ifdef USE_CARBON_LEGACY
-#include <Carbon/Carbon.h>
+	#include <Carbon/Carbon.h>
 #endif
 #ifdef USE_COREFOUNDATION
-#include <CoreFoundation/CoreFoundation.h>
+	#include <CoreFoundation/CoreFoundation.h>
 #endif
 #ifdef USE_IOKIT
-#include <IOKit/hidsystem/IOHIDLib.h>
-#include <IOKit/hidsystem/IOHIDParameter.h>
+	#include <IOKit/hidsystem/IOHIDLib.h>
+	#include <IOKit/hidsystem/IOHIDParameter.h>
 #endif
+
 #include <stdbool.h>
 #include "../iohook.h"
-
-// #include "../logger_c.h"
 #include "input.h"
+// #include "../logger_c.h"
 
 IOHOOK_API screen_data* hook_create_screen_info(unsigned char *count) {
 	CGError status = kCGErrorFailure;
diff --git a/event/hook/x11/event_c.h b/event/hook/x11/event_c.h
index e469d3d..50e5ede 100644
--- a/event/hook/x11/event_c.h
+++ b/event/hook/x11/event_c.h
@@ -1,18 +1,18 @@
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+	#include <config.h>
 #endif
 
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "../iohook.h"
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #ifdef USE_XTEST
-#include <X11/extensions/XTest.h>
+	#include <X11/extensions/XTest.h>
 #endif
 
+#include "../iohook.h"
 #include "input.h"
 // #include "../logger.h"
 
diff --git a/event/hook/x11/hook_c.h b/event/hook/x11/hook_c.h
index 5805da6..5813cc2 100644
--- a/event/hook/x11/hook_c.h
+++ b/event/hook/x11/hook_c.h
@@ -1,6 +1,6 @@
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+	#include <config.h>
 #endif
 
 #define USE_XKB 0
@@ -8,10 +8,9 @@
 #include <inttypes.h>
 #include <limits.h>
 #ifdef USE_XRECORD_ASYNC
-#include <pthread.h>
+	#include <pthread.h>
 #endif
 #include <stdint.h>
-#include "../iohook.h"
 
 #include <X11/keysym.h>
 #include <X11/Xlibint.h>
@@ -22,15 +21,16 @@
 #include <X11/XKBlib.h>
 // #endif
 #if defined(USE_XINERAMA) && !defined(USE_XRANDR)
-#include <X11/extensions/Xinerama.h>
+	#include <X11/extensions/Xinerama.h>
 #elif defined(USE_XRANDR)
-#include <X11/extensions/Xrandr.h>
+	#include <X11/extensions/Xrandr.h>
 #else
 // TODO We may need to fallback to the xf86vm extension for things like TwinView.
 // #pragma message("*** Warning: Xinerama or XRandR support is required to produce cross-platform mouse coordinates for multi-head configurations!")
 // #pragma message("... Assuming single-head display.")
 #endif
 
+#include "../iohook.h"
 // #include "../logger.h"
 #include "input.h"
 
diff --git a/event/hook/x11/input_c.h b/event/hook/x11/input_c.h
index 1e77884..8d7f39d 100644
--- a/event/hook/x11/input_c.h
+++ b/event/hook/x11/input_c.h
@@ -14,17 +14,17 @@
 
 #ifdef USE_XKB
 #ifdef USE_EVDEV
-#include <linux/input.h>
-static bool is_evdev = false;
+	#include <linux/input.h>
+	static bool is_evdev = false;
 #endif
 
 #include <X11/XKBlib.h>
 static XkbDescPtr keyboard_map;
 #else
-#include <X11/Xutil.h>
-static KeySym *keyboard_map;
-static int keysym_per_keycode;
-static bool is_caps_lock = false, is_shift_lock = false;
+	#include <X11/Xutil.h>
+	static KeySym *keyboard_map;
+	static int keysym_per_keycode;
+	static bool is_caps_lock = false, is_shift_lock = false;
 #endif
 
 #ifdef USE_XKBCOMMON
diff --git a/event/hook/x11/properties_c.h b/event/hook/x11/properties_c.h
index 1da328a..9358143 100644
--- a/event/hook/x11/properties_c.h
+++ b/event/hook/x11/properties_c.h
@@ -6,28 +6,28 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "../iohook.h"
 #include <X11/Xlib.h>
 #ifdef USE_XKB
-#include <X11/XKBlib.h>
+	#include <X11/XKBlib.h>
 #endif
 #ifdef USE_XF86MISC
-#include <X11/extensions/xf86misc.h>
-#include <X11/extensions/xf86mscstr.h>
+	#include <X11/extensions/xf86misc.h>
+	#include <X11/extensions/xf86mscstr.h>
 #endif
 #if defined(USE_XINERAMA) && !defined(USE_XRANDR)
-#include <X11/extensions/Xinerama.h>
+	#include <X11/extensions/Xinerama.h>
 #elif defined(USE_XRANDR)
 #include <pthread.h>
-#include <X11/extensions/Xrandr.h>
+	#include <X11/extensions/Xrandr.h>
 #endif
 #ifdef USE_XT
-#include <X11/Intrinsic.h>
+	#include <X11/Intrinsic.h>
 
-static XtAppContext xt_context;
-static Display *xt_disp;
+	static XtAppContext xt_context;
+	static Display *xt_disp;
 #endif
 
+#include "../iohook.h"
 #include "input.h"
 // #include "../logger.h"