10 files changed, 12 insertions, 34 deletions
diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h
index cea58affaa..9d63b82b19 100644
--- a/keyboards/vitamins_included/rev1/config.h
+++ b/keyboards/vitamins_included/rev1/config.h
@@ -23,12 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EE_HANDS
 
-// wiring of each half
-#define MATRIX_ROW_PINS { F5, F6, C7, F7 }
-#define MATRIX_COL_PINS { F1, F4, E2, B6, D7, D6}
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json
index e79f940440..7561cb5851 100644
--- a/keyboards/vitamins_included/rev1/info.json
+++ b/keyboards/vitamins_included/rev1/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "E2", "B6", "D7", "D6"],
+        "rows": ["F5", "F6", "C7", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/vitamins_included/rev1/rev1.c b/keyboards/vitamins_included/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/vitamins_included/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/vitamins_included/rev1/rev1.h b/keyboards/vitamins_included/rev1/rev1.h
deleted file mode 100644
index 53ae64a6ea..0000000000
--- a/keyboards/vitamins_included/rev1/rev1.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#pragma once
-#include QMK_KEYBOARD_H
diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h
index 40f6312b47..0fa20e9c86 100644
--- a/keyboards/vitamins_included/rev2/config.h
+++ b/keyboards/vitamins_included/rev2/config.h
@@ -22,12 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN B4
 
-// wiring of each half
-#define MATRIX_ROW_PINS { F5, F6, C7, F7 }
-#define MATRIX_COL_PINS { F1, F4, E2, B6, D7, D6}
-
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN F0
 
diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json
index 894043ef98..0098b22d14 100644
--- a/keyboards/vitamins_included/rev2/info.json
+++ b/keyboards/vitamins_included/rev2/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "E2", "B6", "D7", "D6"],
+        "rows": ["F5", "F6", "C7", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "qmk_lufa_bootloader": {
         "esc_input": "F5",
         "esc_output": "F1",
diff --git a/keyboards/vitamins_included/rev2/rev2.c b/keyboards/vitamins_included/rev2/rev2.c
index 15b47089e8..d34cdb4fc1 100644
--- a/keyboards/vitamins_included/rev2/rev2.c
+++ b/keyboards/vitamins_included/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "rev2.h"
+#include "quantum.h"
 
 bool is_keyboard_left(void) {
     #if defined(MASTER_LEFT)
diff --git a/keyboards/vitamins_included/rev2/rev2.h b/keyboards/vitamins_included/rev2/rev2.h
deleted file mode 100644
index 7e12888dda..0000000000
--- a/keyboards/vitamins_included/rev2/rev2.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include QMK_KEYBOARD_H
diff --git a/keyboards/vitamins_included/vitamins_included.c b/keyboards/vitamins_included/vitamins_included.c
index e83c81633c..a6429d87e8 100644
--- a/keyboards/vitamins_included/vitamins_included.c
+++ b/keyboards/vitamins_included/vitamins_included.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "vitamins_included.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/vitamins_included/vitamins_included.h b/keyboards/vitamins_included/vitamins_included.h
index 5cd03cfcf8..21509d9743 100644
--- a/keyboards/vitamins_included/vitamins_included.h
+++ b/keyboards/vitamins_included/vitamins_included.h
@@ -2,20 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_vitamins_included_rev1
-    #include "rev1.h"
-#else
-    #include "rev2.h"
-#endif
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
 	L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
 	L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \