6 files changed, 7 insertions, 24 deletions
diff --git a/keyboards/adkb96/adkb96.c b/keyboards/adkb96/adkb96.c
index 93230ee00c..591a17c082 100644
--- a/keyboards/adkb96/adkb96.c
+++ b/keyboards/adkb96/adkb96.c
@@ -1,4 +1,4 @@
-#include "adkb96.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/adkb96/adkb96.h b/keyboards/adkb96/adkb96.h
deleted file mode 100644
index 5a47f16aad..0000000000
--- a/keyboards/adkb96/adkb96.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_adkb96_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json
index e86480d7d7..1a9a95cec3 100644
--- a/keyboards/adkb96/info.json
+++ b/keyboards/adkb96/info.json
@@ -8,6 +8,11 @@
 		"pid": "0xAD96",
 		"device_version": "0.0.1"
 	},
+	"matrix_pins": {
+		"cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+		"rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+	},
+	"diode_direction": "COL2ROW",
 	"split": {
 		"soft_serial_pin": "D0"
 	},
diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
index c5a9673671..89de3d9a64 100644
--- a/keyboards/adkb96/rev1/config.h
+++ b/keyboards/adkb96/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, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* define tapping term */
 #define TAPPING_TERM 100
 
diff --git a/keyboards/adkb96/rev1/rev1.c b/keyboards/adkb96/rev1/rev1.c
deleted file mode 100644
index 594c532994..0000000000
--- a/keyboards/adkb96/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "adkb96.h"
diff --git a/keyboards/adkb96/rev1/rev1.h b/keyboards/adkb96/rev1/rev1.h
index 4c4c7bae3c..03a9211bb9 100644
--- a/keyboards/adkb96/rev1/rev1.h
+++ b/keyboards/adkb96/rev1/rev1.h
@@ -1,14 +1,6 @@
 #pragma once
 
-#include "adkb96.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
+#include "quantum.h"
 
 // Keymap with right side flipped
 // (TRRS jack on both halves are to the right)