diff --git a/tmk_core/protocol/arm_atsam/main_arm_atsam.c b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
index a2f20db66ed..0537e3937d9 100644
--- a/tmk_core/protocol/arm_atsam/main_arm_atsam.c
+++ b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
@@ -113,8 +113,8 @@ void send_mouse(report_mouse_t *report) {
 #endif // MOUSEKEY_ENABLE
 }
 
-#ifdef EXTRAKEY_ENABLE
 void send_extra(uint8_t report_id, uint16_t data) {
+#ifdef EXTRAKEY_ENABLE
     uint32_t irqflags;
 
     irqflags = __get_PRIMASK();
@@ -128,8 +128,8 @@ void send_extra(uint8_t report_id, uint16_t data) {
 
     __DMB();
     __set_PRIMASK(irqflags);
-}
 #endif // EXTRAKEY_ENABLE
+}
 
 #ifdef CONSOLE_ENABLE
 #    define CONSOLE_PRINTBUF_SIZE 512
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 4540c1e2fb3..ae2c9386086 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -961,8 +961,8 @@ void shared_in_cb(USBDriver *usbp, usbep_t ep) {
  * ---------------------------------------------------------
  */
 
-#ifdef EXTRAKEY_ENABLE
 void send_extra(uint8_t report_id, uint16_t data) {
+#ifdef EXTRAKEY_ENABLE
     osalSysLock();
     if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
         osalSysUnlock();
@@ -985,8 +985,8 @@ void send_extra(uint8_t report_id, uint16_t data) {
 
     usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)&report, sizeof(report_extra_t));
     osalSysUnlock();
-}
 #endif
+}
 
 void send_programmable_button(uint32_t data) {
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 1bd42376350..9580319ae68 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -854,8 +854,8 @@ static void send_report(void *report, size_t size) {
  *
  * FIXME: Needs doc
  */
-#ifdef EXTRAKEY_ENABLE
 static void send_extra(uint8_t report_id, uint16_t data) {
+#ifdef EXTRAKEY_ENABLE
 #    ifdef BLUETOOTH_ENABLE
     if (report_id == REPORT_ID_CONSUMER && where_to_send() == OUTPUT_BLUETOOTH) {
 #        ifdef BLUETOOTH_BLUEFRUIT_LE
@@ -870,8 +870,8 @@ static void send_extra(uint8_t report_id, uint16_t data) {
     static report_extra_t r;
     r = (report_extra_t){.report_id = report_id, .usage = data};
     send_report(&r, sizeof(r));
-}
 #endif
+}
 
 static void send_programmable_button(uint32_t data) {
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index 4d767b47e42..9668c4141fb 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -356,8 +356,8 @@ static void send_mouse(report_mouse_t *report) {
 #endif
 }
 
-#ifdef EXTRAKEY_ENABLE
 static void send_extra(uint8_t report_id, uint16_t data) {
+#ifdef EXTRAKEY_ENABLE
     static uint8_t  last_id   = 0;
     static uint16_t last_data = 0;
     if ((report_id == last_id) && (data == last_data)) return;
@@ -369,8 +369,8 @@ static void send_extra(uint8_t report_id, uint16_t data) {
     if (usbInterruptIsReadyShared()) {
         usbSetInterruptShared((void *)&report, sizeof(report_extra_t));
     }
-}
 #endif
+}
 
 void send_digitizer(report_digitizer_t *report) {
 #ifdef DIGITIZER_ENABLE