diff --git a/src/main/aciodrv/device.c b/src/main/aciodrv/device.c
index b0ec7de..1765a18 100644
--- a/src/main/aciodrv/device.c
+++ b/src/main/aciodrv/device.c
@@ -322,7 +322,11 @@ bool aciodrv_send_and_recv(struct ac_io_message *msg, int resp_size)
     int send_size = offsetof(struct ac_io_message, cmd.raw) + msg->cmd.nbytes;
 
 #ifdef AC_IO_MSG_LOG
-    log_info("Beginning send on %d: %04x (%d b)", msg->addr, msg->cmd.code, send_size);
+    log_info(
+        "Beginning send on %d: %04x (%d b)",
+        msg->addr,
+        msg->cmd.code,
+        send_size);
 #endif
     if (aciodrv_device_send((uint8_t *) msg, send_size) <= 0) {
         return false;
diff --git a/src/main/aciotest/main.c b/src/main/aciotest/main.c
index 53da2ce..bea7eba 100644
--- a/src/main/aciotest/main.c
+++ b/src/main/aciotest/main.c
@@ -6,10 +6,10 @@
 
 #include "aciodrv/device.h"
 
+#include "aciotest/bi2a-sdvx.h"
 #include "aciotest/handler.h"
 #include "aciotest/icca.h"
 #include "aciotest/kfca.h"
-#include "aciotest/bi2a-sdvx.h"
 
 #include "util/log.h"
 
diff --git a/src/main/config/schema.c b/src/main/config/schema.c
index b0c5d45..9998999 100644
--- a/src/main/config/schema.c
+++ b/src/main/config/schema.c
@@ -160,7 +160,6 @@ static const struct light_def ddr_lights[] = {
     {0x2A, IDS_DDR_HD_P2_SPEAKER_W_G},
     {0x2B, IDS_DDR_HD_P2_SPEAKER_W_B},
 
-
     // EXTIO
     {0x1E, IDS_DDR_P1_UP},
     {0x1D, IDS_DDR_P1_DOWN},
diff --git a/src/main/dinput/dinput.c b/src/main/dinput/dinput.c
index f62d547..248ead4 100644
--- a/src/main/dinput/dinput.c
+++ b/src/main/dinput/dinput.c
@@ -96,7 +96,7 @@ static HRESULT STDCALL my_DirectInput8Create(
     }
 
     res = com_proxy_wrap(&api_proxy, api, sizeof(*api->lpVtbl));
-    
+
     if (res != S_OK) {
         log_warning("Wrapping com proxy failed: %08lx", res);
         return res;
diff --git a/src/main/sdvxhook/gfx.c b/src/main/sdvxhook/gfx.c
index 77c3cf5..16cf733 100644
--- a/src/main/sdvxhook/gfx.c
+++ b/src/main/sdvxhook/gfx.c
@@ -122,9 +122,9 @@ static IDirect3D9 *STDCALL my_Direct3DCreate9(UINT sdk_ver)
     log_info("Direct3DCreate9 hook hit");
 
     api = real_Direct3DCreate9(sdk_ver);
-    
+
     hr = com_proxy_wrap(&api_proxy, api, sizeof(*api->lpVtbl));
-    
+
     if (hr != S_OK) {
         log_fatal("Wrapping com proxy failed: %08lx", hr);
     }
diff --git a/src/main/sdvxhook/kfca.c b/src/main/sdvxhook/kfca.c
index 69780ce..5c89686 100644
--- a/src/main/sdvxhook/kfca.c
+++ b/src/main/sdvxhook/kfca.c
@@ -122,7 +122,8 @@ static void kfca_amp_control(const struct ac_io_message *req)
 
     // bytes 0-4: main, headphone, unused, subwoofer
 
-    if (!sdvx_io_set_amp_volume(req->cmd.raw[0], req->cmd.raw[1], req->cmd.raw[3])) {
+    if (!sdvx_io_set_amp_volume(
+            req->cmd.raw[0], req->cmd.raw[1], req->cmd.raw[3])) {
         log_warning("Unable to set amp volume?");
     }
 
diff --git a/src/main/sdvxhook2/bi2a.c b/src/main/sdvxhook2/bi2a.c
index 2aca18d..71de63b 100644
--- a/src/main/sdvxhook2/bi2a.c
+++ b/src/main/sdvxhook2/bi2a.c
@@ -28,7 +28,9 @@ static bool poll_delay;
 static bool force_headphones_on;
 
 void bio2_emu_bi2a_init(
-    struct bio2emu_port *bio2_emu, bool disable_poll_limiter, bool force_headphones)
+    struct bio2emu_port *bio2_emu,
+    bool disable_poll_limiter,
+    bool force_headphones)
 {
     bio2emu_port_init(bio2_emu);
 
diff --git a/src/main/sdvxhook2/bi2a.h b/src/main/sdvxhook2/bi2a.h
index f0444e7..747120a 100644
--- a/src/main/sdvxhook2/bi2a.h
+++ b/src/main/sdvxhook2/bi2a.h
@@ -5,11 +5,11 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "bio2emu/emu.h"
 #include "bio2/bi2a-sdvx.h"
+#include "bio2emu/emu.h"
 
-
-void bio2_emu_bi2a_init(struct bio2emu_port *in, bool disable_poll_limiter, bool force_headphones);
+void bio2_emu_bi2a_init(
+    struct bio2emu_port *in, bool disable_poll_limiter, bool force_headphones);
 void bio2_emu_bi2a_dispatch_request(
     struct bio2emu_port *bio2port, const struct ac_io_message *req);
 
diff --git a/src/main/sdvxio-kfca/config-kfca.c b/src/main/sdvxio-kfca/config-kfca.c
index c94697d..a2d8e62 100644
--- a/src/main/sdvxio-kfca/config-kfca.c
+++ b/src/main/sdvxio-kfca/config-kfca.c
@@ -4,7 +4,6 @@
 
 #include "util/log.h"
 
-SDVXIO_KFCA_CONFIG_KFCA_H
 #define SDVXIO_KFCA_CONFIG_KFCA_PORT_KEY "kfca.port"
 #define SDVXIO_KFCA_CONFIG_KFCA_BAUD_KEY "kfca.baud"