6 files changed, 8 insertions, 6 deletions

diff --git a/keyboards/cu75/cu75.h b/keyboards/cu75/cu75.h
index 35ca7f7e6..5224630af 100644
--- a/keyboards/cu75/cu75.h
+++ b/keyboards/cu75/cu75.h
@@ -114,7 +114,7 @@ void click(uint16_t freq, uint16_t duration);
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3E, \
     k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, \
-    k50, k51, k52,       k53,  k56,  k59,        k59, k5A, k5B, k5C, k5D, k5E \
+    k50, k51, k52,       k53,  k56,  k58,        k59, k5A, k5B, k5C, k5D, k5E \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
diff --git a/keyboards/kinesis/kinesis.h b/keyboards/kinesis/kinesis.h
index 35aae5b72..54cf6b81a 100644
--- a/keyboards/kinesis/kinesis.h
+++ b/keyboards/kinesis/kinesis.h
@@ -8,7 +8,7 @@
 #    include "kint2pp.h"
 #elif defined(KEYBOARD_kinesis_nguyenvietyen)
 #    include "nguyenvietyen.h"
-#elif defined(KEYBOARD_kinesis_kint360)
+#elif defined(KEYBOARD_kinesis_kint36)
 #    include "kint36.h"
 #elif defined(KEYBOARD_kinesis_kint41)
 #    include "kint41.h"
diff --git a/keyboards/knops/mini/mini.h b/keyboards/knops/mini/mini.h
index ebb0ad915..e028dea6d 100644
--- a/keyboards/knops/mini/mini.h
+++ b/keyboards/knops/mini/mini.h
@@ -23,7 +23,7 @@
 // The first section contains all of the arguments
 // The second converts the arguments into a two-dimensional array
 #define LAYOUT( \
-    k00, k01, k02, K03, k04, k05 \
+    k00, k01, k02, k03, k04, k05 \
 ) { \
     { k00, k01, k02, k03, k04, k05 } \
 }
diff --git a/keyboards/laptreus/laptreus.h b/keyboards/laptreus/laptreus.h
index 0a1e2dd7a..2e7932e49 100644
--- a/keyboards/laptreus/laptreus.h
+++ b/keyboards/laptreus/laptreus.h
@@ -8,12 +8,12 @@
 #define LAYOUT( \
     k40, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k49, \
     k41, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k48, \
-    k42, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k37, \
+    k42, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k47, \
     k43, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k46 \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, XXX, XXX, k46, k37, k48, k49 } \
+    { k40, k41, k42, k43, XXX, XXX, k46, k47, k48, k49 } \
 }
diff --git a/keyboards/mt40/mt40.h b/keyboards/mt40/mt40.h
index e5892ea67..dc0de22b2 100644
--- a/keyboards/mt40/mt40.h
+++ b/keyboards/mt40/mt40.h
@@ -18,7 +18,7 @@
 
 #include "quantum.h"
 
-#define KC_NO
+#define XXX KC_NO
 
 // This a shortcut to help you visually see your layout.
 // The following is an example using the Planck MIT layout
diff --git a/keyboards/ok60/ok60.h b/keyboards/ok60/ok60.h
index e361d1be3..4e6aeb2c3 100644
--- a/keyboards/ok60/ok60.h
+++ b/keyboards/ok60/ok60.h
@@ -2,6 +2,8 @@
 
 #include "quantum.h"
 
+#define XXX KC_NO
+
 #define LAYOUT_60_ansi( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \