Merge remote-tracking branch 'origin/master' into develop

17 files changed, 14 insertions, 50 deletions

diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
index 7db11618cf..0a03dd9b1f 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.h b/keyboards/handwired/dactyl_manuform/4x5/4x5.h
index 73f6be64c2..e410c22466 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/4x5.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/4x5.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
index 682c7a868b..6b0ddbfe8e 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "../../config.h"
-
 /* Use I2C or Serial, not both */
 
 #define USE_SERIAL
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
index 0a1c90b6bf..009d88fd0e 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
@@ -1,6 +1,4 @@
-#include "dactyl_manuform.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.h b/keyboards/handwired/dactyl_manuform/4x6/4x6.h
index dcdb1a39ec..99b11a712a 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/4x6.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/4x6.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
index f34d8be4df..df639cbf22 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.h b/keyboards/handwired/dactyl_manuform/5x6/5x6.h
index 606a213492..ebc959ddf1 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/5x6.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/5x6.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h
index 790fdb0695..7191119fd9 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h
index 794b0be9fe..3179426585 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.h b/keyboards/handwired/dactyl_manuform/5x7/5x7.h
index 0c0c781be7..7cd2597a1f 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/5x7.h
+++ b/keyboards/handwired/dactyl_manuform/5x7/5x7.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.h b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
index 7bff55701a..657d057787 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/6x6.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
index 7c767cae7e..74cb474a5b 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
index 00f931281b..1adb7d4696 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.h b/keyboards/handwired/dactyl_manuform/6x7/6x7.h
index 8d69ddd097..bd66c309fc 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/6x7.h
+++ b/keyboards/handwired/dactyl_manuform/6x7/6x7.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.c b/keyboards/handwired/dactyl_manuform/dactyl_manuform.c
deleted file mode 100644
index 043bbd5672..0000000000
--- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "dactyl_manuform.h"
diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
deleted file mode 100644
index c339370f8b..0000000000
--- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_handwired_dactyl_manuform_4x5)
-#    include "4x5.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_4x6)
-#    include "4x6.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_4x6_5)
-#    include "4x6_5.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_5x6)
-#    include "5x6.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_5x6_5)
-#    include "5x6_5.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_5x6_2_5)
-#    include "5x6_2_5.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_5x7)
-#    include "5x7.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6)
-#    include "6x6.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6_4)
-#    include "6x6_4.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6_kinesis)
-#    include "6x6_kinesis.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_6x7)
-#    include "6x7.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_3x5_3)
-#    include "3x5_3.h"
-#elif defined(KEYBOARD_handwired_dactyl_manuform_dmote_62key)
-#    include "62key.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
index 2d52e7e5fb..673164b424 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 // This uses the same coordinate system as the program that defines
 // the case model, but not the same coordinates.