4 files changed, 11 insertions, 19 deletions
diff --git a/keyboards/rubi/config.h b/keyboards/rubi/config.h
index d80fa7ec35..725e6e29f4 100644
--- a/keyboards/rubi/config.h
+++ b/keyboards/rubi/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B3, B2, B1, F7 }
-
-/* COL2ROW, ROW2COL */
-#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/rubi/info.json b/keyboards/rubi/info.json
index c9120a2f48..fec1b52ea3 100644
--- a/keyboards/rubi/info.json
+++ b/keyboards/rubi/info.json
@@ -8,6 +8,11 @@
       "pid": "0x5242",
       "device_version": "0.0.1"
    },
+   "matrix_pins": {
+      "cols": ["B3", "B2", "B1", "F7"],
+      "rows": ["F0", "F1", "F4", "F5", "F6"]
+   },
+   "diode_direction": "COL2ROW",
    "encoder": {
       "rotary": [
          {"pin_a": "D7", "pin_b": "D6"}
diff --git a/keyboards/rubi/lib/oled.c b/keyboards/rubi/lib/oled.c
index 9534cdd9b7..9297cddf0e 100644
--- a/keyboards/rubi/lib/oled.c
+++ b/keyboards/rubi/lib/oled.c
@@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
-#include "./lib/oled.h"
+#include "oled.h"
+#include "rubi.h"
 
 bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
     return process_record_user(keycode, record);
diff --git a/keyboards/rubi/lib/oled.h b/keyboards/rubi/lib/oled.h
index 1737541c96..8af48c667b 100644
--- a/keyboards/rubi/lib/oled.h
+++ b/keyboards/rubi/lib/oled.h
@@ -17,6 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include <stdbool.h>
+#include <stdint.h>
+#include "progmem.h"
+
 #define OLED_FRAME_TIMEOUT (1000 / 30)  // 30 fps
 #define OLED_LOGO_TIMEOUT 3000          // 3 sec