diff --git a/include/padscore/kpad.h b/include/padscore/kpad.h
index 0a0a83de..f973a6ae 100644
--- a/include/padscore/kpad.h
+++ b/include/padscore/kpad.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <wut.h>
-#include <padscore/wpad.h>
 #include <padscore/wbc.h>
+#include <padscore/wpad.h>
 
 /**
  * \defgroup padscore_kpad KPAD
@@ -50,7 +50,8 @@ typedef enum KPADButtonProcMode
 } KPADButtonProcMode;
 
 //! Status codes for `KPADControlDpdCallback`.
-typedef enum KPADControlDpdStatus {
+typedef enum KPADControlDpdStatus
+{
    KPAD_CONTROL_DPD_STATUS_STARTED  = 0,
    KPAD_CONTROL_DPD_STATUS_FINISHED = 1,
 } KPADControlDpdStatus;
@@ -87,13 +88,15 @@ typedef enum KPADControlMplsStatus
    KPAD_CONTROL_MPLS_STATUS_FAILED_MPLS_CLASSIC = -3,
 } KPADControlMplsStatus;
 
-typedef enum KPADMplsZeroDriftMode {
+typedef enum KPADMplsZeroDriftMode
+{
    KPAD_MPLS_ZERO_DRIFT_MODE_LOOSE,
    KPAD_MPLS_ZERO_DRIFT_MODE_STANDARD,
    KPAD_MPLS_ZERO_DRIFT_MODE_TIGHT,
 } KPADMplsZeroDriftMode;
 
-typedef enum KPADPlayMode {
+typedef enum KPADPlayMode
+{
    //! Use a smoothing filter.
    KPAD_PLAY_MODE_LOOSE = 0,
    //! Use a sharper, more responsive filter.
@@ -127,7 +130,8 @@ WUT_CHECK_OFFSET(KPADVec3D, 0x04, y);
 WUT_CHECK_OFFSET(KPADVec3D, 0x08, z);
 WUT_CHECK_SIZE(KPADVec3D, 0x0C);
 
-struct KPADBase3D {
+struct KPADBase3D
+{
    KPADVec3D x;
    KPADVec3D y;
    KPADVec3D z;
@@ -138,9 +142,10 @@ WUT_CHECK_OFFSET(KPADBase3D, 0x18, z);
 WUT_CHECK_SIZE(KPADBase3D, 0x24);
 
 //! 2D rectangle.
-struct KPADRect {
-   KPADVec2D top_left;
-   KPADVec2D bottom_right;
+struct KPADRect
+{
+   KPADVec2D topLeft;
+   KPADVec2D bottomRight;
 };
 WUT_CHECK_OFFSET(KPADRect, 0x00, top_left);
 WUT_CHECK_OFFSET(KPADRect, 0x08, bottom_right);
diff --git a/include/padscore/wpad.h b/include/padscore/wpad.h
index 0a2265f1..47539fdd 100644
--- a/include/padscore/wpad.h
+++ b/include/padscore/wpad.h
@@ -71,7 +71,8 @@ typedef enum WPADChan
    WPAD_CHAN_6 = 6,
 } WPADChan;
 
-typedef enum WPADClampType {
+typedef enum WPADClampType
+{
    WPAD_CLAMP_TYPE_OCTAGON_DEADZONE = 0,
    WPAD_CLAMP_TYPE_OCTAGON          = 1,
    WPAD_CLAMP_TYPE_CIRCLE_DEADZONE  = 2,
@@ -397,8 +398,9 @@ typedef enum WPADSensorBarPos
    WPAD_SENSOR_BAR_POS_ABOVE = 1,
 } WPADSensorBarPos;
 
-typedef enum WPADSyncDeviceEvent {
-   WPAD_SYNC_DEVICE_EVENT_STARTED = 0,
+typedef enum WPADSyncDeviceEvent
+{
+   WPAD_SYNC_DEVICE_EVENT_STARTED  = 0,
    WPAD_SYNC_DEVICE_EVENT_FINISHED = 1,
 } WPADSyncDeviceEvent;
 
@@ -767,7 +769,8 @@ struct WENCParams
 };
 WUT_CHECK_SIZE(WENCParams, 32);
 
-struct WPADiMplsCalibration {
+struct WPADiMplsCalibration
+{
    float pitchZero;
    float pitchScale;
 
@@ -1612,7 +1615,7 @@ WPADGetCLTriggerThreshold(WPADChan chan,
 
 void
 WPADGetDpdCornerPoints(WPADChan chan,
-                       void* dst);
+                       void *dst);
 
 uint8_t
 WPADGetDpdSensitivity(void);
@@ -1845,7 +1848,7 @@ WUDSerialFlashTestMode(void (*callback)(void));
 BOOL
 WUDSerialFlashTestRead(uint32_t unknown1,
                        uint8_t size,
-                       void (*callback)(void*, void*));
+                       void (*callback)(void *, void *));
 
 BOOL
 WUDSerialFlashTestWrite(uint32_t unknown1,