11 files changed, 5 insertions, 20 deletions
diff --git a/keyboards/yosino58/lib/host_led_state_reader.c b/keyboards/yosino58/lib/host_led_state_reader.c
index 2a17e0a33b..abcfefffb4 100644
--- a/keyboards/yosino58/lib/host_led_state_reader.c
+++ b/keyboards/yosino58/lib/host_led_state_reader.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "yosino58.h"
 
 char host_led_state_str[24];
 
diff --git a/keyboards/yosino58/lib/keylogger.c b/keyboards/yosino58/lib/keylogger.c
index c50de94c20..dc9c21406f 100644
--- a/keyboards/yosino58/lib/keylogger.c
+++ b/keyboards/yosino58/lib/keylogger.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "yosino58.h"
 
 char keylog_str[24] = {};
 char keylogs_str[21] = {};
diff --git a/keyboards/yosino58/lib/layer_state_reader.c b/keyboards/yosino58/lib/layer_state_reader.c
index 7e5747cb75..2dec336b86 100644
--- a/keyboards/yosino58/lib/layer_state_reader.c
+++ b/keyboards/yosino58/lib/layer_state_reader.c
@@ -1,7 +1,6 @@
 
 #include QMK_KEYBOARD_H
 #include <stdio.h>
-#include "yosino58.h"
 
 #define L_BASE 0
 #define L_LOWER 8
diff --git a/keyboards/yosino58/lib/logo_reader.c b/keyboards/yosino58/lib/logo_reader.c
index 96c9b897ef..b340979807 100644
--- a/keyboards/yosino58/lib/logo_reader.c
+++ b/keyboards/yosino58/lib/logo_reader.c
@@ -1,5 +1,3 @@
-#include "yosino58.h"
-
 const char *read_logo(void) {
   static char logo[] = {
     0x2B,0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
diff --git a/keyboards/yosino58/lib/mode_icon_reader.c b/keyboards/yosino58/lib/mode_icon_reader.c
index 865d9537de..9dadd6ac86 100644
--- a/keyboards/yosino58/lib/mode_icon_reader.c
+++ b/keyboards/yosino58/lib/mode_icon_reader.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "yosino58.h"
 
 char mode_icon[24];
 
diff --git a/keyboards/yosino58/lib/timelogger.c b/keyboards/yosino58/lib/timelogger.c
index ce8b0c270f..db75d77fac 100644
--- a/keyboards/yosino58/lib/timelogger.c
+++ b/keyboards/yosino58/lib/timelogger.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "yosino58.h"
 
 char timelog_str[24] = {};
 int last_time = 0;
diff --git a/keyboards/yosino58/rev1/config.h b/keyboards/yosino58/rev1/config.h
index 39c7907b48..c17ec90d8e 100644
--- a/keyboards/yosino58/rev1/config.h
+++ b/keyboards/yosino58/rev1/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json
index baf43c47a5..597c4a442e 100644
--- a/keyboards/yosino58/rev1/info.json
+++ b/keyboards/yosino58/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x01B8",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/yosino58/rev1/rev1.c b/keyboards/yosino58/rev1/rev1.c
deleted file mode 100644
index 45534122b3..0000000000
--- a/keyboards/yosino58/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "yosino58.h"
diff --git a/keyboards/yosino58/yosino58.c b/keyboards/yosino58/yosino58.c
deleted file mode 100644
index 85545f3f44..0000000000
--- a/keyboards/yosino58/yosino58.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "yosino58.h"
-\ No newline at end of file
diff --git a/keyboards/yosino58/yosino58.h b/keyboards/yosino58/yosino58.h
deleted file mode 100644
index 5414c31bd8..0000000000
--- a/keyboards/yosino58/yosino58.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_yosino58_rev1
-  #include "rev1.h"
-#endif