Merge remote-tracking branch 'origin/master' into develop

4 files changed, 4 insertions, 4 deletions

diff --git a/docs/cli_commands.md b/docs/cli_commands.md
index 5ab49abd2..bb5df8996 100644
--- a/docs/cli_commands.md
+++ b/docs/cli_commands.md
@@ -170,7 +170,7 @@ qmk json2c [-o OUTPUT] filename
 ## `qmk c2json`
 
 Creates a keymap.json from a keymap.c.  
-**Note:** Parsing C source files is not easy, therefore this subcommand may not work your keymap. In some cases not using the C pre-processor helps.
+**Note:** Parsing C source files is not easy, therefore this subcommand may not work with your keymap. In some cases not using the C pre-processor helps.
 
 **Usage**:
 
diff --git a/quantum/api/api_sysex.h b/quantum/api/api_sysex.h
index 382f4bea4..eb0a18848 100644
--- a/quantum/api/api_sysex.h
+++ b/quantum/api/api_sysex.h
@@ -18,6 +18,8 @@
 
 #include "api.h"
 
+#define API_SYSEX_MAX_SIZE 32
+
 void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t* bytes, uint16_t length);
 
 #define SEND_BYTES(mt, dt, b, l) send_bytes_sysex(mt, dt, b, l)
diff --git a/quantum/config_common.h b/quantum/config_common.h
index fa1ff2a5f..d93477b27 100644
--- a/quantum/config_common.h
+++ b/quantum/config_common.h
@@ -24,6 +24,4 @@
 #define COL2ROW 0
 #define ROW2COL 1
 
-#define API_SYSEX_MAX_SIZE 32
-
 #include "song_list.h"
diff --git a/tmk_core/protocol/midi/qmk_midi.c b/tmk_core/protocol/midi/qmk_midi.c
index 6f6aced72..c18dbf993 100644
--- a/tmk_core/protocol/midi/qmk_midi.c
+++ b/tmk_core/protocol/midi/qmk_midi.c
@@ -5,7 +5,7 @@
 #include "usb_descriptor.h"
 #include "process_midi.h"
 #if API_SYSEX_ENABLE
-#    include "api.h"
+#    include "api_sysex.h"
 #endif
 
 /*******************************************************************************