4 files changed, 13 insertions, 11 deletions
diff --git a/keyboards/25keys/cassette42/common/oled_helper.c b/keyboards/25keys/cassette42/common/oled_helper.c
index 8800699a85..1c4148a7d9 100644
--- a/keyboards/25keys/cassette42/common/oled_helper.c
+++ b/keyboards/25keys/cassette42/common/oled_helper.c
@@ -1,7 +1,9 @@
+#include "oled_helper.h"
+#include "quantum.h"
+#include <stdio.h>
+#include <string.h>
+
 #ifdef OLED_ENABLE
-#    include QMK_KEYBOARD_H
-#    include <stdio.h>
-#    include <string.h>
 
 void render_logo(void) {
     static const char PROGMEM logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0};
diff --git a/keyboards/25keys/cassette42/common/oled_helper.h b/keyboards/25keys/cassette42/common/oled_helper.h
index daeb7bfa4d..d677c2a872 100644
--- a/keyboards/25keys/cassette42/common/oled_helper.h
+++ b/keyboards/25keys/cassette42/common/oled_helper.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #ifdef OLED_ENABLE
 
 void render_logo(void);
diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h
index 686eea8fc7..bc4f1ab4aa 100644
--- a/keyboards/25keys/cassette42/config.h
+++ b/keyboards/25keys/cassette42/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 5
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -35,6 +34,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-#endif
 
 #define OLED_FONT_H "keyboards/25keys/cassette42/common/glcdfont.c"
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json
index f791a83e48..2b33220ad9 100644
--- a/keyboards/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/info.json
@@ -24,12 +24,12 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0.5, "y":0.75, "matrix": [0, 4]},
-                {"x":2.5, "y":0.75, "matrix": [0, 5]},
-                {"x":0, "y":1.75, "matrix": [0, 0]},
-                {"x":1, "y":1.75, "matrix": [0, 1]},
-                {"x":2, "y":1.75, "matrix": [0, 2]},
-                {"x":3, "y":1.75, "matrix": [0, 3]}
+                {"x":0.5, "y":0, "matrix": [0, 4]},
+                {"x":2.5, "y":0, "matrix": [0, 5]},
+                {"x":0, "y":1, "matrix": [0, 0]},
+                {"x":1, "y":1, "matrix": [0, 1]},
+                {"x":2, "y":1, "matrix": [0, 2]},
+                {"x":3, "y":1, "matrix": [0, 3]}
             ]
         }
     }