From 4d31c5172515a3cf5ea92010142ae11a2743e235 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 20 May 2024 12:31:42 -0700
Subject: [PATCH] Migrate `LOCKING_*_ENABLE` to Data-Driven: D, Part 1 (#23749)

Affects:

  - `dailycraft/owl8`
  - `dailycraft/sandbox/rev1`
  - `dailycraft/sandbox/rev2`
  - `dailycraft/stickey4`
  - `dailycraft/wings42/rev1`
  - `dailycraft/wings42/rev1_extkeys`
  - `dailycraft/wings42/rev2`
  - `daji/seis_cinco`
  - `dark/magnum_ergo_1`
  - `darkproject/kd83a_bfg_edition`
  - `darkproject/kd87a_bfg_edition`
  - `dc01/arrow`
  - `dc01/left`
  - `dc01/numpad`
  - `dc01/right`
  - `dcpedit/redherring`
  - `delikeeb/flatbread60`
  - `delikeeb/vaguettelite`
  - `delikeeb/vanana/rev1`
  - `delikeeb/vanana/rev2`
  - `delikeeb/vaneela`
  - `delikeeb/vaneelaex`
  - `delikeeb/waaffle/rev3/elite_c`
  - `delikeeb/waaffle/rev3/pro_micro`
  - `deltapad`
  - `deltasplit75/v2`
  - `dk60`
  - `dm9records/lain`
  - `dm9records/plaid`
  - `dm9records/tartan`
  - `dmqdesign/spin`
---
 keyboards/dailycraft/owl8/config.h            | 39 -------------------
 keyboards/dailycraft/owl8/keyboard.json       |  6 +++
 keyboards/dailycraft/sandbox/rev1/config.h    | 39 -------------------
 .../dailycraft/sandbox/rev1/keyboard.json     |  6 +++
 keyboards/dailycraft/sandbox/rev2/config.h    | 39 -------------------
 .../dailycraft/sandbox/rev2/keyboard.json     |  6 +++
 keyboards/dailycraft/stickey4/config.h        | 39 -------------------
 keyboards/dailycraft/stickey4/keyboard.json   |  6 +++
 keyboards/dailycraft/wings42/rev1/config.h    | 39 -------------------
 .../dailycraft/wings42/rev1/keyboard.json     |  6 +++
 .../dailycraft/wings42/rev1_extkeys/config.h  | 39 -------------------
 .../wings42/rev1_extkeys/keyboard.json        |  6 +++
 keyboards/dailycraft/wings42/rev2/config.h    | 39 -------------------
 .../dailycraft/wings42/rev2/keyboard.json     |  6 +++
 keyboards/daji/seis_cinco/config.h            |  5 ---
 keyboards/daji/seis_cinco/keyboard.json       |  6 +++
 keyboards/dark/magnum_ergo_1/config.h         |  4 --
 keyboards/dark/magnum_ergo_1/keyboard.json    |  6 +++
 .../darkproject/kd83a_bfg_edition/config.h    |  5 ---
 .../kd83a_bfg_edition/keyboard.json           |  6 ++-
 .../darkproject/kd87a_bfg_edition/config.h    |  5 ---
 .../kd87a_bfg_edition/keyboard.json           |  6 ++-
 keyboards/dc01/arrow/config.h                 |  5 ---
 keyboards/dc01/arrow/keyboard.json            |  6 +++
 keyboards/dc01/left/config.h                  |  5 ---
 keyboards/dc01/left/keyboard.json             |  6 +++
 keyboards/dc01/numpad/config.h                |  5 ---
 keyboards/dc01/numpad/keyboard.json           |  6 +++
 keyboards/dc01/right/config.h                 |  5 ---
 keyboards/dc01/right/keyboard.json            |  6 +++
 keyboards/dcpedit/redherring/config.h         |  4 +-
 keyboards/dcpedit/redherring/keyboard.json    |  6 ++-
 keyboards/delikeeb/flatbread60/config.h       | 39 -------------------
 keyboards/delikeeb/flatbread60/keyboard.json  |  6 +++
 keyboards/delikeeb/vaguettelite/config.h      | 39 -------------------
 keyboards/delikeeb/vaguettelite/keyboard.json |  6 +++
 keyboards/delikeeb/vanana/rev1/config.h       |  5 ---
 keyboards/delikeeb/vanana/rev1/keyboard.json  |  6 +++
 keyboards/delikeeb/vanana/rev2/config.h       |  5 ---
 keyboards/delikeeb/vanana/rev2/keyboard.json  |  6 +++
 keyboards/delikeeb/vaneela/config.h           | 39 -------------------
 keyboards/delikeeb/vaneela/keyboard.json      |  6 +++
 keyboards/delikeeb/vaneelaex/config.h         | 39 -------------------
 keyboards/delikeeb/vaneelaex/keyboard.json    |  6 +++
 keyboards/delikeeb/waaffle/rev3/config.h      |  5 ---
 .../waaffle/rev3/elite_c/keyboard.json        |  6 +++
 .../waaffle/rev3/pro_micro/keyboard.json      |  6 +++
 keyboards/deltapad/config.h                   | 39 -------------------
 keyboards/deltapad/keyboard.json              |  6 +++
 keyboards/deltasplit75/v2/config.h            | 39 -------------------
 keyboards/deltasplit75/v2/keyboard.json       |  6 +++
 keyboards/dk60/config.h                       | 39 -------------------
 keyboards/dk60/keyboard.json                  |  6 +++
 keyboards/dm9records/lain/config.h            |  5 ---
 keyboards/dm9records/lain/keyboard.json       |  6 +++
 keyboards/dm9records/plaid/config.h           | 39 -------------------
 keyboards/dm9records/plaid/keyboard.json      |  6 +++
 keyboards/dm9records/tartan/config.h          | 39 -------------------
 keyboards/dm9records/tartan/keyboard.json     |  6 +++
 keyboards/dmqdesign/spin/config.h             | 23 -----------
 keyboards/dmqdesign/spin/keyboard.json        |  6 +++
 61 files changed, 184 insertions(+), 712 deletions(-)
 delete mode 100644 keyboards/dailycraft/owl8/config.h
 delete mode 100644 keyboards/dailycraft/sandbox/rev1/config.h
 delete mode 100644 keyboards/dailycraft/sandbox/rev2/config.h
 delete mode 100644 keyboards/dailycraft/stickey4/config.h
 delete mode 100644 keyboards/dailycraft/wings42/rev1/config.h
 delete mode 100644 keyboards/dailycraft/wings42/rev1_extkeys/config.h
 delete mode 100644 keyboards/dailycraft/wings42/rev2/config.h
 delete mode 100644 keyboards/delikeeb/flatbread60/config.h
 delete mode 100644 keyboards/delikeeb/vaguettelite/config.h
 delete mode 100644 keyboards/delikeeb/vaneela/config.h
 delete mode 100644 keyboards/delikeeb/vaneelaex/config.h
 delete mode 100644 keyboards/deltapad/config.h
 delete mode 100644 keyboards/deltasplit75/v2/config.h
 delete mode 100644 keyboards/dk60/config.h
 delete mode 100644 keyboards/dm9records/plaid/config.h
 delete mode 100644 keyboards/dm9records/tartan/config.h
 delete mode 100644 keyboards/dmqdesign/spin/config.h

diff --git a/keyboards/dailycraft/owl8/config.h b/keyboards/dailycraft/owl8/config.h
deleted file mode 100644
index 7da6e3f1bf..0000000000
--- a/keyboards/dailycraft/owl8/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 yfuku
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dailycraft/owl8/keyboard.json b/keyboards/dailycraft/owl8/keyboard.json
index 9d654b7d3f..a4a1a70e3e 100644
--- a/keyboards/dailycraft/owl8/keyboard.json
+++ b/keyboards/dailycraft/owl8/keyboard.json
@@ -25,6 +25,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "direct": [
             ["F4", "F7", "B3", "B6", "F5", "F6", "B1", "B2", "D4", "C6", "D7", "E6"]
diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h
deleted file mode 100644
index 7da6e3f1bf..0000000000
--- a/keyboards/dailycraft/sandbox/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 yfuku
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dailycraft/sandbox/rev1/keyboard.json b/keyboards/dailycraft/sandbox/rev1/keyboard.json
index 0a48996815..8658de96df 100644
--- a/keyboards/dailycraft/sandbox/rev1/keyboard.json
+++ b/keyboards/dailycraft/sandbox/rev1/keyboard.json
@@ -21,6 +21,12 @@
         "extrakey": true,
         "oled": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dailycraft/sandbox/rev2/config.h b/keyboards/dailycraft/sandbox/rev2/config.h
deleted file mode 100644
index 7da6e3f1bf..0000000000
--- a/keyboards/dailycraft/sandbox/rev2/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 yfuku
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dailycraft/sandbox/rev2/keyboard.json b/keyboards/dailycraft/sandbox/rev2/keyboard.json
index d6f0ac2c2a..c9f2b8f567 100644
--- a/keyboards/dailycraft/sandbox/rev2/keyboard.json
+++ b/keyboards/dailycraft/sandbox/rev2/keyboard.json
@@ -25,6 +25,12 @@
         "extrakey": true,
         "oled": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dailycraft/stickey4/config.h b/keyboards/dailycraft/stickey4/config.h
deleted file mode 100644
index 7da6e3f1bf..0000000000
--- a/keyboards/dailycraft/stickey4/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 yfuku
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dailycraft/stickey4/keyboard.json b/keyboards/dailycraft/stickey4/keyboard.json
index 101c796b4e..d0e2a491d3 100644
--- a/keyboards/dailycraft/stickey4/keyboard.json
+++ b/keyboards/dailycraft/stickey4/keyboard.json
@@ -25,6 +25,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "direct": [
             ["D4", "C6", "D7", "E6"]
diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h
deleted file mode 100644
index 7da6e3f1bf..0000000000
--- a/keyboards/dailycraft/wings42/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 yfuku
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dailycraft/wings42/rev1/keyboard.json b/keyboards/dailycraft/wings42/rev1/keyboard.json
index a32b591bd6..6b19954d88 100644
--- a/keyboards/dailycraft/wings42/rev1/keyboard.json
+++ b/keyboards/dailycraft/wings42/rev1/keyboard.json
@@ -24,6 +24,12 @@
         "mousekey": true,
         "extrakey": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "community_layouts": [
         "split_3x6_3"
     ],
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
deleted file mode 100644
index 7da6e3f1bf..0000000000
--- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 yfuku
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
index ff665a3bb7..1d77f044fb 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
@@ -24,6 +24,12 @@
         "mousekey": true,
         "extrakey": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h
deleted file mode 100644
index 7da6e3f1bf..0000000000
--- a/keyboards/dailycraft/wings42/rev2/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 yfuku
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dailycraft/wings42/rev2/keyboard.json b/keyboards/dailycraft/wings42/rev2/keyboard.json
index 13f283d92b..c3b686cec4 100644
--- a/keyboards/dailycraft/wings42/rev2/keyboard.json
+++ b/keyboards/dailycraft/wings42/rev2/keyboard.json
@@ -31,6 +31,12 @@
         "extrakey": true,
         "mousekey": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layout_aliases": {
         "LAYOUT_split_3x6_3_2": "LAYOUT_split_3x6_3"
     },
diff --git a/keyboards/daji/seis_cinco/config.h b/keyboards/daji/seis_cinco/config.h
index d212094077..a8afb61572 100644
--- a/keyboards/daji/seis_cinco/config.h
+++ b/keyboards/daji/seis_cinco/config.h
@@ -17,11 +17,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* VIA layouts
  * 2 bits = 4 layout options
  */
diff --git a/keyboards/daji/seis_cinco/keyboard.json b/keyboards/daji/seis_cinco/keyboard.json
index a358ae86a1..358dfc17ce 100644
--- a/keyboards/daji/seis_cinco/keyboard.json
+++ b/keyboards/daji/seis_cinco/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B1", "B0", "A7", "B14", "A8", "B15", "A0", "C15", "C14", "C13", "B5", "B4", "B3", "A15", "A10", "A14"],
         "rows": ["B2", "B10", "B11", "A9", "A6"]
diff --git a/keyboards/dark/magnum_ergo_1/config.h b/keyboards/dark/magnum_ergo_1/config.h
index 6b153f69df..a62055722b 100644
--- a/keyboards/dark/magnum_ergo_1/config.h
+++ b/keyboards/dark/magnum_ergo_1/config.h
@@ -16,10 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   2
 #define BACKLIGHT_PAL_MODE      2
diff --git a/keyboards/dark/magnum_ergo_1/keyboard.json b/keyboards/dark/magnum_ergo_1/keyboard.json
index 1aecfe8630..a52de6decc 100644
--- a/keyboards/dark/magnum_ergo_1/keyboard.json
+++ b/keyboards/dark/magnum_ergo_1/keyboard.json
@@ -25,6 +25,12 @@
         "mousekey": false,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "C7",
diff --git a/keyboards/darkproject/kd83a_bfg_edition/config.h b/keyboards/darkproject/kd83a_bfg_edition/config.h
index cb7cdb57fc..880aabd5d7 100644
--- a/keyboards/darkproject/kd83a_bfg_edition/config.h
+++ b/keyboards/darkproject/kd83a_bfg_edition/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* External spi flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
 
diff --git a/keyboards/darkproject/kd83a_bfg_edition/keyboard.json b/keyboards/darkproject/kd83a_bfg_edition/keyboard.json
index 56c45a222f..23bd2b6981 100644
--- a/keyboards/darkproject/kd83a_bfg_edition/keyboard.json
+++ b/keyboards/darkproject/kd83a_bfg_edition/keyboard.json
@@ -31,7 +31,11 @@
     },
     "processor": "WB32FQ95",
     "qmk": {
-        "tap_keycode_delay": 10
+        "tap_keycode_delay": 10,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
     },
     "rgb_matrix": {
         "animations": {
diff --git a/keyboards/darkproject/kd87a_bfg_edition/config.h b/keyboards/darkproject/kd87a_bfg_edition/config.h
index 1d4c0772a2..a32f712231 100644
--- a/keyboards/darkproject/kd87a_bfg_edition/config.h
+++ b/keyboards/darkproject/kd87a_bfg_edition/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* External spi flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
 
diff --git a/keyboards/darkproject/kd87a_bfg_edition/keyboard.json b/keyboards/darkproject/kd87a_bfg_edition/keyboard.json
index 76cd497b0f..856dbea648 100644
--- a/keyboards/darkproject/kd87a_bfg_edition/keyboard.json
+++ b/keyboards/darkproject/kd87a_bfg_edition/keyboard.json
@@ -30,7 +30,11 @@
     },
     "processor": "WB32FQ95",
     "qmk": {
-        "tap_keycode_delay": 10
+        "tap_keycode_delay": 10,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
     },
     "rgb_matrix": {
         "animations": {
diff --git a/keyboards/dc01/arrow/config.h b/keyboards/dc01/arrow/config.h
index ef008e5dfe..0edb8002c8 100644
--- a/keyboards/dc01/arrow/config.h
+++ b/keyboards/dc01/arrow/config.h
@@ -37,8 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* 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 */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/dc01/arrow/keyboard.json b/keyboards/dc01/arrow/keyboard.json
index 85ca25c23e..72fa1b4e22 100644
--- a/keyboards/dc01/arrow/keyboard.json
+++ b/keyboards/dc01/arrow/keyboard.json
@@ -17,6 +17,12 @@
         "extrakey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/dc01/left/config.h b/keyboards/dc01/left/config.h
index dbaed0d54d..1f58007ac1 100644
--- a/keyboards/dc01/left/config.h
+++ b/keyboards/dc01/left/config.h
@@ -41,11 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* 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 */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/dc01/left/keyboard.json b/keyboards/dc01/left/keyboard.json
index e296790995..2238f67564 100644
--- a/keyboards/dc01/left/keyboard.json
+++ b/keyboards/dc01/left/keyboard.json
@@ -16,6 +16,12 @@
         "extrakey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "debounce": 0,
     "layouts": {
         "LAYOUT_ansi": {
diff --git a/keyboards/dc01/numpad/config.h b/keyboards/dc01/numpad/config.h
index bcaf26b3f0..b2b71f574f 100644
--- a/keyboards/dc01/numpad/config.h
+++ b/keyboards/dc01/numpad/config.h
@@ -37,8 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* 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 */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/dc01/numpad/keyboard.json b/keyboards/dc01/numpad/keyboard.json
index 0cf73c23e3..900af6e542 100644
--- a/keyboards/dc01/numpad/keyboard.json
+++ b/keyboards/dc01/numpad/keyboard.json
@@ -17,6 +17,12 @@
         "extrakey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "community_layouts": ["numpad_5x4", "ortho_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
diff --git a/keyboards/dc01/right/config.h b/keyboards/dc01/right/config.h
index 0e19af1525..6529b8e788 100644
--- a/keyboards/dc01/right/config.h
+++ b/keyboards/dc01/right/config.h
@@ -37,8 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* 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 */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/dc01/right/keyboard.json b/keyboards/dc01/right/keyboard.json
index 6f48e05483..36dc7a7056 100644
--- a/keyboards/dc01/right/keyboard.json
+++ b/keyboards/dc01/right/keyboard.json
@@ -17,6 +17,12 @@
         "extrakey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/dcpedit/redherring/config.h b/keyboards/dcpedit/redherring/config.h
index 115be3306e..790b9cd631 100755
--- a/keyboards/dcpedit/redherring/config.h
+++ b/keyboards/dcpedit/redherring/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
 #define SOLENOID_PIN   B5
 #define OLED_IC OLED_IC_SH1107
-#define OLED_DISPLAY_64X128
\ No newline at end of file
+#define OLED_DISPLAY_64X128
diff --git a/keyboards/dcpedit/redherring/keyboard.json b/keyboards/dcpedit/redherring/keyboard.json
index a2f87c90b9..a6747402d0 100644
--- a/keyboards/dcpedit/redherring/keyboard.json
+++ b/keyboards/dcpedit/redherring/keyboard.json
@@ -29,7 +29,11 @@
     },
     "processor": "atmega32a",
     "qmk": {
-        "tap_keycode_delay": 10
+        "tap_keycode_delay": 10,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
     },
     "haptic": {
         "driver": "solenoid"
diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h
deleted file mode 100644
index 93fec1ee2d..0000000000
--- a/keyboards/delikeeb/flatbread60/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 noclew
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/delikeeb/flatbread60/keyboard.json b/keyboards/delikeeb/flatbread60/keyboard.json
index 8a4614e5b4..b0cf794dfb 100644
--- a/keyboards/delikeeb/flatbread60/keyboard.json
+++ b/keyboards/delikeeb/flatbread60/keyboard.json
@@ -38,6 +38,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
         "rows": ["F6", "B1", "B3", "B2", "B6"]
diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h
deleted file mode 100644
index 93fec1ee2d..0000000000
--- a/keyboards/delikeeb/vaguettelite/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 noclew
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/delikeeb/vaguettelite/keyboard.json b/keyboards/delikeeb/vaguettelite/keyboard.json
index 98311fe115..56919958f2 100644
--- a/keyboards/delikeeb/vaguettelite/keyboard.json
+++ b/keyboards/delikeeb/vaguettelite/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F6", "F7", "B1", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D0", "D4"],
         "rows": ["F4", "B3", "D1", "D2", "D3", "F5"]
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index f5d10c1915..9728115106 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define B7_AUDIO
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
  */
diff --git a/keyboards/delikeeb/vanana/rev1/keyboard.json b/keyboards/delikeeb/vanana/rev1/keyboard.json
index 9ae59761de..d8d5d2e4c9 100644
--- a/keyboards/delikeeb/vanana/rev1/keyboard.json
+++ b/keyboards/delikeeb/vanana/rev1/keyboard.json
@@ -37,6 +37,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index f5d10c1915..9728115106 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define B7_AUDIO
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
  */
diff --git a/keyboards/delikeeb/vanana/rev2/keyboard.json b/keyboards/delikeeb/vanana/rev2/keyboard.json
index a15ad3e71a..9da7a9dd88 100644
--- a/keyboards/delikeeb/vanana/rev2/keyboard.json
+++ b/keyboards/delikeeb/vanana/rev2/keyboard.json
@@ -39,6 +39,12 @@
         "rgblight": true,
         "audio": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/delikeeb/vaneela/config.h b/keyboards/delikeeb/vaneela/config.h
deleted file mode 100644
index 93fec1ee2d..0000000000
--- a/keyboards/delikeeb/vaneela/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 noclew
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/delikeeb/vaneela/keyboard.json b/keyboards/delikeeb/vaneela/keyboard.json
index 226014b8a0..5f76c8b7ab 100644
--- a/keyboards/delikeeb/vaneela/keyboard.json
+++ b/keyboards/delikeeb/vaneela/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
         "rows": ["F6", "F7", "B3", "B2", "B6"]
diff --git a/keyboards/delikeeb/vaneelaex/config.h b/keyboards/delikeeb/vaneelaex/config.h
deleted file mode 100644
index 93fec1ee2d..0000000000
--- a/keyboards/delikeeb/vaneelaex/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 noclew
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/delikeeb/vaneelaex/keyboard.json b/keyboards/delikeeb/vaneelaex/keyboard.json
index 8bf40b169b..9810d341ab 100644
--- a/keyboards/delikeeb/vaneelaex/keyboard.json
+++ b/keyboards/delikeeb/vaneelaex/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B5", "B4", "E6", "D7", "C6", "D4"],
         "rows": ["D3", "D2", "D1", "D0", "B2", "B6"]
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index 6450b251b7..43f6a43b6f 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
  */
diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json b/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json
index 44fd177e02..22fb33aade 100644
--- a/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json
+++ b/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json
@@ -10,5 +10,11 @@
         "nkro": false,
         "rgblight": true,
         "encoder": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
     }
 }
diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json b/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json
index a97bf794ea..55e68c4393 100644
--- a/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json
+++ b/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json
@@ -8,5 +8,11 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
     }
 }
diff --git a/keyboards/deltapad/config.h b/keyboards/deltapad/config.h
deleted file mode 100644
index a62147158e..0000000000
--- a/keyboards/deltapad/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 Richard Snijder
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/deltapad/keyboard.json b/keyboards/deltapad/keyboard.json
index 256f2ba105..23683bbd1e 100644
--- a/keyboards/deltapad/keyboard.json
+++ b/keyboards/deltapad/keyboard.json
@@ -16,6 +16,12 @@
     "mousekey": true,
     "nkro": false
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["D7", "E6", "B4", "B5"],
     "rows": ["D2", "D3", "D1", "D0"]
diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h
deleted file mode 100644
index 9b7700e013..0000000000
--- a/keyboards/deltasplit75/v2/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/deltasplit75/v2/keyboard.json b/keyboards/deltasplit75/v2/keyboard.json
index 2c1968e0b5..d175633d71 100644
--- a/keyboards/deltasplit75/v2/keyboard.json
+++ b/keyboards/deltasplit75/v2/keyboard.json
@@ -30,6 +30,12 @@
         "extrakey": true,
         "command": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
       "LAYOUT_v2": {
         "layout": [
diff --git a/keyboards/dk60/config.h b/keyboards/dk60/config.h
deleted file mode 100644
index cfa9c05154..0000000000
--- a/keyboards/dk60/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2017 Damien Broqua <contact@darkou.fr>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dk60/keyboard.json b/keyboards/dk60/keyboard.json
index 3e451a5c8d..a88920814d 100644
--- a/keyboards/dk60/keyboard.json
+++ b/keyboards/dk60/keyboard.json
@@ -18,6 +18,12 @@
         "sleep_led": true,
         "unicode": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0", "B3", "B2", "B1", "D3", "D5", "B5", "B7", "C6", "C7", "D0", "D1", "D2"],
         "rows": ["B6", "B4", "D7", "D6", "D4"]
diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h
index ddb4b6702f..7c9ddea707 100644
--- a/keyboards/dm9records/lain/config.h
+++ b/keyboards/dm9records/lain/config.h
@@ -7,8 +7,3 @@
 #define LED_NUM 3
 #define LED_PINS \
     { B6, B5, B4 }
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/dm9records/lain/keyboard.json b/keyboards/dm9records/lain/keyboard.json
index 3736d04aee..32cece9f15 100644
--- a/keyboards/dm9records/lain/keyboard.json
+++ b/keyboards/dm9records/lain/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "D2", "D3", "D5"],
         "rows": ["C6", "D7", "D6", "D4"]
diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h
deleted file mode 100644
index 71400c3cf8..0000000000
--- a/keyboards/dm9records/plaid/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Takuya Urakawa (dm9records.com)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dm9records/plaid/keyboard.json b/keyboards/dm9records/plaid/keyboard.json
index a2052e5562..661b4addca 100644
--- a/keyboards/dm9records/plaid/keyboard.json
+++ b/keyboards/dm9records/plaid/keyboard.json
@@ -21,6 +21,12 @@
     "mousekey": true,
     "extrakey": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "community_layouts": ["ortho_4x12", "planck_mit"],
   "layout_aliases": {
     "LAYOUT": "LAYOUT_ortho_4x12",
diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h
deleted file mode 100644
index 71400c3cf8..0000000000
--- a/keyboards/dm9records/tartan/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Takuya Urakawa (dm9records.com)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/dm9records/tartan/keyboard.json b/keyboards/dm9records/tartan/keyboard.json
index 208dcf330b..feb0722c01 100644
--- a/keyboards/dm9records/tartan/keyboard.json
+++ b/keyboards/dm9records/tartan/keyboard.json
@@ -20,6 +20,12 @@
     "mousekey": true,
     "extrakey": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
   "layout_aliases": {
     "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift"
diff --git a/keyboards/dmqdesign/spin/config.h b/keyboards/dmqdesign/spin/config.h
deleted file mode 100644
index cc43876148..0000000000
--- a/keyboards/dmqdesign/spin/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2019-2020 DMQ Design
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/dmqdesign/spin/keyboard.json b/keyboards/dmqdesign/spin/keyboard.json
index a2bc050e91..b271f1ebd5 100644
--- a/keyboards/dmqdesign/spin/keyboard.json
+++ b/keyboards/dmqdesign/spin/keyboard.json
@@ -19,6 +19,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F5", "F6", "F7", "C7", "C6"],
         "rows": ["F0", "F1", "F4"]