11 files changed, 1 insertions, 29 deletions
diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h
index 0e7392f0e6..dcacb3c52e 100644
--- a/keyboards/yandrstudio/buff67v3/config.h
+++ b/keyboards/yandrstudio/buff67v3/config.h
@@ -15,7 +15,6 @@
  */
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 5
@@ -28,9 +27,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 #ifdef RGBLIGHT_ENABLE
 
 #    define RGB_DI_PIN B4
diff --git a/keyboards/yandrstudio/eau87/config.h b/keyboards/yandrstudio/eau87/config.h
index 698b5ca141..9d34fe51c6 100644
--- a/keyboards/yandrstudio/eau87/config.h
+++ b/keyboards/yandrstudio/eau87/config.h
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 6
diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h
index 28cb9106bc..aa6ae708c6 100644
--- a/keyboards/yandrstudio/eau_r2/config.h
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 6
@@ -26,9 +25,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 8
-
 #ifdef RGBLIGHT_ENABLE
 
 #    define RGB_DI_PIN A8
diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json
index cf289b3b26..74f5dd6e86 100644
--- a/keyboards/yandrstudio/eau_r2/info.json
+++ b/keyboards/yandrstudio/eau_r2/info.json
@@ -6,6 +6,7 @@
         "pid": "0xAACD",
         "device_version": "1.0.0"
     },
+    "debounce": 8,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h
index 6f2942042a..10b69c89ff 100644
--- a/keyboards/yandrstudio/nightstar75/config.h
+++ b/keyboards/yandrstudio/nightstar75/config.h
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 6
diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h
index 224eb16bb3..f64943aad3 100644
--- a/keyboards/yandrstudio/nz64/config.h
+++ b/keyboards/yandrstudio/nz64/config.h
@@ -15,7 +15,6 @@
  */
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 5
@@ -29,10 +28,6 @@
 /* Fix VIA RGB_light */
 #define VIA_HAS_BROKEN_KEYCODES
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_DI_PIN A7
diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h
index faa7f82141..34136b5838 100644
--- a/keyboards/yandrstudio/nz67v2/config.h
+++ b/keyboards/yandrstudio/nz67v2/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 5
@@ -31,9 +30,6 @@
 
 #define TAP_CODE_DELAY 15
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 #ifdef ENCODER_ENABLE
 
 #   define ENCODERS_PAD_A { A9 }
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index b2431df36c..33c472d6b9 100644
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -15,7 +15,6 @@
  */
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 5
@@ -27,9 +26,6 @@
 #define MATRIX_COL_PINS {  B2,  B10, B11, A8,  A9,  A10, B5,  A15, B3,  A2,  A3,  B4,  A4,  A5,  A6 }
 #define MATRIX_ROW_PINS {  B0,  B6,  B1,  B7,  A1 }
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h
index 1e51826d94..686eae0118 100644
--- a/keyboards/yandrstudio/yr6095/config.h
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -15,7 +15,6 @@
  */
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h
index ced858fafd..b5f122fdc8 100644
--- a/keyboards/yandrstudio/yr80/config.h
+++ b/keyboards/yandrstudio/yr80/config.h
@@ -15,7 +15,6 @@
  */
 
 #pragma once
-#include "config_common.h"
 
 #ifdef RGBLIGHT_ENABLE
 
diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h
index 23638206f7..b4da724d11 100644
--- a/keyboards/yandrstudio/zhou65/config.h
+++ b/keyboards/yandrstudio/zhou65/config.h
@@ -15,7 +15,6 @@
  */
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 5
@@ -33,6 +32,3 @@
 
 /* enable the nkro when using the VIA. */
 #define FORCE_NKRO
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5