diff --git a/keyboards/25keys/zinc/rev1/rev1.c b/keyboards/25keys/zinc/rev1/rev1.c
deleted file mode 100644
index 139919d5a6..0000000000
--- a/keyboards/25keys/zinc/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "zinc.h"
diff --git a/keyboards/25keys/zinc/reva/reva.c b/keyboards/25keys/zinc/reva/reva.c
deleted file mode 100644
index 139919d5a6..0000000000
--- a/keyboards/25keys/zinc/reva/reva.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "zinc.h"
diff --git a/keyboards/25keys/zinc/zinc.c b/keyboards/25keys/zinc/zinc.c
deleted file mode 100644
index 139919d5a6..0000000000
--- a/keyboards/25keys/zinc/zinc.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "zinc.h"
diff --git a/keyboards/25keys/zinc/zinc.h b/keyboards/25keys/zinc/zinc.h
deleted file mode 100644
index 8a80538e4c..0000000000
--- a/keyboards/25keys/zinc/zinc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_25keys_zinc_reva
- #include "reva.h"
-#endif
-#ifdef KEYBOARD_25keys_zinc_rev1
- #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/40percentclub/i75/i75.c b/keyboards/40percentclub/i75/i75.c
deleted file mode 100644
index 28684e7144..0000000000
--- a/keyboards/40percentclub/i75/i75.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018
- *
- * 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 .
- */
-#include "i75.h"
diff --git a/keyboards/40percentclub/i75/i75.h b/keyboards/40percentclub/i75/i75.h
deleted file mode 100644
index a31c9f6e6f..0000000000
--- a/keyboards/40percentclub/i75/i75.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2018
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_40percentclub_i75_promicro
- #include "promicro.h"
-#elif KEYBOARD_40percentclub_i75_teensy2
- #include "teensy2.h"
-#endif
diff --git a/keyboards/40percentclub/i75/promicro/promicro.c b/keyboards/40percentclub/i75/promicro/promicro.c
deleted file mode 100644
index 28684e7144..0000000000
--- a/keyboards/40percentclub/i75/promicro/promicro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018
- *
- * 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 .
- */
-#include "i75.h"
diff --git a/keyboards/40percentclub/i75/promicro/promicro.h b/keyboards/40percentclub/i75/promicro/promicro.h
index 29394855a6..0a617ac36c 100644
--- a/keyboards/40percentclub/i75/promicro/promicro.h
+++ b/keyboards/40percentclub/i75/promicro/promicro.h
@@ -16,7 +16,6 @@
#pragma once
-#include "i75.h"
#include "quantum.h"
/* This a shortcut to help you visually see your layout.
diff --git a/keyboards/40percentclub/i75/teensy2/teensy2.c b/keyboards/40percentclub/i75/teensy2/teensy2.c
deleted file mode 100644
index 28684e7144..0000000000
--- a/keyboards/40percentclub/i75/teensy2/teensy2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018
- *
- * 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 .
- */
-#include "i75.h"
diff --git a/keyboards/40percentclub/i75/teensy2/teensy2.h b/keyboards/40percentclub/i75/teensy2/teensy2.h
index 29394855a6..0a617ac36c 100644
--- a/keyboards/40percentclub/i75/teensy2/teensy2.h
+++ b/keyboards/40percentclub/i75/teensy2/teensy2.h
@@ -16,7 +16,6 @@
#pragma once
-#include "i75.h"
#include "quantum.h"
/* This a shortcut to help you visually see your layout.
diff --git a/keyboards/40percentclub/polyandry/polyandry.c b/keyboards/40percentclub/polyandry/polyandry.c
deleted file mode 100644
index 2b4be589b8..0000000000
--- a/keyboards/40percentclub/polyandry/polyandry.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021
- *
- * 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 .
- */
-#include "polyandry.h"
diff --git a/keyboards/40percentclub/polyandry/polyandry.h b/keyboards/40percentclub/polyandry/polyandry.h
deleted file mode 100644
index 5baf87ba62..0000000000
--- a/keyboards/40percentclub/polyandry/polyandry.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_40percentclub_polyandry_promicro
- #include "promicro.h"
-#elif KEYBOARD_40percentclub_polyandry_teensy2
- #include "teensy2.h"
-#endif
diff --git a/keyboards/40percentclub/polyandry/promicro/promicro.c b/keyboards/40percentclub/polyandry/promicro/promicro.c
deleted file mode 100644
index ea1dd51788..0000000000
--- a/keyboards/40percentclub/polyandry/promicro/promicro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021
- *
- * 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 .
- */
-#include "promicro.h"
diff --git a/keyboards/40percentclub/polyandry/promicro/promicro.h b/keyboards/40percentclub/polyandry/promicro/promicro.h
index 0a6f8b36b8..e2a9dbcf35 100644
--- a/keyboards/40percentclub/polyandry/promicro/promicro.h
+++ b/keyboards/40percentclub/polyandry/promicro/promicro.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "polyandry.h"
+#include "quantum.h"
#define LAYOUT_ortho_4x3( \
K000, K001, K002, \
diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.c b/keyboards/40percentclub/polyandry/teensy2/teensy2.c
deleted file mode 100644
index 33cfb6e553..0000000000
--- a/keyboards/40percentclub/polyandry/teensy2/teensy2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021
- *
- * 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 .
- */
-#include "teensy2.h"
diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.h b/keyboards/40percentclub/polyandry/teensy2/teensy2.h
index ce7790434b..dd6ef3f6bb 100644
--- a/keyboards/40percentclub/polyandry/teensy2/teensy2.h
+++ b/keyboards/40percentclub/polyandry/teensy2/teensy2.h
@@ -20,7 +20,7 @@
//I DO NOT HAVE A TEENSY 2.0 TO TEST WITH.
//I believe this should still work - but it's not a sure thing.
-#include "polyandry.h"
+#include "quantum.h"
#define LAYOUT_ortho_4x3( \
K000, K001, K002, \
diff --git a/keyboards/acheron/apollo/87h/87h.c b/keyboards/acheron/apollo/87h/87h.c
deleted file mode 100644
index 3d3f364ba8..0000000000
--- a/keyboards/acheron/apollo/87h/87h.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Alvaro "Gondolindrim" Volpato
- *
- * 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 .
- */
-#include "87h.h"
diff --git a/keyboards/acheron/apollo/87h/87h.h b/keyboards/acheron/apollo/87h/87h.h
deleted file mode 100644
index 535575f451..0000000000
--- a/keyboards/acheron/apollo/87h/87h.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2022 Alvaro "Gondolindrim" Volpato
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_acheron_apollo_87h_gamma)
- #include "gamma.h"
-#elif defined(KEYBOARD_acheron_apollo_87h_delta)
- #include "delta.h"
-#endif
diff --git a/keyboards/acheron/athena/athena.c b/keyboards/acheron/athena/athena.c
deleted file mode 100644
index aa5fae94f6..0000000000
--- a/keyboards/acheron/athena/athena.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Alvaro "Gondolindrim" Volpato
- *
- * 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 .
- */
-#include "athena.h"
diff --git a/keyboards/acheron/athena/athena.h b/keyboards/acheron/athena/athena.h
deleted file mode 100644
index 0dd55ba8f1..0000000000
--- a/keyboards/acheron/athena/athena.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2022 Alvaro "Gondolindrim" Volpato
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_acheron_athena_alpha)
- #include "alpha.h"
-#elif defined(KEYBOARD_acheron_athena_beta)
- #include "beta.h"
-#endif
diff --git a/keyboards/acheron/elongate/beta/beta.c b/keyboards/acheron/elongate/beta/beta.c
deleted file mode 100644
index ffa13d4fe1..0000000000
--- a/keyboards/acheron/elongate/beta/beta.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Gondolindrim
- *
- * 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 .
- */
-
-#include "beta.h"
diff --git a/keyboards/acheron/elongate/elongate.c b/keyboards/acheron/elongate/elongate.c
deleted file mode 100644
index 9bf0d893a9..0000000000
--- a/keyboards/acheron/elongate/elongate.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Copyright 2021 Gondolindrim
- *
- * 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.
- */
-
-#include "elongate.h"
diff --git a/keyboards/acheron/elongate/elongate.h b/keyboards/acheron/elongate/elongate.h
deleted file mode 100644
index 2e58871643..0000000000
--- a/keyboards/acheron/elongate/elongate.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020-2022 Gondolindrim
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_acheron_elongate_beta)
- #include "beta.h"
-#elif defined(KEYBOARD_acheron_elongate_delta)
- #include "delta.h"
-#endif
diff --git a/keyboards/acheron/shark/alpha/alpha.c b/keyboards/acheron/shark/alpha/alpha.c
deleted file mode 100644
index e841f3fbd5..0000000000
--- a/keyboards/acheron/shark/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Álvaro "Gondolindrim" Volpato
- *
- * 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 .
- */
-#include "alpha.h"
diff --git a/keyboards/acheron/shark/shark.c b/keyboards/acheron/shark/shark.c
deleted file mode 100644
index 1a660019e2..0000000000
--- a/keyboards/acheron/shark/shark.c
+++ /dev/null
@@ -1,14 +0,0 @@
- /* Copyright 2022 Álvaro "Gondolindrim" Volpato
- *
- * 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.
- */
-
-#include "shark.h"
diff --git a/keyboards/acheron/shark/shark.h b/keyboards/acheron/shark/shark.h
deleted file mode 100644
index 0f65419885..0000000000
--- a/keyboards/acheron/shark/shark.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_acheron_shark_alpha)
- #include "alpha.h"
-#elif defined(KEYBOARD_acheron_shark_beta)
- #include "beta.h"
-#endif
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/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 ff893e6da6..03a9211bb9 100644
--- a/keyboards/adkb96/rev1/rev1.h
+++ b/keyboards/adkb96/rev1/rev1.h
@@ -1,6 +1,6 @@
#pragma once
-#include "adkb96.h"
+#include "quantum.h"
// Keymap with right side flipped
// (TRRS jack on both halves are to the right)
diff --git a/keyboards/aeboards/constellation/constellation.c b/keyboards/aeboards/constellation/constellation.c
deleted file mode 100755
index 0b8354d071..0000000000
--- a/keyboards/aeboards/constellation/constellation.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Harrison Chan (Xelus)
- *
- * 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 .
- */
-
-// Nothing to see here, move along... ;-)
-
-#include "constellation.h"
diff --git a/keyboards/aeboards/constellation/constellation.h b/keyboards/aeboards/constellation/constellation.h
deleted file mode 100755
index 3724b29d6a..0000000000
--- a/keyboards/aeboards/constellation/constellation.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Harrison Chan (Xelus)
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_aeboards_constellation_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_aeboards_constellation_rev2)
- #include "rev2.h"
-#elif defined(KEYBOARD_aeboards_constellation_rev3)
- #include "rev3.h"
-#endif
diff --git a/keyboards/aeboards/constellation/rev1/rev1.c b/keyboards/aeboards/constellation/rev1/rev1.c
deleted file mode 100755
index 6e8f0a1192..0000000000
--- a/keyboards/aeboards/constellation/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Harrison Chan (Xelus)
- *
- * 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 .
- */
-
-#include "rev1.h"
diff --git a/keyboards/aeboards/constellation/rev3/rev3.c b/keyboards/aeboards/constellation/rev3/rev3.c
deleted file mode 100755
index 5c4257c9b9..0000000000
--- a/keyboards/aeboards/constellation/rev3/rev3.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2022 Harrison Chan (Xelus)
- *
- * 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 .
- */
-
-#include "rev3.h"
diff --git a/keyboards/aeboards/satellite/satellite.c b/keyboards/aeboards/satellite/satellite.c
deleted file mode 100644
index 97750559db..0000000000
--- a/keyboards/aeboards/satellite/satellite.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * 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 .
- */
-
-// Nothing to see here, move along... ;-)
-
-#include "satellite.h"
diff --git a/keyboards/aeboards/satellite/satellite.h b/keyboards/aeboards/satellite/satellite.h
deleted file mode 100644
index fcd03d72e4..0000000000
--- a/keyboards/aeboards/satellite/satellite.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_aeboards_satellite_rev1)
- #include "rev1.h"
-#endif
diff --git a/keyboards/afternoonlabs/breeze/breeze.c b/keyboards/afternoonlabs/breeze/breeze.c
deleted file mode 100644
index a39b91c5ee..0000000000
--- a/keyboards/afternoonlabs/breeze/breeze.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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 .
- */
-
-#include "breeze.h"
diff --git a/keyboards/afternoonlabs/breeze/breeze.h b/keyboards/afternoonlabs/breeze/breeze.h
deleted file mode 100644
index 9a98bb9e69..0000000000
--- a/keyboards/afternoonlabs/breeze/breeze.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef KEYBOARD_afternoonlabs_breeze_rev0
-# include "rev0.h"
-#endif
-#ifdef KEYBOARD_afternoonlabs_breeze_rev1
-# include "rev1.h"
-#endif
diff --git a/keyboards/afternoonlabs/breeze/rev0/rev0.c b/keyboards/afternoonlabs/breeze/rev0/rev0.c
deleted file mode 100644
index a39b91c5ee..0000000000
--- a/keyboards/afternoonlabs/breeze/rev0/rev0.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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 .
- */
-
-#include "breeze.h"
diff --git a/keyboards/afternoonlabs/breeze/rev0/rev0.h b/keyboards/afternoonlabs/breeze/rev0/rev0.h
index b7d7025be3..4ef5fd3286 100644
--- a/keyboards/afternoonlabs/breeze/rev0/rev0.h
+++ b/keyboards/afternoonlabs/breeze/rev0/rev0.h
@@ -16,8 +16,6 @@
#pragma once
-#include "breeze.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/afternoonlabs/breeze/rev1/rev1.c b/keyboards/afternoonlabs/breeze/rev1/rev1.c
deleted file mode 100644
index a39b91c5ee..0000000000
--- a/keyboards/afternoonlabs/breeze/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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 .
- */
-
-#include "breeze.h"
diff --git a/keyboards/afternoonlabs/breeze/rev1/rev1.h b/keyboards/afternoonlabs/breeze/rev1/rev1.h
index b7d7025be3..4ef5fd3286 100644
--- a/keyboards/afternoonlabs/breeze/rev1/rev1.h
+++ b/keyboards/afternoonlabs/breeze/rev1/rev1.h
@@ -16,8 +16,6 @@
#pragma once
-#include "breeze.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/afternoonlabs/gust/gust.c b/keyboards/afternoonlabs/gust/gust.c
deleted file mode 100644
index ee2a9fa5ca..0000000000
--- a/keyboards/afternoonlabs/gust/gust.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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 .
- */
-
-#include "gust.h"
diff --git a/keyboards/afternoonlabs/gust/gust.h b/keyboards/afternoonlabs/gust/gust.h
deleted file mode 100644
index 886dc3786f..0000000000
--- a/keyboards/afternoonlabs/gust/gust.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef KEYBOARD_afternoonlabs_gust_rev1
-# include "rev1.h"
-#endif
diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.c b/keyboards/afternoonlabs/gust/rev1/rev1.c
deleted file mode 100644
index ee2a9fa5ca..0000000000
--- a/keyboards/afternoonlabs/gust/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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 .
- */
-
-#include "gust.h"
diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.h b/keyboards/afternoonlabs/gust/rev1/rev1.h
index 22c1910a1f..635a5877bb 100644
--- a/keyboards/afternoonlabs/gust/rev1/rev1.h
+++ b/keyboards/afternoonlabs/gust/rev1/rev1.h
@@ -16,8 +16,6 @@
#pragma once
-#include "gust.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c b/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c
deleted file mode 100644
index 35268ecf6f..0000000000
--- a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * 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 .
- */
-
-#include "oceanbreeze.h"
diff --git a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h b/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h
deleted file mode 100644
index f51f55de13..0000000000
--- a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef KEYBOARD_afternoonlabs_oceanbreeze_rev1
-# include "rev1.h"
-#endif
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c
deleted file mode 100644
index 35268ecf6f..0000000000
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * 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 .
- */
-
-#include "oceanbreeze.h"
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h
index 36de22ec18..08d175f8c0 100644
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h
@@ -16,8 +16,6 @@
#pragma once
-#include "oceanbreeze.h"
-
#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.c b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.c
deleted file mode 100644
index 65597253e4..0000000000
--- a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * 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 .
- */
-
-#include "rev1.h"
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h
index eeecc06308..b8a83f6aad 100644
--- a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h
+++ b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h
@@ -16,8 +16,6 @@
#pragma once
-#include "southern_breeze.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/afternoonlabs/southern_breeze/southern_breeze.c b/keyboards/afternoonlabs/southern_breeze/southern_breeze.c
deleted file mode 100644
index cac867cafa..0000000000
--- a/keyboards/afternoonlabs/southern_breeze/southern_breeze.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * 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 .
- */
-
-#include "southern_breeze.h"
diff --git a/keyboards/afternoonlabs/southern_breeze/southern_breeze.h b/keyboards/afternoonlabs/southern_breeze/southern_breeze.h
deleted file mode 100644
index a6923d6b1e..0000000000
--- a/keyboards/afternoonlabs/southern_breeze/southern_breeze.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef KEYBOARD_afternoonlabs_southern_breeze_rev1
-# include "rev1.h"
-#endif
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.c b/keyboards/afternoonlabs/summer_breeze/rev1/rev1.c
deleted file mode 100644
index 65597253e4..0000000000
--- a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * 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 .
- */
-
-#include "rev1.h"
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h b/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h
index 6ab28066c3..5fda55504c 100644
--- a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h
+++ b/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h
@@ -16,8 +16,6 @@
#pragma once
-#include "summer_breeze.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/afternoonlabs/summer_breeze/summer_breeze.c b/keyboards/afternoonlabs/summer_breeze/summer_breeze.c
deleted file mode 100644
index 844b8c33a3..0000000000
--- a/keyboards/afternoonlabs/summer_breeze/summer_breeze.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * 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 .
- */
-
-#include "summer_breeze.h"
diff --git a/keyboards/afternoonlabs/summer_breeze/summer_breeze.h b/keyboards/afternoonlabs/summer_breeze/summer_breeze.h
deleted file mode 100644
index 0f3776b832..0000000000
--- a/keyboards/afternoonlabs/summer_breeze/summer_breeze.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Afternoon Labs
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef KEYBOARD_afternoonlabs_summer_breeze_rev1
-# include "rev1.h"
-#endif
diff --git a/keyboards/alt34/alt34.c b/keyboards/alt34/alt34.c
deleted file mode 100644
index f71f8092c9..0000000000
--- a/keyboards/alt34/alt34.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 Tommy Alatalo <@altosys>
-
-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 .
-*/
-
-#include "alt34.h"
diff --git a/keyboards/alt34/alt34.h b/keyboards/alt34/alt34.h
deleted file mode 100644
index 0d0bdd3fd4..0000000000
--- a/keyboards/alt34/alt34.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2022 Tommy Alatalo <@altosys>
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_alt34_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/alt34/rev1/rev1.c b/keyboards/alt34/rev1/rev1.c
deleted file mode 100644
index f71f8092c9..0000000000
--- a/keyboards/alt34/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 Tommy Alatalo <@altosys>
-
-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 .
-*/
-
-#include "alt34.h"
diff --git a/keyboards/alt34/rev1/rev1.h b/keyboards/alt34/rev1/rev1.h
index 5600b0d5ad..115415bb5f 100644
--- a/keyboards/alt34/rev1/rev1.h
+++ b/keyboards/alt34/rev1/rev1.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#include "alt34.h"
#include "quantum.h"
#define ____ KC_NO
diff --git a/keyboards/arabica37/arabica37.c b/keyboards/arabica37/arabica37.c
deleted file mode 100644
index 22fc63b0e9..0000000000
--- a/keyboards/arabica37/arabica37.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "arabica37.h"
diff --git a/keyboards/arabica37/arabica37.h b/keyboards/arabica37/arabica37.h
deleted file mode 100644
index 3255e71d10..0000000000
--- a/keyboards/arabica37/arabica37.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_arabica37_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/arabica37/rev1/rev1.c b/keyboards/arabica37/rev1/rev1.c
deleted file mode 100644
index 22fc63b0e9..0000000000
--- a/keyboards/arabica37/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "arabica37.h"
diff --git a/keyboards/arabica37/rev1/rev1.h b/keyboards/arabica37/rev1/rev1.h
index 316de77f1d..8d247242f6 100644
--- a/keyboards/arabica37/rev1/rev1.h
+++ b/keyboards/arabica37/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "arabica37.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/atreus/astar/astar.c b/keyboards/atreus/astar/astar.c
deleted file mode 100644
index 19490deb99..0000000000
--- a/keyboards/atreus/astar/astar.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-#include "atreus.h"
diff --git a/keyboards/atreus/astar/astar.h b/keyboards/atreus/astar/astar.h
deleted file mode 100644
index bf74ceb17f..0000000000
--- a/keyboards/atreus/astar/astar.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-
-#pragma once
diff --git a/keyboards/atreus/astar_mirrored/astar_mirrored.c b/keyboards/atreus/astar_mirrored/astar_mirrored.c
deleted file mode 100644
index b8eacded63..0000000000
--- a/keyboards/atreus/astar_mirrored/astar_mirrored.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-#include "astar_mirrored.h"
diff --git a/keyboards/atreus/astar_mirrored/astar_mirrored.h b/keyboards/atreus/astar_mirrored/astar_mirrored.h
deleted file mode 100644
index bf74ceb17f..0000000000
--- a/keyboards/atreus/astar_mirrored/astar_mirrored.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-
-#pragma once
diff --git a/keyboards/atreus/atreus.c b/keyboards/atreus/atreus.c
deleted file mode 100644
index 33bb5f35ad..0000000000
--- a/keyboards/atreus/atreus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-
-#include "atreus.h"
diff --git a/keyboards/atreus/atreus.h b/keyboards/atreus/atreus.h
index 2753434535..2a966b8641 100644
--- a/keyboards/atreus/atreus.h
+++ b/keyboards/atreus/atreus.h
@@ -18,20 +18,6 @@
#include "quantum.h"
#define ___ KC_NO
-#ifdef KEYBOARD_atreus_astar
- #include "astar.h"
-#elif KEYBOARD_atreus_astar_mirrored
- #include "astar_mirrored.h"
-#elif KEYBOARD_atreus_feather
- #include "feather.h"
-#elif KEYBOARD_atreus_teensy2
- #include "teensy2.h"
-#elif KEYBOARD_atreus_promicro
- #include "promicro.h"
-#elif KEYBOARD_atreus_f103
- #include "f103.h"
-#endif
-
// This a shortcut to help you visually see your layout.
// The first section contains all of the arguments.
// The second converts the arguments into a two-dimensional array.
diff --git a/keyboards/atreus/f103/f103.c b/keyboards/atreus/f103/f103.c
deleted file mode 100644
index acac0ed71c..0000000000
--- a/keyboards/atreus/f103/f103.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * 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 .
- */
-
-#include "f103.h"
diff --git a/keyboards/atreus/f103/f103.h b/keyboards/atreus/f103/f103.h
deleted file mode 100644
index 305b26798b..0000000000
--- a/keyboards/atreus/f103/f103.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * 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 .
- */
-
-#pragma once
diff --git a/keyboards/atreus/feather/feather.c b/keyboards/atreus/feather/feather.c
deleted file mode 100644
index ceebc51c23..0000000000
--- a/keyboards/atreus/feather/feather.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-#include "feather.h"
diff --git a/keyboards/atreus/feather/feather.h b/keyboards/atreus/feather/feather.h
deleted file mode 100644
index bf74ceb17f..0000000000
--- a/keyboards/atreus/feather/feather.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-
-#pragma once
diff --git a/keyboards/atreus/promicro/promicro.c b/keyboards/atreus/promicro/promicro.c
deleted file mode 100644
index ad08ac9f01..0000000000
--- a/keyboards/atreus/promicro/promicro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020
- *
- * 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 .
- */
-#include "promicro.h"
diff --git a/keyboards/atreus/promicro/promicro.h b/keyboards/atreus/promicro/promicro.h
deleted file mode 100644
index bf74ceb17f..0000000000
--- a/keyboards/atreus/promicro/promicro.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-
-#pragma once
diff --git a/keyboards/atreus/teensy2/teensy2.c b/keyboards/atreus/teensy2/teensy2.c
deleted file mode 100644
index 19490deb99..0000000000
--- a/keyboards/atreus/teensy2/teensy2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-#include "atreus.h"
diff --git a/keyboards/atreus/teensy2/teensy2.h b/keyboards/atreus/teensy2/teensy2.h
deleted file mode 100644
index bf74ceb17f..0000000000
--- a/keyboards/atreus/teensy2/teensy2.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-
-#pragma once
diff --git a/keyboards/atreyu/atreyu.c b/keyboards/atreyu/atreyu.c
deleted file mode 100644
index 0c5a97d18a..0000000000
--- a/keyboards/atreyu/atreyu.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Jesus Climent (@climent)
- *
- * 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 .
- */
-
-#include "atreyu.h"
diff --git a/keyboards/atreyu/atreyu.h b/keyboards/atreyu/atreyu.h
deleted file mode 100644
index 64db24a4ee..0000000000
--- a/keyboards/atreyu/atreyu.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 Jesus Climent (@climent)
- *
- * 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 .
- */
-
-#pragma once
-
-#if defined(KEYBOARD_atreyu_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_atreyu_rev2)
-# include "rev2.h"
-#endif
diff --git a/keyboards/avalanche/avalanche.c b/keyboards/avalanche/avalanche.c
index 7efdf591d5..53bc5bd6aa 100644
--- a/keyboards/avalanche/avalanche.c
+++ b/keyboards/avalanche/avalanche.c
@@ -1,7 +1,7 @@
// Copyright 2022 Vitaly Volkov (@vlkv)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "avalanche.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/avalanche/avalanche.h b/keyboards/avalanche/avalanche.h
deleted file mode 100644
index 916019f0d0..0000000000
--- a/keyboards/avalanche/avalanche.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#ifdef KEYBOARD_avalanche_v1
- #include "v1.h"
-#elif KEYBOARD_avalanche_v2
- #include "v2.h"
-#elif KEYBOARD_avalanche_v3
- #include "v3.h"
-#elif KEYBOARD_avalanche_v4
- #include "v4.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/avalanche/v1/v1.c b/keyboards/avalanche/v1/v1.c
deleted file mode 100644
index 1a0cff2e51..0000000000
--- a/keyboards/avalanche/v1/v1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "avalanche.h"
diff --git a/keyboards/avalanche/v1/v1.h b/keyboards/avalanche/v1/v1.h
index a8f55c7536..dd6c921e69 100644
--- a/keyboards/avalanche/v1/v1.h
+++ b/keyboards/avalanche/v1/v1.h
@@ -3,8 +3,6 @@
#pragma once
-#include "avalanche.h"
-
#include "quantum.h"
#define L__ KC_NO
diff --git a/keyboards/avalanche/v2/v2.c b/keyboards/avalanche/v2/v2.c
deleted file mode 100644
index 1a0cff2e51..0000000000
--- a/keyboards/avalanche/v2/v2.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "avalanche.h"
diff --git a/keyboards/avalanche/v2/v2.h b/keyboards/avalanche/v2/v2.h
index 6832becdf7..f8319c3ef4 100644
--- a/keyboards/avalanche/v2/v2.h
+++ b/keyboards/avalanche/v2/v2.h
@@ -3,8 +3,6 @@
#pragma once
-#include "avalanche.h"
-
#include "quantum.h"
#define L__ KC_NO
diff --git a/keyboards/avalanche/v3/v3.c b/keyboards/avalanche/v3/v3.c
deleted file mode 100644
index 1a0cff2e51..0000000000
--- a/keyboards/avalanche/v3/v3.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "avalanche.h"
diff --git a/keyboards/avalanche/v3/v3.h b/keyboards/avalanche/v3/v3.h
index fde80607b2..426f979e9b 100644
--- a/keyboards/avalanche/v3/v3.h
+++ b/keyboards/avalanche/v3/v3.h
@@ -3,8 +3,6 @@
#pragma once
-#include "avalanche.h"
-
#include "quantum.h"
#define L__ KC_NO
diff --git a/keyboards/avalanche/v4/v4.c b/keyboards/avalanche/v4/v4.c
index 69c64fc53c..e5a651ce4a 100644
--- a/keyboards/avalanche/v4/v4.c
+++ b/keyboards/avalanche/v4/v4.c
@@ -1,7 +1,7 @@
// Copyright 2022 Vitaly Volkov (@vlkv)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "avalanche.h"
+#include "v4.h"
#ifdef OLED_ENABLE
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/avalanche/v4/v4.h b/keyboards/avalanche/v4/v4.h
index fde80607b2..426f979e9b 100644
--- a/keyboards/avalanche/v4/v4.h
+++ b/keyboards/avalanche/v4/v4.h
@@ -3,8 +3,6 @@
#pragma once
-#include "avalanche.h"
-
#include "quantum.h"
#define L__ KC_NO
diff --git a/keyboards/basekeys/slice/rev1/rev1.c b/keyboards/basekeys/slice/rev1/rev1.c
deleted file mode 100644
index a3c8f66fe0..0000000000
--- a/keyboards/basekeys/slice/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * 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 .
- */
-#include "rev1.h"
diff --git a/keyboards/basekeys/slice/rev1/rev1.h b/keyboards/basekeys/slice/rev1/rev1.h
index 26a5da31bc..f4d631eb6b 100644
--- a/keyboards/basekeys/slice/rev1/rev1.h
+++ b/keyboards/basekeys/slice/rev1/rev1.h
@@ -15,8 +15,6 @@
*/
#pragma once
-#include "slice.h"
-
#include "quantum.h"
//////////////////////////////////////////////////////////////////////////////
diff --git a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c
deleted file mode 100644
index 9ab3d2539a..0000000000
--- a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * 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 .
- */
-#include "rev1_rgb.h"
diff --git a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h
index fdc5331585..0b0ea725e7 100644
--- a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h
+++ b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h
@@ -15,8 +15,6 @@
*/
#pragma once
-#include "slice.h"
-
#include "quantum.h"
//////////////////////////////////////////////////////////////////////////////
diff --git a/keyboards/basekeys/slice/slice.c b/keyboards/basekeys/slice/slice.c
deleted file mode 100644
index 2d7d111f9a..0000000000
--- a/keyboards/basekeys/slice/slice.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * 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 .
- */
-#include "slice.h"
diff --git a/keyboards/basekeys/slice/slice.h b/keyboards/basekeys/slice/slice.h
deleted file mode 100644
index bc3eb813a2..0000000000
--- a/keyboards/basekeys/slice/slice.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-#ifdef KEYBOARD_basekeys_slice_rev1
- #include "rev1.h"
-#endif
-
-#ifdef KEYBOARD_basekeys_slice_rev1_rgb
- #include "rev1_rgb.h"
-#endif
diff --git a/keyboards/bear_face/bear_face.c b/keyboards/bear_face/bear_face.c
deleted file mode 100644
index 30aa5140d4..0000000000
--- a/keyboards/bear_face/bear_face.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 chemicalwill
-
-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 .
-*/
-
-#include "bear_face.h"
diff --git a/keyboards/bear_face/bear_face.h b/keyboards/bear_face/bear_face.h
deleted file mode 100644
index c63b2bd012..0000000000
--- a/keyboards/bear_face/bear_face.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 chemicalwill
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_bear_face_v1)
-# include "v1.h"
-#elif defined(KEYBOARD_bear_face_v2)
-# include "v2.h"
-#endif
diff --git a/keyboards/bear_face/v1/v1.c b/keyboards/bear_face/v1/v1.c
index 443b3016d7..3f10d10994 100644
--- a/keyboards/bear_face/v1/v1.c
+++ b/keyboards/bear_face/v1/v1.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "bear_face.h"
+#include "v1.h"
void keyboard_pre_init_kb(void) {
//Sets LED pin as output
diff --git a/keyboards/bear_face/v2/v2.c b/keyboards/bear_face/v2/v2.c
index 443b3016d7..cf97145688 100644
--- a/keyboards/bear_face/v2/v2.c
+++ b/keyboards/bear_face/v2/v2.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "bear_face.h"
+#include "v2.h"
void keyboard_pre_init_kb(void) {
//Sets LED pin as output
diff --git a/keyboards/bemeier/bmek/bmek.h b/keyboards/bemeier/bmek/bmek.h
index 4249d02566..26c95737e6 100755
--- a/keyboards/bemeier/bmek/bmek.h
+++ b/keyboards/bemeier/bmek/bmek.h
@@ -17,14 +17,6 @@
#include "quantum.h"
-#if defined(KEYBOARD_bemeier_bmek_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_bemeier_bmek_rev2)
-# include "rev2.h"
-#elif defined(KEYBOARD_bemeier_bmek_rev3)
-# include "rev3.h"
-#endif
-
#define XXX KC_NO // makes the switch matrix easier to read
// This layout is supported by all revisions
diff --git a/keyboards/bemeier/bmek/rev1/rev1.c b/keyboards/bemeier/bmek/rev1/rev1.c
deleted file mode 100755
index 24f0dcdb94..0000000000
--- a/keyboards/bemeier/bmek/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * 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 .
- */
-#include "rev1.h"
diff --git a/keyboards/bemeier/bmek/rev1/rev1.h b/keyboards/bemeier/bmek/rev1/rev1.h
deleted file mode 100755
index 1c46169bdc..0000000000
--- a/keyboards/bemeier/bmek/rev1/rev1.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/bemeier/bmek/rev2/rev2.c b/keyboards/bemeier/bmek/rev2/rev2.c
deleted file mode 100755
index 97ee43e318..0000000000
--- a/keyboards/bemeier/bmek/rev2/rev2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * 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 .
- */
-#include "rev2.h"
diff --git a/keyboards/bemeier/bmek/rev2/rev2.h b/keyboards/bemeier/bmek/rev2/rev2.h
deleted file mode 100755
index 1c46169bdc..0000000000
--- a/keyboards/bemeier/bmek/rev2/rev2.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/bemeier/bmek/rev3/rev3.c b/keyboards/bemeier/bmek/rev3/rev3.c
deleted file mode 100755
index 6193ab51b4..0000000000
--- a/keyboards/bemeier/bmek/rev3/rev3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * 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 .
- */
-#include "rev3.h"
diff --git a/keyboards/bemeier/bmek/rev3/rev3.h b/keyboards/bemeier/bmek/rev3/rev3.h
deleted file mode 100755
index f769927193..0000000000
--- a/keyboards/bemeier/bmek/rev3/rev3.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 bemeier
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-/*
-PCB rev3 has a number of layout options that rev2 and rev1 don't have,
-however, to me just using "ALL_67" for all for all keymaps seems easier to
-maintain than adding all possible permutations of layout options here.
-*/
diff --git a/keyboards/biacco42/ergo42/ergo42.c b/keyboards/biacco42/ergo42/ergo42.c
index bd7a7ffe19..1407d91689 100644
--- a/keyboards/biacco42/ergo42/ergo42.c
+++ b/keyboards/biacco42/ergo42/ergo42.c
@@ -1,4 +1,4 @@
-#include "ergo42.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/biacco42/ergo42/ergo42.h b/keyboards/biacco42/ergo42/ergo42.h
deleted file mode 100644
index 265e605e6c..0000000000
--- a/keyboards/biacco42/ergo42/ergo42.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_biacco42_ergo42_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/biacco42/ergo42/rev1/rev1.c b/keyboards/biacco42/ergo42/rev1/rev1.c
deleted file mode 100644
index 626a0893bb..0000000000
--- a/keyboards/biacco42/ergo42/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ergo42.h"
diff --git a/keyboards/biacco42/ergo42/rev1/rev1.h b/keyboards/biacco42/ergo42/rev1/rev1.h
index 9a5aec4d26..5d92ba6752 100644
--- a/keyboards/biacco42/ergo42/rev1/rev1.h
+++ b/keyboards/biacco42/ergo42/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "ergo42.h"
-
#include "quantum.h"
#ifndef FLIP_HALF
diff --git a/keyboards/boston_meetup/2019/2019.c b/keyboards/boston_meetup/2019/2019.c
index e558048f6a..1097c58de2 100644
--- a/keyboards/boston_meetup/2019/2019.c
+++ b/keyboards/boston_meetup/2019/2019.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "2019.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
#include "rgb_matrix.h"
diff --git a/keyboards/boston_meetup/2019/2019.h b/keyboards/boston_meetup/2019/2019.h
deleted file mode 100644
index fbba5c3154..0000000000
--- a/keyboards/boston_meetup/2019/2019.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 ishtob
- *
- * 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 .
- */
-#pragma once
-
-#include "boston_meetup.h"
-
diff --git a/keyboards/boston_meetup/boston_meetup.c b/keyboards/boston_meetup/boston_meetup.c
deleted file mode 100644
index a9201ac852..0000000000
--- a/keyboards/boston_meetup/boston_meetup.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "boston_meetup.h"
-
diff --git a/keyboards/boston_meetup/boston_meetup.h b/keyboards/boston_meetup/boston_meetup.h
index e1d9d92060..4b000a1ca5 100644
--- a/keyboards/boston_meetup/boston_meetup.h
+++ b/keyboards/boston_meetup/boston_meetup.h
@@ -1,7 +1,7 @@
#pragma once
-#ifdef KEYBOARD_boston_meetup_2019
- #include "2019.h"
+#include "quantum.h"
+
#define LAYOUT( \
K00, \
K10, K11, K12, K13, \
@@ -14,6 +14,3 @@
{ K20, K21, K22, K23 }, \
{ K30, K31, K32, K33 } \
}
-#endif
-
-#include "quantum.h"
\ No newline at end of file
diff --git a/keyboards/buzzard/buzzard.c b/keyboards/buzzard/buzzard.c
deleted file mode 100644
index 00ad12a23e..0000000000
--- a/keyboards/buzzard/buzzard.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "buzzard.h"
diff --git a/keyboards/buzzard/buzzard.h b/keyboards/buzzard/buzzard.h
deleted file mode 100644
index f094e4af39..0000000000
--- a/keyboards/buzzard/buzzard.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_buzzard_rev1)
-# include "rev1.h"
-#endif
\ No newline at end of file
diff --git a/keyboards/buzzard/rev1/rev1.h b/keyboards/buzzard/rev1/rev1.h
index c73e9164f0..74c5fef08e 100644
--- a/keyboards/buzzard/rev1/rev1.h
+++ b/keyboards/buzzard/rev1/rev1.h
@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-#include "buzzard.h"
+#include "quantum.h"
/* This a shortcut to help you visually see your layout.
*
diff --git a/keyboards/chocofly/chocofly.c b/keyboards/chocofly/chocofly.c
index 8ae38602ab..0f00afe2f9 100644
--- a/keyboards/chocofly/chocofly.c
+++ b/keyboards/chocofly/chocofly.c
@@ -1,7 +1,7 @@
// Copyright 2022 Vitaly Volkov (@vlkv)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "chocofly.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/chocofly/chocofly.h b/keyboards/chocofly/chocofly.h
deleted file mode 100644
index 7d94774625..0000000000
--- a/keyboards/chocofly/chocofly.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#ifdef KEYBOARD_chocofly_v1
- #include "v1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/chocofly/v1/v1.c b/keyboards/chocofly/v1/v1.c
deleted file mode 100644
index 6c142b7453..0000000000
--- a/keyboards/chocofly/v1/v1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "v1.h"
diff --git a/keyboards/chocofly/v1/v1.h b/keyboards/chocofly/v1/v1.h
index 5f07f6c325..bf3c93f8be 100644
--- a/keyboards/chocofly/v1/v1.h
+++ b/keyboards/chocofly/v1/v1.h
@@ -3,8 +3,6 @@
#pragma once
-#include "chocofly.h"
-
#include "quantum.h"
#define K__ KC_NO
diff --git a/keyboards/clickety_split/leeloo/leeloo.c b/keyboards/clickety_split/leeloo/leeloo.c
index ea3902d899..864f31cbb7 100644
--- a/keyboards/clickety_split/leeloo/leeloo.c
+++ b/keyboards/clickety_split/leeloo/leeloo.c
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-#include "leeloo.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/clickety_split/leeloo/leeloo.h b/keyboards/clickety_split/leeloo/leeloo.h
deleted file mode 100644
index 98cfddae34..0000000000
--- a/keyboards/clickety_split/leeloo/leeloo.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2022 Clickety Split Ltd.
- * https://clicketysplit.ca
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_clickety_split_leeloo_rev1)
-# include "rev1.h"
-#endif
diff --git a/keyboards/clickety_split/leeloo/rev1/rev1.c b/keyboards/clickety_split/leeloo/rev1/rev1.c
deleted file mode 100644
index 31e27144fb..0000000000
--- a/keyboards/clickety_split/leeloo/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2022 Clickety Split Ltd.
- * https://clicketysplit.ca
- *
- * 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 .
- */
-
-#include "leeloo.h"
diff --git a/keyboards/clueboard/66_hotswap/66_hotswap.c b/keyboards/clueboard/66_hotswap/66_hotswap.c
deleted file mode 100644
index cc38050a9e..0000000000
--- a/keyboards/clueboard/66_hotswap/66_hotswap.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "66_hotswap.h"
diff --git a/keyboards/clueboard/66_hotswap/66_hotswap.h b/keyboards/clueboard/66_hotswap/66_hotswap.h
deleted file mode 100644
index a1ea44841f..0000000000
--- a/keyboards/clueboard/66_hotswap/66_hotswap.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_clueboard_66_hotswap_gen1
- #include "gen1.h"
-#endif
-
-#ifdef KEYBOARD_clueboard_66_hotswap_prototype
- #include "prototype.h"
-#endif
diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.c b/keyboards/clueboard/66_hotswap/gen1/gen1.c
index 72b8b8bbab..a935884a0b 100644
--- a/keyboards/clueboard/66_hotswap/gen1/gen1.c
+++ b/keyboards/clueboard/66_hotswap/gen1/gen1.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "gen1.h"
+#include "quantum.h"
#ifdef LED_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.h b/keyboards/clueboard/66_hotswap/gen1/gen1.h
deleted file mode 100644
index 98f9ba1424..0000000000
--- a/keyboards/clueboard/66_hotswap/gen1/gen1.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2017 Clueboard
- *
- * 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 .
- */
-#pragma once
-#include "quantum.h"
-
diff --git a/keyboards/clueboard/66_hotswap/prototype/prototype.c b/keyboards/clueboard/66_hotswap/prototype/prototype.c
index 4ce3dd65f7..c89fbafbff 100644
--- a/keyboards/clueboard/66_hotswap/prototype/prototype.c
+++ b/keyboards/clueboard/66_hotswap/prototype/prototype.c
@@ -1,4 +1,4 @@
-#include "prototype.h"
+#include "quantum.h"
#include "print.h"
void backlight_init_ports(void) {
diff --git a/keyboards/clueboard/66_hotswap/prototype/prototype.h b/keyboards/clueboard/66_hotswap/prototype/prototype.h
deleted file mode 100644
index 1277cfbbab..0000000000
--- a/keyboards/clueboard/66_hotswap/prototype/prototype.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-#include "quantum.h"
-
diff --git a/keyboards/converter/usb_usb/ble/ble.c b/keyboards/converter/usb_usb/ble/ble.c
deleted file mode 100644
index 387eb8166c..0000000000
--- a/keyboards/converter/usb_usb/ble/ble.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ble.h"
diff --git a/keyboards/converter/usb_usb/ble/ble.h b/keyboards/converter/usb_usb/ble/ble.h
deleted file mode 100644
index 3351176047..0000000000
--- a/keyboards/converter/usb_usb/ble/ble.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "usb_usb.h"
diff --git a/keyboards/converter/usb_usb/hasu/hasu.c b/keyboards/converter/usb_usb/hasu/hasu.c
deleted file mode 100644
index 3357735ffd..0000000000
--- a/keyboards/converter/usb_usb/hasu/hasu.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "hasu.h"
diff --git a/keyboards/converter/usb_usb/hasu/hasu.h b/keyboards/converter/usb_usb/hasu/hasu.h
deleted file mode 100644
index 3351176047..0000000000
--- a/keyboards/converter/usb_usb/hasu/hasu.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "usb_usb.h"
diff --git a/keyboards/converter/usb_usb/pro_micro/pro_micro.c b/keyboards/converter/usb_usb/pro_micro/pro_micro.c
deleted file mode 100644
index f10142f81a..0000000000
--- a/keyboards/converter/usb_usb/pro_micro/pro_micro.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "pro_micro.h"
diff --git a/keyboards/converter/usb_usb/pro_micro/pro_micro.h b/keyboards/converter/usb_usb/pro_micro/pro_micro.h
deleted file mode 100644
index 3351176047..0000000000
--- a/keyboards/converter/usb_usb/pro_micro/pro_micro.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "usb_usb.h"
diff --git a/keyboards/converter/usb_usb/usb_usb.c b/keyboards/converter/usb_usb/usb_usb.c
deleted file mode 100644
index e8f224ad46..0000000000
--- a/keyboards/converter/usb_usb/usb_usb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "usb_usb.h"
diff --git a/keyboards/converter/usb_usb/usb_usb.h b/keyboards/converter/usb_usb/usb_usb.h
index bcd8b52974..87f70bc07a 100644
--- a/keyboards/converter/usb_usb/usb_usb.h
+++ b/keyboards/converter/usb_usb/usb_usb.h
@@ -19,14 +19,6 @@ along with this program. If not, see .
#include "quantum.h"
-#if defined(KEYBOARD_converter_usb_usb_ble)
-# include "ble.h"
-#elif defined(KEYBOARD_converter_usb_usb_hasu)
-# include "hasu.h"
-#elif defined(KEYBOARD_converter_usb_usb_pro_micro)
-# include "pro_micro.h"
-#endif
-
#define XXX KC_NO
#define ______ KC_TRNS
diff --git a/keyboards/cozykeys/bloomer/bloomer.c b/keyboards/cozykeys/bloomer/bloomer.c
deleted file mode 100644
index b8612504b1..0000000000
--- a/keyboards/cozykeys/bloomer/bloomer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-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 .
-*/
-#include "bloomer.h"
diff --git a/keyboards/cozykeys/bloomer/bloomer.h b/keyboards/cozykeys/bloomer/bloomer.h
deleted file mode 100644
index f85b80889f..0000000000
--- a/keyboards/cozykeys/bloomer/bloomer.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-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 .
-*/
-#pragma once
-
-#if defined(KEYBOARD_cozykeys_bloomer_v2)
- #include "v2.h"
-#elif defined(KEYBOARD_cozykeys_bloomer_v3)
- #include "v3.h"
-#endif
diff --git a/keyboards/cozykeys/bloomer/v2/v2.c b/keyboards/cozykeys/bloomer/v2/v2.c
deleted file mode 100644
index 47dd093734..0000000000
--- a/keyboards/cozykeys/bloomer/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-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 .
-*/
-#include "v2.h"
diff --git a/keyboards/cozykeys/bloomer/v3/v3.c b/keyboards/cozykeys/bloomer/v3/v3.c
deleted file mode 100644
index 080cacd791..0000000000
--- a/keyboards/cozykeys/bloomer/v3/v3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-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 .
-*/
-#include "v3.h"
diff --git a/keyboards/cozykeys/speedo/speedo.c b/keyboards/cozykeys/speedo/speedo.c
deleted file mode 100644
index 852459f8c6..0000000000
--- a/keyboards/cozykeys/speedo/speedo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-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 .
-*/
-#include "speedo.h"
diff --git a/keyboards/cozykeys/speedo/speedo.h b/keyboards/cozykeys/speedo/speedo.h
deleted file mode 100644
index 2a2adff423..0000000000
--- a/keyboards/cozykeys/speedo/speedo.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-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 .
-*/
-#pragma once
-
-#ifdef KEYBOARD_cozykeys_speedo_v2
- #include "v2.h"
-#elif KEYBOARD_cozykeys_speedo_v3
- #include "v3.h"
-#endif
diff --git a/keyboards/cozykeys/speedo/v2/v2.c b/keyboards/cozykeys/speedo/v2/v2.c
deleted file mode 100644
index 1cab752140..0000000000
--- a/keyboards/cozykeys/speedo/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-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 .
-*/
-#include "v2.h"
diff --git a/keyboards/cozykeys/speedo/v3/v3.c b/keyboards/cozykeys/speedo/v3/v3.c
deleted file mode 100644
index f35be99e22..0000000000
--- a/keyboards/cozykeys/speedo/v3/v3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-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 .
-*/
-#include "v3.h"
diff --git a/keyboards/crkbd/crkbd.c b/keyboards/crkbd/crkbd.c
index 6220c9822a..aadc0bacf0 100644
--- a/keyboards/crkbd/crkbd.c
+++ b/keyboards/crkbd/crkbd.c
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "crkbd.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/crkbd/crkbd.h b/keyboards/crkbd/crkbd.h
deleted file mode 100644
index 3fae1a400c..0000000000
--- a/keyboards/crkbd/crkbd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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 .
-*/
-#pragma once
-
-#ifdef KEYBOARD_crkbd_rev1
-# include "rev1.h"
-#endif
-#ifdef KEYBOARD_crkbd_r2g
-# include "r2g.h"
-#endif
-
-
-#include "quantum.h"
diff --git a/keyboards/crkbd/r2g/r2g.h b/keyboards/crkbd/r2g/r2g.h
index 126c4b8998..fd3cf557a7 100644
--- a/keyboards/crkbd/r2g/r2g.h
+++ b/keyboards/crkbd/r2g/r2g.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
-#include "crkbd.h"
#include "quantum.h"
// clang-format off
diff --git a/keyboards/crkbd/rev1/rev1.h b/keyboards/crkbd/rev1/rev1.h
index 126c4b8998..fd3cf557a7 100644
--- a/keyboards/crkbd/rev1/rev1.h
+++ b/keyboards/crkbd/rev1/rev1.h
@@ -18,7 +18,6 @@ along with this program. If not, see .
#pragma once
-#include "crkbd.h"
#include "quantum.h"
// clang-format off
diff --git a/keyboards/dailycraft/bat43/bat43.c b/keyboards/dailycraft/bat43/bat43.c
deleted file mode 100644
index 5d52c672b6..0000000000
--- a/keyboards/dailycraft/bat43/bat43.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 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 .
- */
-
-#include "bat43.h"
diff --git a/keyboards/dailycraft/bat43/bat43.h b/keyboards/dailycraft/bat43/bat43.h
deleted file mode 100644
index 046788a0a1..0000000000
--- a/keyboards/dailycraft/bat43/bat43.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_dailycraft_bat43_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_dailycraft_bat43_rev2
- #include "rev2.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/dailycraft/bat43/rev1/rev1.c b/keyboards/dailycraft/bat43/rev1/rev1.c
deleted file mode 100644
index cff7598740..0000000000
--- a/keyboards/dailycraft/bat43/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 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 .
- */
-
-#include "rev1.h"
diff --git a/keyboards/dailycraft/bat43/rev2/rev2.c b/keyboards/dailycraft/bat43/rev2/rev2.c
deleted file mode 100644
index cffc0acd32..0000000000
--- a/keyboards/dailycraft/bat43/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 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 .
- */
-
-#include "rev2.h"
diff --git a/keyboards/dailycraft/claw44/claw44.c b/keyboards/dailycraft/claw44/claw44.c
deleted file mode 100644
index d87103065c..0000000000
--- a/keyboards/dailycraft/claw44/claw44.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "claw44.h"
diff --git a/keyboards/dailycraft/claw44/claw44.h b/keyboards/dailycraft/claw44/claw44.h
deleted file mode 100644
index 76ecda6e90..0000000000
--- a/keyboards/dailycraft/claw44/claw44.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_dailycraft_claw44_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/dailycraft/claw44/rev1/rev1.c b/keyboards/dailycraft/claw44/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/dailycraft/claw44/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/dailycraft/sandbox/rev1/rev1.c b/keyboards/dailycraft/sandbox/rev1/rev1.c
deleted file mode 100644
index dccf24c746..0000000000
--- a/keyboards/dailycraft/sandbox/rev1/rev1.c
+++ /dev/null
@@ -1,17 +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 .
- */
-
-#include "rev1.h"
diff --git a/keyboards/dailycraft/sandbox/rev2/rev2.c b/keyboards/dailycraft/sandbox/rev2/rev2.c
deleted file mode 100644
index 96aa6cd314..0000000000
--- a/keyboards/dailycraft/sandbox/rev2/rev2.c
+++ /dev/null
@@ -1,17 +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 .
- */
-
-#include "rev2.h"
diff --git a/keyboards/dailycraft/sandbox/sandbox.c b/keyboards/dailycraft/sandbox/sandbox.c
index 0b576a8291..51a9f88a6d 100644
--- a/keyboards/dailycraft/sandbox/sandbox.c
+++ b/keyboards/dailycraft/sandbox/sandbox.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "sandbox.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
bool oled_task_kb(void) {
diff --git a/keyboards/dailycraft/sandbox/sandbox.h b/keyboards/dailycraft/sandbox/sandbox.h
deleted file mode 100644
index e9c9ff99c3..0000000000
--- a/keyboards/dailycraft/sandbox/sandbox.h
+++ /dev/null
@@ -1,26 +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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_dailycraft_sandbox_rev1
-# include "rev1.h"
-#endif
-#ifdef KEYBOARD_dailycraft_sandbox_rev2
-# include "rev2.h"
-#endif
diff --git a/keyboards/dailycraft/wings42/rev1/rev1.c b/keyboards/dailycraft/wings42/rev1/rev1.c
deleted file mode 100644
index dccf24c746..0000000000
--- a/keyboards/dailycraft/wings42/rev1/rev1.c
+++ /dev/null
@@ -1,17 +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 .
- */
-
-#include "rev1.h"
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c
deleted file mode 100644
index 3d0d203704..0000000000
--- a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c
+++ /dev/null
@@ -1,17 +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 .
- */
-
-#include "rev1_extkeys.h"
diff --git a/keyboards/dailycraft/wings42/rev2/rev2.c b/keyboards/dailycraft/wings42/rev2/rev2.c
deleted file mode 100644
index 96aa6cd314..0000000000
--- a/keyboards/dailycraft/wings42/rev2/rev2.c
+++ /dev/null
@@ -1,17 +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 .
- */
-
-#include "rev2.h"
diff --git a/keyboards/dailycraft/wings42/wings42.c b/keyboards/dailycraft/wings42/wings42.c
deleted file mode 100644
index 824b6cfbb6..0000000000
--- a/keyboards/dailycraft/wings42/wings42.c
+++ /dev/null
@@ -1,17 +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 .
- */
-
-#include "wings42.h"
diff --git a/keyboards/dailycraft/wings42/wings42.h b/keyboards/dailycraft/wings42/wings42.h
deleted file mode 100644
index d839f04884..0000000000
--- a/keyboards/dailycraft/wings42/wings42.h
+++ /dev/null
@@ -1,30 +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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_dailycraft_wings42_rev1
-# include "rev1.h"
-#endif
-#ifdef KEYBOARD_dailycraft_wings42_rev1_extkeys
-# include "rev1_extkeys.h"
-#endif
-#ifdef KEYBOARD_dailycraft_wings42_rev2
-# include "rev2.h"
-#endif
-
diff --git a/keyboards/deltasplit75/deltasplit75.c b/keyboards/deltasplit75/deltasplit75.c
deleted file mode 100644
index 6a73db4cd6..0000000000
--- a/keyboards/deltasplit75/deltasplit75.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "deltasplit75.h"
\ No newline at end of file
diff --git a/keyboards/deltasplit75/deltasplit75.h b/keyboards/deltasplit75/deltasplit75.h
deleted file mode 100644
index b78d857344..0000000000
--- a/keyboards/deltasplit75/deltasplit75.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_deltasplit75_v2
-# include "v2.h"
-#endif
diff --git a/keyboards/deltasplit75/v2/v2.c b/keyboards/deltasplit75/v2/v2.c
deleted file mode 100644
index caf7c6f0f2..0000000000
--- a/keyboards/deltasplit75/v2/v2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "v2.h"
diff --git a/keyboards/deltasplit75/v2/v2.h b/keyboards/deltasplit75/v2/v2.h
index bab6a47cd9..0373a6fe02 100644
--- a/keyboards/deltasplit75/v2/v2.h
+++ b/keyboards/deltasplit75/v2/v2.h
@@ -1,7 +1,5 @@
#pragma once
-#include "deltasplit75.h"
-
#include "quantum.h"
//matrix is defined in a weird way here; the layout on both sides are asymmetrical, but the "matrix" is symmetrical but with empty gaps
diff --git a/keyboards/drhigsby/ogurec/left_pm/left_pm.h b/keyboards/drhigsby/ogurec/left_pm/left_pm.h
index ecf87a2a49..3a397dda5f 100644
--- a/keyboards/drhigsby/ogurec/left_pm/left_pm.h
+++ b/keyboards/drhigsby/ogurec/left_pm/left_pm.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "ogurec.h"
+#include "quantum.h"
/* This a shortcut to help you visually see your layout.
*
diff --git a/keyboards/drhigsby/ogurec/ogurec.c b/keyboards/drhigsby/ogurec/ogurec.c
deleted file mode 100644
index 6b2efa56b6..0000000000
--- a/keyboards/drhigsby/ogurec/ogurec.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * 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 .
- */
-#include "ogurec.h"
diff --git a/keyboards/drhigsby/ogurec/ogurec.h b/keyboards/drhigsby/ogurec/ogurec.h
deleted file mode 100644
index 154d5d6cfe..0000000000
--- a/keyboards/drhigsby/ogurec/ogurec.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_drhigsby_ogurec_left_pm)
-# include "left_pm.h"
-#elif defined(KEYBOARD_drhigsby_ogurec_right_pm)
-# include "right_pm.h"
-#endif
diff --git a/keyboards/drhigsby/ogurec/right_pm/right_pm.h b/keyboards/drhigsby/ogurec/right_pm/right_pm.h
index e413a835bc..2ad2fe32c9 100644
--- a/keyboards/drhigsby/ogurec/right_pm/right_pm.h
+++ b/keyboards/drhigsby/ogurec/right_pm/right_pm.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "ogurec.h"
+#include "quantum.h"
/* This a shortcut to help you visually see your layout.
*
diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h
index b60b78ea81..f68a595cae 100644
--- a/keyboards/durgod/dgk6x/galaxy/config.h
+++ b/keyboards/durgod/dgk6x/galaxy/config.h
@@ -20,3 +20,5 @@
#define DRIVER_1_LED_TOTAL 58
#define DRIVER_2_LED_TOTAL 26
#endif
+
+#define CAPS_LED 46
diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.h b/keyboards/durgod/dgk6x/galaxy/galaxy.h
index 3ba96aaf7b..3a2da6f863 100644
--- a/keyboards/durgod/dgk6x/galaxy/galaxy.h
+++ b/keyboards/durgod/dgk6x/galaxy/galaxy.h
@@ -17,8 +17,6 @@
#include "quantum.h"
-#define CAPS_LED 46
-
#define XXX KC_NO
// This a shortcut to help you visually see your layout.
diff --git a/keyboards/durgod/dgk6x/hades/config.h b/keyboards/durgod/dgk6x/hades/config.h
index b1b29b182a..47f6da5988 100644
--- a/keyboards/durgod/dgk6x/hades/config.h
+++ b/keyboards/durgod/dgk6x/hades/config.h
@@ -20,3 +20,5 @@
#define DRIVER_1_LED_TOTAL 58
#define DRIVER_2_LED_TOTAL 10
#endif
+
+#define CAPS_LED 30
diff --git a/keyboards/durgod/dgk6x/hades/hades.h b/keyboards/durgod/dgk6x/hades/hades.h
index 630f7e92b5..a1840dff0f 100644
--- a/keyboards/durgod/dgk6x/hades/hades.h
+++ b/keyboards/durgod/dgk6x/hades/hades.h
@@ -17,8 +17,6 @@
#include "quantum.h"
-#define CAPS_LED 30
-
#define XXX KC_NO
// This a shortcut to help you visually see your layout.
diff --git a/keyboards/durgod/dgk6x/venus/config.h b/keyboards/durgod/dgk6x/venus/config.h
index 0709407c88..ab3f57914e 100644
--- a/keyboards/durgod/dgk6x/venus/config.h
+++ b/keyboards/durgod/dgk6x/venus/config.h
@@ -20,3 +20,5 @@
#define DRIVER_1_LED_TOTAL 53
#define DRIVER_2_LED_TOTAL 8
#endif
+
+#define CAPS_LED 28
diff --git a/keyboards/durgod/dgk6x/venus/venus.h b/keyboards/durgod/dgk6x/venus/venus.h
index 6103c531dc..7d1635b777 100644
--- a/keyboards/durgod/dgk6x/venus/venus.h
+++ b/keyboards/durgod/dgk6x/venus/venus.h
@@ -17,8 +17,6 @@
#include "quantum.h"
-#define CAPS_LED 28
-
#define XXX KC_NO
// This a shortcut to help you visually see your layout.
diff --git a/keyboards/dztech/dz65rgb/dz65rgb.c b/keyboards/dztech/dz65rgb/dz65rgb.c
deleted file mode 100644
index 8340d8fcee..0000000000
--- a/keyboards/dztech/dz65rgb/dz65rgb.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 DZTECH
- *
- * 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 .
- */
-
-#include "dz65rgb.h"
diff --git a/keyboards/dztech/dz65rgb/dz65rgb.h b/keyboards/dztech/dz65rgb/dz65rgb.h
deleted file mode 100644
index 734a1cff3f..0000000000
--- a/keyboards/dztech/dz65rgb/dz65rgb.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 DZTECH
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef KEYBOARD_dztech_dz65rgb_v1
- #include "v1.h"
-#endif
-#ifdef KEYBOARD_dztech_dz65rgb_v2
- #include "v2.h"
-#endif
-#ifdef KEYBOARD_dztech_dz65rgb_v3
- #include "v3.h"
-#endif
-#include "quantum.h"
diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h
index ce0e92216f..b9449c4714 100644
--- a/keyboards/eco/config.h
+++ b/keyboards/eco/config.h
@@ -37,10 +37,3 @@ along with this program. If not, see .
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-
-#ifdef SUBPROJECT_rev1
- #include "rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
- #include "rev2/config.h"
-#endif
diff --git a/keyboards/eco/eco.c b/keyboards/eco/eco.c
deleted file mode 100644
index 84097652d8..0000000000
--- a/keyboards/eco/eco.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "eco.h"
diff --git a/keyboards/eco/eco.h b/keyboards/eco/eco.h
deleted file mode 100644
index 885bf982d7..0000000000
--- a/keyboards/eco/eco.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_eco_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_eco_rev2)
-# include "rev2.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/eco/rev1/rev1.c b/keyboards/eco/rev1/rev1.c
deleted file mode 100644
index 84097652d8..0000000000
--- a/keyboards/eco/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "eco.h"
diff --git a/keyboards/eco/rev1/rev1.h b/keyboards/eco/rev1/rev1.h
index a6ceafb815..ea17dc6a55 100644
--- a/keyboards/eco/rev1/rev1.h
+++ b/keyboards/eco/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "../eco.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/eco/rev2/rev2.c b/keyboards/eco/rev2/rev2.c
deleted file mode 100644
index 84097652d8..0000000000
--- a/keyboards/eco/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "eco.h"
diff --git a/keyboards/eco/rev2/rev2.h b/keyboards/eco/rev2/rev2.h
index a6ceafb815..ea17dc6a55 100644
--- a/keyboards/eco/rev2/rev2.h
+++ b/keyboards/eco/rev2/rev2.h
@@ -1,7 +1,5 @@
#pragma once
-#include "../eco.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/eek/eek.c b/keyboards/eek/eek.c
index 372956257a..8e7a19f820 100644
--- a/keyboards/eek/eek.c
+++ b/keyboards/eek/eek.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "eek.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/eek/eek.h b/keyboards/eek/eek.h
deleted file mode 100644
index 4e4133d884..0000000000
--- a/keyboards/eek/eek.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 klackygears
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_eek_silk_down)
-# include "silk_down.h"
-#elif defined(KEYBOARD_eek_silk_up)
-# include "silk_up.h"
-#endif
diff --git a/keyboards/eek/silk_down/silk_down.h b/keyboards/eek/silk_down/silk_down.h
index c8ececd939..23ff61e58f 100644
--- a/keyboards/eek/silk_down/silk_down.h
+++ b/keyboards/eek/silk_down/silk_down.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "eek.h"
+#include "quantum.h"
/* This a shortcut to help you visually see your layout.
*
diff --git a/keyboards/eek/silk_up/silk_up.h b/keyboards/eek/silk_up/silk_up.h
index 8b9fe39596..eebcc8fd2e 100644
--- a/keyboards/eek/silk_up/silk_up.h
+++ b/keyboards/eek/silk_up/silk_up.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "eek.h"
+#include "quantum.h"
/* This a shortcut to help you visually see your layout.
*
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h
index 2dbfdbba73..8551c8f3a1 100644
--- a/keyboards/ergodox_ez/ergodox_ez.h
+++ b/keyboards/ergodox_ez/ergodox_ez.h
@@ -25,12 +25,6 @@ along with this program. If not, see .
#include
#include "i2c_master.h"
-#if defined(KEYBOARD_ergodox_ez_glow)
-# include "glow.h"
-#elif defined(KEYBOARD_ergodox_ez_shine)
-# include "shine.h"
-#endif
-
// I2C aliases and register addresses (see "mcp23018.md")
#define I2C_ADDR 0b0100000
#define I2C_ADDR_WRITE ( (I2C_ADDR<<1) | I2C_WRITE )
diff --git a/keyboards/ergodox_ez/glow/glow.h b/keyboards/ergodox_ez/glow/glow.h
deleted file mode 100644
index da7a6073ef..0000000000
--- a/keyboards/ergodox_ez/glow/glow.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2013 Oleg Kostyuk
-Copyright 2015 ZSA Technology Labs Inc (@zsa)
-Copyright 2020 Christopher Courtney (@drashna)
-
-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 .
-*/
-
-#pragma once
-
-#include "ergodox_ez.h"
diff --git a/keyboards/ergodox_ez/shine/shine.h b/keyboards/ergodox_ez/shine/shine.h
deleted file mode 100644
index da7a6073ef..0000000000
--- a/keyboards/ergodox_ez/shine/shine.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2013 Oleg Kostyuk
-Copyright 2015 ZSA Technology Labs Inc (@zsa)
-Copyright 2020 Christopher Courtney (@drashna)
-
-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 .
-*/
-
-#pragma once
-
-#include "ergodox_ez.h"
diff --git a/keyboards/ergoslab/ergoslab.c b/keyboards/ergoslab/ergoslab.c
deleted file mode 100644
index 6f2796c07c..0000000000
--- a/keyboards/ergoslab/ergoslab.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ergoslab.h"
diff --git a/keyboards/ergoslab/ergoslab.h b/keyboards/ergoslab/ergoslab.h
deleted file mode 100644
index 8b02490543..0000000000
--- a/keyboards/ergoslab/ergoslab.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_ergoslab_rev1
- #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/ergoslab/rev1/rev1.h b/keyboards/ergoslab/rev1/rev1.h
index bf99a17b23..d7fd53a31e 100644
--- a/keyboards/ergoslab/rev1/rev1.h
+++ b/keyboards/ergoslab/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "ergoslab.h"
-
#include "quantum.h"
#define LAYOUT_ergoslab( \
diff --git a/keyboards/ergotravel/ergotravel.c b/keyboards/ergotravel/ergotravel.c
deleted file mode 100644
index 2ada434c19..0000000000
--- a/keyboards/ergotravel/ergotravel.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ergotravel.h"
diff --git a/keyboards/ergotravel/ergotravel.h b/keyboards/ergotravel/ergotravel.h
deleted file mode 100644
index 314775495b..0000000000
--- a/keyboards/ergotravel/ergotravel.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_ergotravel_rev1
- #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/ergotravel/rev1/rev1.c b/keyboards/ergotravel/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/ergotravel/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/ergotravel/rev1/rev1.h b/keyboards/ergotravel/rev1/rev1.h
index e4393cff4d..c241c2d599 100644
--- a/keyboards/ergotravel/rev1/rev1.h
+++ b/keyboards/ergotravel/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "ergotravel.h"
-
#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/fortitude60/fortitude60.c b/keyboards/fortitude60/fortitude60.c
deleted file mode 100644
index d35b286d11..0000000000
--- a/keyboards/fortitude60/fortitude60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "fortitude60.h"
diff --git a/keyboards/fortitude60/fortitude60.h b/keyboards/fortitude60/fortitude60.h
deleted file mode 100644
index 0ad157f2d2..0000000000
--- a/keyboards/fortitude60/fortitude60.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_fortitude60_rev1
- #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/fortitude60/rev1/rev1.c b/keyboards/fortitude60/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/fortitude60/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/fortitude60/rev1/rev1.h b/keyboards/fortitude60/rev1/rev1.h
index ed62b2683e..7445cfa906 100644
--- a/keyboards/fortitude60/rev1/rev1.h
+++ b/keyboards/fortitude60/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "fortitude60.h"
-
#include "quantum.h"
// Standard Keymap
diff --git a/keyboards/fungo/fungo.c b/keyboards/fungo/fungo.c
deleted file mode 100644
index 1446234b36..0000000000
--- a/keyboards/fungo/fungo.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2022 bojiguard (@bojiguard)
- *
- * 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 .
- */
-
- #include "fungo.h"
-
diff --git a/keyboards/fungo/fungo.h b/keyboards/fungo/fungo.h
deleted file mode 100644
index dd267c3463..0000000000
--- a/keyboards/fungo/fungo.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 bojiguard (@bojiguard)
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_fungo_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/fungo/rev1/rev1.c b/keyboards/fungo/rev1/rev1.c
deleted file mode 100644
index 5fd3a11049..0000000000
--- a/keyboards/fungo/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 bojiguard (@bojiguard)
- *
- * 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 .
- */
-
- #include "fungo.h"
diff --git a/keyboards/fungo/rev1/rev1.h b/keyboards/fungo/rev1/rev1.h
index bb5fadcd9a..bcb5ae345f 100644
--- a/keyboards/fungo/rev1/rev1.h
+++ b/keyboards/fungo/rev1/rev1.h
@@ -16,7 +16,6 @@
#pragma once
-#include "fungo.h"
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/gmmk/gmmk2/p65/p65.c b/keyboards/gmmk/gmmk2/p65/p65.c
deleted file mode 100644
index d7e06f6488..0000000000
--- a/keyboards/gmmk/gmmk2/p65/p65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Glorious, LLC
- *
- * 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 .
- */
-
-#include "p65.h"
diff --git a/keyboards/gmmk/gmmk2/p65/p65.h b/keyboards/gmmk/gmmk2/p65/p65.h
deleted file mode 100644
index 7a6339c2e0..0000000000
--- a/keyboards/gmmk/gmmk2/p65/p65.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Glorious, LLC
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_gmmk_gmmk2_p65_ansi)
-# include "ansi/ansi.h"
-#elif defined(KEYBOARD_gmmk_gmmk2_p65_iso)
-# include "iso/iso.h"
-#endif // GMMK V2 revisions
diff --git a/keyboards/gmmk/gmmk2/p96/p96.c b/keyboards/gmmk/gmmk2/p96/p96.c
deleted file mode 100644
index 47edcfe1ad..0000000000
--- a/keyboards/gmmk/gmmk2/p96/p96.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Glorious, LLC
- *
- * 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 .
- */
-
-#include "p96.h"
diff --git a/keyboards/gmmk/gmmk2/p96/p96.h b/keyboards/gmmk/gmmk2/p96/p96.h
deleted file mode 100644
index e7b37d6816..0000000000
--- a/keyboards/gmmk/gmmk2/p96/p96.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Glorious, LLC
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_gmmk_gmmk2_p96_ansi)
-# include "ansi/ansi.h"
-#elif defined(KEYBOARD_gmmk_gmmk2_p96_iso)
-# include "iso/iso.h"
-#endif // GMMK V2 revisions
diff --git a/keyboards/gmmk/pro/pro.c b/keyboards/gmmk/pro/pro.c
index 6aed1d6e18..3df15d71f2 100644
--- a/keyboards/gmmk/pro/pro.c
+++ b/keyboards/gmmk/pro/pro.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "pro.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/gmmk/pro/pro.h b/keyboards/gmmk/pro/pro.h
deleted file mode 100644
index c83d6c99c5..0000000000
--- a/keyboards/gmmk/pro/pro.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 Glorious, LLC
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_gmmk_pro_rev1_ansi)
-# include "rev1/ansi/ansi.h"
-#elif defined(KEYBOARD_gmmk_pro_rev1_iso)
-# include "rev1/iso/iso.h"
-#elif defined(KEYBOARD_gmmk_pro_rev2_ansi)
-# include "rev2/ansi/ansi.h"
-#elif defined(KEYBOARD_gmmk_pro_rev2_iso)
-# include "rev2/iso/iso.h"
-#endif // GMMK Pro revisions
diff --git a/keyboards/gmmk/pro/rev1/ansi/ansi.h b/keyboards/gmmk/pro/rev1/ansi/ansi.h
index ab08d66592..9a6ae0f49e 100644
--- a/keyboards/gmmk/pro/rev1/ansi/ansi.h
+++ b/keyboards/gmmk/pro/rev1/ansi/ansi.h
@@ -16,7 +16,7 @@
#pragma once
-#include "pro.h"
+#include "quantum.h"
#define ___ KC_NO
diff --git a/keyboards/gmmk/pro/rev1/iso/iso.h b/keyboards/gmmk/pro/rev1/iso/iso.h
index 353bcbe875..ad3b46cb97 100644
--- a/keyboards/gmmk/pro/rev1/iso/iso.h
+++ b/keyboards/gmmk/pro/rev1/iso/iso.h
@@ -16,7 +16,7 @@
#pragma once
-#include "pro.h"
+#include "quantum.h"
#define ___ KC_NO
diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.h b/keyboards/gmmk/pro/rev2/ansi/ansi.h
index 2f8a28b940..b4a67dfd18 100644
--- a/keyboards/gmmk/pro/rev2/ansi/ansi.h
+++ b/keyboards/gmmk/pro/rev2/ansi/ansi.h
@@ -16,7 +16,7 @@
#pragma once
-#include "pro.h"
+#include "quantum.h"
#define ___ KC_NO
diff --git a/keyboards/gmmk/pro/rev2/iso/iso.h b/keyboards/gmmk/pro/rev2/iso/iso.h
index a5844e10eb..3c1291ff1b 100644
--- a/keyboards/gmmk/pro/rev2/iso/iso.h
+++ b/keyboards/gmmk/pro/rev2/iso/iso.h
@@ -16,7 +16,7 @@
#pragma once
-#include "pro.h"
+#include "quantum.h"
#define ___ KC_NO
diff --git a/keyboards/hadron/hadron.c b/keyboards/hadron/hadron.c
deleted file mode 100644
index fa5065b327..0000000000
--- a/keyboards/hadron/hadron.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "hadron.h"
-
diff --git a/keyboards/hadron/hadron.h b/keyboards/hadron/hadron.h
index 349311270e..7cc3c9702c 100644
--- a/keyboards/hadron/hadron.h
+++ b/keyboards/hadron/hadron.h
@@ -2,14 +2,6 @@
#include "quantum.h"
-#if defined(KEYBOARD_hadron_ver0)
-# include "ver0.h"
-#elif defined(KEYBOARD_hadron_ver2)
-# include "ver2.h"
-#elif defined(KEYBOARD_hadron_ver3)
-# include "ver3.h"
-#endif
-
#define XXX KC_NO
#define LAYOUT( \
diff --git a/keyboards/hadron/ver2/ver2.c b/keyboards/hadron/ver2/ver2.c
index abf21d4256..583ac84a01 100644
--- a/keyboards/hadron/ver2/ver2.c
+++ b/keyboards/hadron/ver2/ver2.c
@@ -1,4 +1,4 @@
-#include "ver2.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_180; }
diff --git a/keyboards/hadron/ver2/ver2.h b/keyboards/hadron/ver2/ver2.h
deleted file mode 100644
index 8127b497f7..0000000000
--- a/keyboards/hadron/ver2/ver2.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "hadron.h"
diff --git a/keyboards/hadron/ver3/ver3.c b/keyboards/hadron/ver3/ver3.c
index 4c5a2e0c9a..d337fd9681 100644
--- a/keyboards/hadron/ver3/ver3.c
+++ b/keyboards/hadron/ver3/ver3.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "ver3.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/hadron/ver3/ver3.h b/keyboards/hadron/ver3/ver3.h
deleted file mode 100644
index 1ad44b871f..0000000000
--- a/keyboards/hadron/ver3/ver3.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2018 ishtob
- *
- * 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 .
- */
-#pragma once
-
-#include "hadron.h"
diff --git a/keyboards/handwired/qc60/proto/proto.c b/keyboards/handwired/qc60/proto/proto.c
deleted file mode 100644
index fe08df8599..0000000000
--- a/keyboards/handwired/qc60/proto/proto.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Michael Pio Mayol
- *
- * 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 .
- */
-
-#include "qc60.h"
diff --git a/keyboards/handwired/qc60/proto/proto.h b/keyboards/handwired/qc60/proto/proto.h
index 1ab9a235ae..8ba28c7250 100644
--- a/keyboards/handwired/qc60/proto/proto.h
+++ b/keyboards/handwired/qc60/proto/proto.h
@@ -16,8 +16,6 @@
#pragma once
-#include "qc60.h"
-
#include "quantum.h"
// readability
diff --git a/keyboards/handwired/qc60/qc60.c b/keyboards/handwired/qc60/qc60.c
deleted file mode 100644
index dfa77cf086..0000000000
--- a/keyboards/handwired/qc60/qc60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "qc60.h"
diff --git a/keyboards/handwired/qc60/qc60.h b/keyboards/handwired/qc60/qc60.h
deleted file mode 100644
index e26811ae72..0000000000
--- a/keyboards/handwired/qc60/qc60.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_handwired_qc60_proto)
-# include "proto.h"
-#endif
diff --git a/keyboards/handwired/split65/promicro/promicro.c b/keyboards/handwired/split65/promicro/promicro.c
deleted file mode 100644
index 2f7e1ebab4..0000000000
--- a/keyboards/handwired/split65/promicro/promicro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020-2021 PercyJW-2
- *
- * 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 .
- */
-#include "promicro.h"
diff --git a/keyboards/handwired/split65/promicro/promicro.h b/keyboards/handwired/split65/promicro/promicro.h
index 204f0b88de..8c4e656cf2 100644
--- a/keyboards/handwired/split65/promicro/promicro.h
+++ b/keyboards/handwired/split65/promicro/promicro.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "split65.h"
+#include "quantum.h"
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \
diff --git a/keyboards/handwired/split65/split65.c b/keyboards/handwired/split65/split65.c
index 9d0831c025..a32af1f140 100644
--- a/keyboards/handwired/split65/split65.c
+++ b/keyboards/handwired/split65/split65.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "split65.h"
+#include "quantum.h"
// OLED Code inspired by https://github.com/qmk/qmk_firmware/blob/master/keyboards/splitkb/kyria/rev1/rev1.c
diff --git a/keyboards/handwired/split65/split65.h b/keyboards/handwired/split65/split65.h
deleted file mode 100644
index 7f60ab0bde..0000000000
--- a/keyboards/handwired/split65/split65.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020-2021 PercyJW-2
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_handwired_split65_stm32)
- #include "stm32.h"
-#elif defined(KEYBOARD_handwired_split65_promicro)
- #include "promicro.h"
-#endif
diff --git a/keyboards/handwired/split65/stm32/stm32.c b/keyboards/handwired/split65/stm32/stm32.c
deleted file mode 100644
index 2fa511206e..0000000000
--- a/keyboards/handwired/split65/stm32/stm32.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020-2021 PercyJW-2
- *
- * 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 .
- */
-#include "stm32.h"
diff --git a/keyboards/handwired/split65/stm32/stm32.h b/keyboards/handwired/split65/stm32/stm32.h
index 27f03b3e26..be3dd1639b 100644
--- a/keyboards/handwired/split65/stm32/stm32.h
+++ b/keyboards/handwired/split65/stm32/stm32.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "split65.h"
+#include "quantum.h"
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \
diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c
deleted file mode 100644
index cf8e7d9fa3..0000000000
--- a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 stef9998
-
-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 .
-*/
-#include "split_5x7.h"
diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
index 9ffed66727..828c515484 100644
--- a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
+++ b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
@@ -16,7 +16,7 @@ along with this program. If not, see .
*/
#pragma once
-#include "split_5x7.h"
+#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.c b/keyboards/handwired/stef9998/split_5x7/split_5x7.c
index 5e19d47175..18543078c7 100644
--- a/keyboards/handwired/stef9998/split_5x7/split_5x7.c
+++ b/keyboards/handwired/stef9998/split_5x7/split_5x7.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "split_5x7.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.h b/keyboards/handwired/stef9998/split_5x7/split_5x7.h
deleted file mode 100644
index 55ed1cc98f..0000000000
--- a/keyboards/handwired/stef9998/split_5x7/split_5x7.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * 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 .
- */
-
-#pragma once
-
-#if defined(KEYBOARD_handwired_stef9998_split_5x7_rev1)
-# include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h b/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h
index 66b5880785..ee06096909 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h
@@ -17,7 +17,6 @@
#pragma once
#include "tractyl_manuform.h"
-#include "quantum.h"
#define ___ KC_NO
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h
index 10b8767056..bec356066a 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h
@@ -18,20 +18,6 @@
#include "tractyl_manuform.h"
-#if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_f411)
-# include "f411.h"
-#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_f303)
-# include "f303.h"
-#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_teensy2pp)
-# include "teensy2pp.h"
-#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_elite_c)
-# include "elite_c.h"
-#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_arduinomicro)
-# include "arduinomicro.h"
-#endif
-
-#include "quantum.h"
-
#define ___ KC_NO
// clang-format off
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h
deleted file mode 100644
index 525b0378b4..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna)
- *
- * 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 .
- */
-
-#pragma once
-
-#include "5x6_right.h"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h
deleted file mode 100644
index 525b0378b4..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna)
- *
- * 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 .
- */
-
-#pragma once
-
-#include "5x6_right.h"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c b/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c
deleted file mode 100644
index d094801938..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna)
- *
- * 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 .
- */
-
-#include "f303.h"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h
deleted file mode 100644
index 525b0378b4..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna)
- *
- * 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 .
- */
-
-#pragma once
-
-#include "5x6_right.h"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
index 09f1b57008..b073cb3c60 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "f411.h"
+#include "5x6_right.h"
void keyboard_pre_init_sub(void) { setPinInputHigh(A0); }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h
deleted file mode 100644
index 525b0378b4..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna)
- *
- * 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 .
- */
-
-#pragma once
-
-#include "5x6_right.h"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h
deleted file mode 100644
index 525b0378b4..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna)
- *
- * 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 .
- */
-
-#pragma once
-
-#include "5x6_right.h"
diff --git a/keyboards/handwired/uthol/rev3/rev3.c b/keyboards/handwired/uthol/rev3/rev3.c
deleted file mode 100644
index 6c06387ee8..0000000000
--- a/keyboards/handwired/uthol/rev3/rev3.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * 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 .
- */
-
-#include QMK_KEYBOARD_H
diff --git a/keyboards/handwired/uthol/uthol.c b/keyboards/handwired/uthol/uthol.c
deleted file mode 100644
index 2b02e899d4..0000000000
--- a/keyboards/handwired/uthol/uthol.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * 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 .
- */
-
-#include "uthol.h"
diff --git a/keyboards/handwired/uthol/uthol.h b/keyboards/handwired/uthol/uthol.h
index 3e1cbdc72b..6130f7f1b2 100644
--- a/keyboards/handwired/uthol/uthol.h
+++ b/keyboards/handwired/uthol/uthol.h
@@ -19,17 +19,6 @@
#include "quantum.h"
-/**************************************************
-** Include headers specific to keyboard revision **
-**************************************************/
-#if defined(KEYBOARD_uthol_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_uthol_rev2)
-# include "rev2.h"
-#elif defined(KEYBOARD_uthol_rev2)
-# include "rev3.h"
-#endif
-
#define LAYOUT( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
diff --git a/keyboards/helix/helix.c b/keyboards/helix/helix.c
deleted file mode 100644
index 539abd5349..0000000000
--- a/keyboards/helix/helix.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "helix.h"
diff --git a/keyboards/helix/helix.h b/keyboards/helix/helix.h
deleted file mode 100644
index b900d975d2..0000000000
--- a/keyboards/helix/helix.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_helix_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_helix_rev2
- #include "rev2.h"
-#endif
-#ifdef KEYBOARD_helix_rev3_5rows
- #include "rev3_5rows.h"
-#endif
-#ifdef KEYBOARD_helix_rev3_4rows
- #include "rev3_4rows.h"
-#endif
-#ifdef KEYBOARD_helix_pico
- #include "pico.h"
-#endif
diff --git a/keyboards/helix/pico/pico.c b/keyboards/helix/pico/pico.c
index 4cd1953632..cc98fe8f61 100644
--- a/keyboards/helix/pico/pico.c
+++ b/keyboards/helix/pico/pico.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "helix.h"
+#include "pico.h"
// Each keymap.c should use is_keyboard_master() instead of 'is_master'.
// But keep 'is_master' for a while for backwards compatibility
diff --git a/keyboards/helix/pico/pico.h b/keyboards/helix/pico/pico.h
index 3e51d54d84..e555691583 100644
--- a/keyboards/helix/pico/pico.h
+++ b/keyboards/helix/pico/pico.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "helix.h"
+#include "quantum.h"
// Each keymap.c should use is_keyboard_master() instead of 'is_master', 'has_usb()'.
// But keep 'is_master' for a while for backwards compatibility
diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c
index 2bbe9a28e2..ded22bbe93 100644
--- a/keyboards/helix/rev2/rev2.c
+++ b/keyboards/helix/rev2/rev2.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "helix.h"
+#include "rev2.h"
// Each keymap.c should use is_keyboard_master() instead of 'is_master'.
// But keep 'is_master' for a while for backwards compatibility
diff --git a/keyboards/helix/rev2/rev2.h b/keyboards/helix/rev2/rev2.h
index fccbaf1ac4..dd1d74a298 100644
--- a/keyboards/helix/rev2/rev2.h
+++ b/keyboards/helix/rev2/rev2.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "helix.h"
+#include "quantum.h"
bool is_mac_mode(void);
void set_mac_mode_kb(bool macmode);
diff --git a/keyboards/helix/rev3_4rows/rev3_4rows.c b/keyboards/helix/rev3_4rows/rev3_4rows.c
index 704f915510..ff61027a96 100644
--- a/keyboards/helix/rev3_4rows/rev3_4rows.c
+++ b/keyboards/helix/rev3_4rows/rev3_4rows.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "helix.h"
+#include "rev3_4rows.h"
bool is_mac_mode(void) {
return keymap_config.swap_lalt_lgui == false;
diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c
index 704f915510..28fa314a7b 100644
--- a/keyboards/helix/rev3_5rows/rev3_5rows.c
+++ b/keyboards/helix/rev3_5rows/rev3_5rows.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "helix.h"
+#include "rev3_5rows.h"
bool is_mac_mode(void) {
return keymap_config.swap_lalt_lgui == false;
diff --git a/keyboards/horrortroll/caticorn/caticorn.c b/keyboards/horrortroll/caticorn/caticorn.c
deleted file mode 100644
index b416eefdde..0000000000
--- a/keyboards/horrortroll/caticorn/caticorn.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 HorrorTroll
- *
- * 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 .
- */
-
-#include "caticorn.h"
diff --git a/keyboards/horrortroll/caticorn/caticorn.h b/keyboards/horrortroll/caticorn/caticorn.h
deleted file mode 100644
index 87e1202dec..0000000000
--- a/keyboards/horrortroll/caticorn/caticorn.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 HorrorTroll
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_horrortroll_caticorn_rev1_hotswap)
- #include "hotswap.h"
-#elif defined(KEYBOARD_horrortroll_caticorn_rev1_solder)
- #include "solder.h"
-#endif
diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.c b/keyboards/ibnuda/squiggle/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/ibnuda/squiggle/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h
index 73cb7abd2f..7d2ce91cdd 100644
--- a/keyboards/ibnuda/squiggle/rev1/rev1.h
+++ b/keyboards/ibnuda/squiggle/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "squiggle.h"
-
#include "quantum.h"
#define ___ KC_NO
diff --git a/keyboards/ibnuda/squiggle/squiggle.c b/keyboards/ibnuda/squiggle/squiggle.c
deleted file mode 100644
index 7c73aabf51..0000000000
--- a/keyboards/ibnuda/squiggle/squiggle.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Ibnu D. Aji
- *
- * 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 .
- */
-
-#include "squiggle.h"
diff --git a/keyboards/ibnuda/squiggle/squiggle.h b/keyboards/ibnuda/squiggle/squiggle.h
deleted file mode 100644
index 4ed95e707c..0000000000
--- a/keyboards/ibnuda/squiggle/squiggle.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Ibnu D. Aji
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef KEYBOARD_ibnuda_squiggle_rev1
- #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/jacky_studio/bear_65/bear_65.c b/keyboards/jacky_studio/bear_65/bear_65.c
deleted file mode 100644
index a2ae572b82..0000000000
--- a/keyboards/jacky_studio/bear_65/bear_65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * 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 .
- */
-
-#include "bear_65.h"
diff --git a/keyboards/jacky_studio/bear_65/bear_65.h b/keyboards/jacky_studio/bear_65/bear_65.h
deleted file mode 100644
index be8a14a86f..0000000000
--- a/keyboards/jacky_studio/bear_65/bear_65.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_jacky_studio_bear_65_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_jacky_studio_bear_65_rev2)
- #include "rev2.h"
-#endif
diff --git a/keyboards/jacky_studio/bear_65/rev1/rev1.h b/keyboards/jacky_studio/bear_65/rev1/rev1.h
index 901efe70b7..872436fcd4 100644
--- a/keyboards/jacky_studio/bear_65/rev1/rev1.h
+++ b/keyboards/jacky_studio/bear_65/rev1/rev1.h
@@ -16,7 +16,7 @@
#pragma once
-#include "bear_65.h"
+#include "quantum.h"
#define LAYOUT_all( \
K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
diff --git a/keyboards/jacky_studio/bear_65/rev2/rev2.h b/keyboards/jacky_studio/bear_65/rev2/rev2.h
index 31cc430504..61f5a9d6fe 100644
--- a/keyboards/jacky_studio/bear_65/rev2/rev2.h
+++ b/keyboards/jacky_studio/bear_65/rev2/rev2.h
@@ -16,7 +16,7 @@
#pragma once
-#include "bear_65.h"
+#include "quantum.h"
#define LAYOUT_wk_full( \
K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
diff --git a/keyboards/jian/handwired/handwired.h b/keyboards/jian/handwired/handwired.h
index 9b388b94ae..7d961690d2 100644
--- a/keyboards/jian/handwired/handwired.h
+++ b/keyboards/jian/handwired/handwired.h
@@ -1,6 +1,6 @@
#pragma once
-#include "jian.h"
+#include "quantum.h"
#define XXX KC_NO
#define LAYOUT( \
diff --git a/keyboards/jian/jian.c b/keyboards/jian/jian.c
deleted file mode 100644
index e85b8554f0..0000000000
--- a/keyboards/jian/jian.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jian.h"
diff --git a/keyboards/jian/jian.h b/keyboards/jian/jian.h
deleted file mode 100644
index d09d056e9b..0000000000
--- a/keyboards/jian/jian.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_jian_handwired
- #include "handwired.h"
-#endif
-
-#ifdef KEYBOARD_jian_rev1
- #include "rev1.h"
-#endif
-
-#ifdef KEYBOARD_jian_rev2
-#include "rev2.h"
-#endif
-
-#ifdef KEYBOARD_jian_nsrev2
- #include "nsrev2.h"
-#endif
diff --git a/keyboards/jian/nsrev2/nsrev2.h b/keyboards/jian/nsrev2/nsrev2.h
index 9dfb7240b1..80dd6def0c 100644
--- a/keyboards/jian/nsrev2/nsrev2.h
+++ b/keyboards/jian/nsrev2/nsrev2.h
@@ -1,6 +1,6 @@
#pragma once
-#include "jian.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/jian/rev1/rev1.h b/keyboards/jian/rev1/rev1.h
index ee55de6287..bba95a1dd7 100644
--- a/keyboards/jian/rev1/rev1.h
+++ b/keyboards/jian/rev1/rev1.h
@@ -1,6 +1,6 @@
#pragma once
-#include "jian.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/jian/rev2/rev2.h b/keyboards/jian/rev2/rev2.h
index d71fc8495d..7abf46e303 100644
--- a/keyboards/jian/rev2/rev2.h
+++ b/keyboards/jian/rev2/rev2.h
@@ -1,6 +1,6 @@
#pragma once
-#include "jian.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/jiran/jiran.c b/keyboards/jiran/jiran.c
deleted file mode 100644
index 71a8504c5b..0000000000
--- a/keyboards/jiran/jiran.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jiran.h"
diff --git a/keyboards/jiran/jiran.h b/keyboards/jiran/jiran.h
deleted file mode 100644
index c8ae32b135..0000000000
--- a/keyboards/jiran/jiran.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_jiran_rev1
- #include "rev1.h"
-#endif
-
-#ifdef KEYBOARD_jiran_rev2
-#include "rev2.h"
-#endif
diff --git a/keyboards/jiran/rev1/rev1.c b/keyboards/jiran/rev1/rev1.c
deleted file mode 100644
index 9aedcc130a..0000000000
--- a/keyboards/jiran/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
\ No newline at end of file
diff --git a/keyboards/jiran/rev1/rev1.h b/keyboards/jiran/rev1/rev1.h
index 6d5ea99dac..d243bd366b 100644
--- a/keyboards/jiran/rev1/rev1.h
+++ b/keyboards/jiran/rev1/rev1.h
@@ -1,6 +1,5 @@
#pragma once
-#include "jiran.h"
#include "quantum.h"
diff --git a/keyboards/jiran/rev2/rev2.c b/keyboards/jiran/rev2/rev2.c
deleted file mode 100644
index b1af81707d..0000000000
--- a/keyboards/jiran/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev2.h"
diff --git a/keyboards/jiran/rev2/rev2.h b/keyboards/jiran/rev2/rev2.h
index 616497b3ca..01ffe1a48e 100644
--- a/keyboards/jiran/rev2/rev2.h
+++ b/keyboards/jiran/rev2/rev2.h
@@ -1,6 +1,5 @@
#pragma once
-#include "jiran.h"
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/jorne/jorne.c b/keyboards/jorne/jorne.c
index fec24d476c..d00fc2f8fc 100644
--- a/keyboards/jorne/jorne.c
+++ b/keyboards/jorne/jorne.c
@@ -1,6 +1,6 @@
// Copyright 2021 Joric (@joric)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "jorne.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
static void render_logo(void) {
diff --git a/keyboards/jorne/jorne.h b/keyboards/jorne/jorne.h
deleted file mode 100644
index 7c2478c563..0000000000
--- a/keyboards/jorne/jorne.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2021 Joric (@joric)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#ifdef KEYBOARD_jorne_rev1
-# include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/jorne/rev1/rev1.c b/keyboards/jorne/rev1/rev1.c
deleted file mode 100644
index f120ef87f8..0000000000
--- a/keyboards/jorne/rev1/rev1.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2021 Joric (@joric)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "rev1.h"
diff --git a/keyboards/jorne/rev1/rev1.h b/keyboards/jorne/rev1/rev1.h
index af4ef8e3b3..0158032e5e 100644
--- a/keyboards/jorne/rev1/rev1.h
+++ b/keyboards/jorne/rev1/rev1.h
@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-#include "jorne.h"
+#include "quantum.h"
/* This a shortcut to help you visually see your layout.
*
diff --git a/keyboards/kakunpc/business_card/alpha/alpha.c b/keyboards/kakunpc/business_card/alpha/alpha.c
deleted file mode 100644
index 1c2936e157..0000000000
--- a/keyboards/kakunpc/business_card/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 .
- */
-#include "alpha.h"
diff --git a/keyboards/kakunpc/business_card/beta/beta.c b/keyboards/kakunpc/business_card/beta/beta.c
deleted file mode 100644
index 7a9aa1b9bd..0000000000
--- a/keyboards/kakunpc/business_card/beta/beta.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 .
- */
-#include "beta.h"
diff --git a/keyboards/kakunpc/business_card/business_card.c b/keyboards/kakunpc/business_card/business_card.c
deleted file mode 100644
index 01beb28220..0000000000
--- a/keyboards/kakunpc/business_card/business_card.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 .
- */
-#include "business_card.h"
diff --git a/keyboards/kakunpc/business_card/business_card.h b/keyboards/kakunpc/business_card/business_card.h
deleted file mode 100644
index 125c3080d6..0000000000
--- a/keyboards/kakunpc/business_card/business_card.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 .
- */
-#pragma once
-
-#ifdef KEYBOARD_kakunpc_business_card_alpha
- #include "alpha.h"
-#endif
-#ifdef KEYBOARD_kakunpc_business_card_beta
- #include "beta.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/kapl/kapl.c b/keyboards/kapl/kapl.c
deleted file mode 100644
index 165900e142..0000000000
--- a/keyboards/kapl/kapl.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2022 Alexander Lozyuk (@keyzog)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "kapl.h"
diff --git a/keyboards/kapl/kapl.h b/keyboards/kapl/kapl.h
deleted file mode 100644
index 019e3267d4..0000000000
--- a/keyboards/kapl/kapl.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2022 Alexander Lozyuk (@keyzog)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-#include "quantum.h"
-
-#ifdef KEYBOARD_kapl_rev1
-# include "rev1.h"
-#endif
diff --git a/keyboards/kapl/rev1/rev1.c b/keyboards/kapl/rev1/rev1.c
index b51021307e..e0e32cf5e8 100644
--- a/keyboards/kapl/rev1/rev1.c
+++ b/keyboards/kapl/rev1/rev1.c
@@ -1,6 +1,6 @@
// Copyright 2022 Alexander Lozyuk (@keyzog)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "kapl.h"
+#include "rev1.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/kapl/rev1/rev1.h b/keyboards/kapl/rev1/rev1.h
index 68649a7991..686ff89e92 100644
--- a/keyboards/kapl/rev1/rev1.h
+++ b/keyboards/kapl/rev1/rev1.h
@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-#include "kapl.h"
+#include "quantum.h"
/* This a shortcut to help you visually see your layout.
*
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
deleted file mode 100644
index 7a105ae549..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 DZTECH
- *
- * 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 .
- */
-
-#include "mkiirgb.h"
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h
deleted file mode 100644
index dadc230626..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 DZTECH
- *
- * 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 .
- */
-
-#pragma once
-
-#if defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v1)
- #include "v1.h"
-#elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v2)
- #include "v2.h"
-#elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v3)
- #include "v3.h"
-#elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v4)
- #include "v4.h"
-#endif
-#include "quantum.h"
diff --git a/keyboards/kbdfans/kbd75/kbd75.c b/keyboards/kbdfans/kbd75/kbd75.c
deleted file mode 100644
index 1a1bffa360..0000000000
--- a/keyboards/kbdfans/kbd75/kbd75.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2017 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "kbd75.h"
diff --git a/keyboards/kbdfans/kbd75/kbd75.h b/keyboards/kbdfans/kbd75/kbd75.h
deleted file mode 100644
index a2c5d9e4c3..0000000000
--- a/keyboards/kbdfans/kbd75/kbd75.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2017-2019 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_kbdfans_kbd75_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_kbdfans_kbd75_rev2)
- #include "rev2.h"
-#endif
diff --git a/keyboards/kbdfans/kbd75/rev1/rev1.c b/keyboards/kbdfans/kbd75/rev1/rev1.c
deleted file mode 100644
index e7ba9f3722..0000000000
--- a/keyboards/kbdfans/kbd75/rev1/rev1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2019-2020 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "rev1.h"
diff --git a/keyboards/kbdfans/kbd75/rev1/rev1.h b/keyboards/kbdfans/kbd75/rev1/rev1.h
index ac7b38ed02..22333324e4 100644
--- a/keyboards/kbdfans/kbd75/rev1/rev1.h
+++ b/keyboards/kbdfans/kbd75/rev1/rev1.h
@@ -3,7 +3,7 @@
#pragma once
-#include "kbd75.h"
+#include "quantum.h"
#define ___ KC_NO
diff --git a/keyboards/kbdfans/kbd75/rev2/rev2.c b/keyboards/kbdfans/kbd75/rev2/rev2.c
deleted file mode 100644
index 352d837437..0000000000
--- a/keyboards/kbdfans/kbd75/rev2/rev2.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2019-2020 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "rev2.h"
diff --git a/keyboards/kbdfans/kbd75/rev2/rev2.h b/keyboards/kbdfans/kbd75/rev2/rev2.h
index f37be40094..dba3cc2fab 100644
--- a/keyboards/kbdfans/kbd75/rev2/rev2.h
+++ b/keyboards/kbdfans/kbd75/rev2/rev2.h
@@ -3,7 +3,7 @@
#pragma once
-#include "kbd75.h"
+#include "quantum.h"
#define ___ KC_NO
diff --git a/keyboards/keebio/convolution/convolution.c b/keyboards/keebio/convolution/convolution.c
index 884f3e7e5b..fc726e277a 100644
--- a/keyboards/keebio/convolution/convolution.c
+++ b/keyboards/keebio/convolution/convolution.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "convolution.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/keebio/convolution/convolution.h b/keyboards/keebio/convolution/convolution.h
deleted file mode 100644
index fcf299b815..0000000000
--- a/keyboards/keebio/convolution/convolution.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 Danny Nguyen
-
-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 .
-*/
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_convolution_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/convolution/rev1/rev1.h b/keyboards/keebio/convolution/rev1/rev1.h
index c50074c3f3..3bbc40146a 100644
--- a/keyboards/keebio/convolution/rev1/rev1.h
+++ b/keyboards/keebio/convolution/rev1/rev1.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
#pragma once
-#include "convolution.h"
#include "quantum.h"
#define LAYOUT_65xt( \
diff --git a/keyboards/keebio/dsp40/dsp40.c b/keyboards/keebio/dsp40/dsp40.c
deleted file mode 100644
index 745cd386d4..0000000000
--- a/keyboards/keebio/dsp40/dsp40.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Danny Nguyen
-
-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 .
-*/
-
-#include "dsp40.h"
diff --git a/keyboards/keebio/dsp40/dsp40.h b/keyboards/keebio/dsp40/dsp40.h
deleted file mode 100644
index ec5e5fbbcb..0000000000
--- a/keyboards/keebio/dsp40/dsp40.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Danny Nguyen
-
-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 .
-*/
-
-#pragma once
-
-#ifdef KEYBOARD_keebio_dsp40_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/dsp40/rev1/rev1.h b/keyboards/keebio/dsp40/rev1/rev1.h
index f03792175e..bc0a86d302 100644
--- a/keyboards/keebio/dsp40/rev1/rev1.h
+++ b/keyboards/keebio/dsp40/rev1/rev1.h
@@ -15,7 +15,6 @@
*/
#pragma once
-#include "dsp40.h"
#include "quantum.h"
#define LAYOUT_ortho_4x12( \
diff --git a/keyboards/keebio/foldkb/foldkb.c b/keyboards/keebio/foldkb/foldkb.c
deleted file mode 100644
index 97641bf992..0000000000
--- a/keyboards/keebio/foldkb/foldkb.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Danny Nguyen
-
-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 .
-*/
-
-#include "foldkb.h"
diff --git a/keyboards/keebio/foldkb/foldkb.h b/keyboards/keebio/foldkb/foldkb.h
deleted file mode 100644
index bd02a4ef9d..0000000000
--- a/keyboards/keebio/foldkb/foldkb.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 Danny Nguyen
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_foldkb_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/foldkb/rev1/rev1.c b/keyboards/keebio/foldkb/rev1/rev1.c
index a0dfb31b52..efb9fd53fc 100644
--- a/keyboards/keebio/foldkb/rev1/rev1.c
+++ b/keyboards/keebio/foldkb/rev1/rev1.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "foldkb.h"
+#include "rev1.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/foldkb/rev1/rev1.h b/keyboards/keebio/foldkb/rev1/rev1.h
index d07152538a..7349258f66 100644
--- a/keyboards/keebio/foldkb/rev1/rev1.h
+++ b/keyboards/keebio/foldkb/rev1/rev1.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
#pragma once
-#include "foldkb.h"
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/fourier/fourier.c b/keyboards/keebio/fourier/fourier.c
deleted file mode 100644
index 1bd47f98bc..0000000000
--- a/keyboards/keebio/fourier/fourier.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "fourier.h"
diff --git a/keyboards/keebio/fourier/fourier.h b/keyboards/keebio/fourier/fourier.h
index b99dd57c2e..1bc5e1653c 100644
--- a/keyboards/keebio/fourier/fourier.h
+++ b/keyboards/keebio/fourier/fourier.h
@@ -1,9 +1,5 @@
#pragma once
-#ifdef KEYBOARD_fourier_rev1
- #include "rev1.h"
-#endif
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/iris/iris.c b/keyboards/keebio/iris/iris.c
deleted file mode 100644
index fb28b3a6d6..0000000000
--- a/keyboards/keebio/iris/iris.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "iris.h"
diff --git a/keyboards/keebio/iris/iris.h b/keyboards/keebio/iris/iris.h
deleted file mode 100644
index b7be3fc59e..0000000000
--- a/keyboards/keebio/iris/iris.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_keebio_iris_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_keebio_iris_rev1_led)
- #include "rev1_led.h"
-#elif defined(KEYBOARD_keebio_iris_rev2)
- #include "rev2.h"
-#elif defined(KEYBOARD_keebio_iris_rev3)
- #include "rev3.h"
-#elif defined(KEYBOARD_keebio_iris_rev4)
- #include "rev4.h"
-#elif defined(KEYBOARD_keebio_iris_rev5)
- #include "rev5.h"
-#elif defined(KEYBOARD_keebio_iris_rev6)
- #include "rev6.h"
-#elif defined(KEYBOARD_keebio_iris_rev6a)
- #include "rev6a.h"
-#elif defined(KEYBOARD_keebio_iris_rev6b)
- #include "rev6b.h"
-#elif defined(KEYBOARD_keebio_iris_rev7)
- #include "rev7.h"
-#endif
-
-#include "quantum.h"
-#include "via.h"
diff --git a/keyboards/keebio/iris/rev1/rev1.h b/keyboards/keebio/iris/rev1/rev1.h
index 888ddb7a43..d94716242c 100644
--- a/keyboards/keebio/iris/rev1/rev1.h
+++ b/keyboards/keebio/iris/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "iris.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/iris/rev1_led/rev1_led.h b/keyboards/keebio/iris/rev1_led/rev1_led.h
index 888ddb7a43..d94716242c 100644
--- a/keyboards/keebio/iris/rev1_led/rev1_led.h
+++ b/keyboards/keebio/iris/rev1_led/rev1_led.h
@@ -1,7 +1,5 @@
#pragma once
-#include "iris.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/iris/rev2/rev2.h b/keyboards/keebio/iris/rev2/rev2.h
index 888ddb7a43..d94716242c 100644
--- a/keyboards/keebio/iris/rev2/rev2.h
+++ b/keyboards/keebio/iris/rev2/rev2.h
@@ -1,7 +1,5 @@
#pragma once
-#include "iris.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/iris/rev3/rev3.h b/keyboards/keebio/iris/rev3/rev3.h
index 3b4ff9f5b7..c808c4bef3 100644
--- a/keyboards/keebio/iris/rev3/rev3.h
+++ b/keyboards/keebio/iris/rev3/rev3.h
@@ -1,6 +1,5 @@
#pragma once
-#include "iris.h"
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/iris/rev4/rev4.h b/keyboards/keebio/iris/rev4/rev4.h
index ea60d7a690..0e99bd501a 100644
--- a/keyboards/keebio/iris/rev4/rev4.h
+++ b/keyboards/keebio/iris/rev4/rev4.h
@@ -1,6 +1,5 @@
#pragma once
-#include "iris.h"
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/iris/rev5/rev5.h b/keyboards/keebio/iris/rev5/rev5.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev5/rev5.h
+++ b/keyboards/keebio/iris/rev5/rev5.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#include "iris.h"
#include "quantum.h"
diff --git a/keyboards/keebio/iris/rev6/rev6.h b/keyboards/keebio/iris/rev6/rev6.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev6/rev6.h
+++ b/keyboards/keebio/iris/rev6/rev6.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#include "iris.h"
#include "quantum.h"
diff --git a/keyboards/keebio/iris/rev6a/rev6a.h b/keyboards/keebio/iris/rev6a/rev6a.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev6a/rev6a.h
+++ b/keyboards/keebio/iris/rev6a/rev6a.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#include "iris.h"
#include "quantum.h"
diff --git a/keyboards/keebio/iris/rev6b/rev6b.h b/keyboards/keebio/iris/rev6b/rev6b.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev6b/rev6b.h
+++ b/keyboards/keebio/iris/rev6b/rev6b.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#include "iris.h"
#include "quantum.h"
diff --git a/keyboards/keebio/iris/rev7/rev7.h b/keyboards/keebio/iris/rev7/rev7.h
index d13e24410e..cbc032ad31 100644
--- a/keyboards/keebio/iris/rev7/rev7.h
+++ b/keyboards/keebio/iris/rev7/rev7.h
@@ -17,7 +17,6 @@ along with this program. If not, see .
#pragma once
-#include "iris.h"
#include "quantum.h"
diff --git a/keyboards/keebio/kbo5000/kbo5000.c b/keyboards/keebio/kbo5000/kbo5000.c
deleted file mode 100644
index c46093537e..0000000000
--- a/keyboards/keebio/kbo5000/kbo5000.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kbo5000.h"
diff --git a/keyboards/keebio/kbo5000/kbo5000.h b/keyboards/keebio/kbo5000/kbo5000.h
deleted file mode 100644
index 33f1998eb0..0000000000
--- a/keyboards/keebio/kbo5000/kbo5000.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_kbo5000_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/kbo5000/rev1/rev1.c b/keyboards/keebio/kbo5000/rev1/rev1.c
index 904c85242b..f0f4ae730d 100644
--- a/keyboards/keebio/kbo5000/rev1/rev1.c
+++ b/keyboards/keebio/kbo5000/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "kbo5000.h"
+#include "rev1.h"
#include "split_util.h"
void matrix_init_kb(void) {
diff --git a/keyboards/keebio/kbo5000/rev1/rev1.h b/keyboards/keebio/kbo5000/rev1/rev1.h
index 63239d3463..56d827871c 100644
--- a/keyboards/keebio/kbo5000/rev1/rev1.h
+++ b/keyboards/keebio/kbo5000/rev1/rev1.h
@@ -1,6 +1,5 @@
#pragma once
-#include "kbo5000.h"
#include "quantum.h"
#define LAYOUT_ansi( \
diff --git a/keyboards/keebio/levinson/levinson.c b/keyboards/keebio/levinson/levinson.c
index b361640bcf..6f1a050e80 100644
--- a/keyboards/keebio/levinson/levinson.c
+++ b/keyboards/keebio/levinson/levinson.c
@@ -1,4 +1,4 @@
-#include "levinson.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/keebio/levinson/levinson.h b/keyboards/keebio/levinson/levinson.h
deleted file mode 100644
index fd022ab518..0000000000
--- a/keyboards/keebio/levinson/levinson.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_levinson_rev1
- #include "rev1.h"
-#elif KEYBOARD_keebio_levinson_rev2
- #include "rev2.h"
-#elif KEYBOARD_keebio_levinson_rev3
- #include "rev3.h"
-#endif
diff --git a/keyboards/keebio/levinson/rev1/rev1.c b/keyboards/keebio/levinson/rev1/rev1.c
deleted file mode 100644
index 72df88710a..0000000000
--- a/keyboards/keebio/levinson/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "levinson.h"
diff --git a/keyboards/keebio/levinson/rev1/rev1.h b/keyboards/keebio/levinson/rev1/rev1.h
index 7459813929..14db8b445b 100644
--- a/keyboards/keebio/levinson/rev1/rev1.h
+++ b/keyboards/keebio/levinson/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "levinson.h"
-
#include "quantum.h"
#ifndef FLIP_HALF
diff --git a/keyboards/keebio/levinson/rev2/rev2.c b/keyboards/keebio/levinson/rev2/rev2.c
index b569fbd9fb..8fb49f97b3 100644
--- a/keyboards/keebio/levinson/rev2/rev2.c
+++ b/keyboards/keebio/levinson/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "levinson.h"
+#include "rev2.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/levinson/rev2/rev2.h b/keyboards/keebio/levinson/rev2/rev2.h
index 7459813929..14db8b445b 100644
--- a/keyboards/keebio/levinson/rev2/rev2.h
+++ b/keyboards/keebio/levinson/rev2/rev2.h
@@ -1,7 +1,5 @@
#pragma once
-#include "levinson.h"
-
#include "quantum.h"
#ifndef FLIP_HALF
diff --git a/keyboards/keebio/levinson/rev3/rev3.c b/keyboards/keebio/levinson/rev3/rev3.c
index b569fbd9fb..c464270517 100644
--- a/keyboards/keebio/levinson/rev3/rev3.c
+++ b/keyboards/keebio/levinson/rev3/rev3.c
@@ -1,4 +1,4 @@
-#include "levinson.h"
+#include "rev3.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/levinson/rev3/rev3.h b/keyboards/keebio/levinson/rev3/rev3.h
index 6a00edd9a7..d6a0ef4227 100644
--- a/keyboards/keebio/levinson/rev3/rev3.h
+++ b/keyboards/keebio/levinson/rev3/rev3.h
@@ -1,7 +1,5 @@
#pragma once
-#include "levinson.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/nyquist/nyquist.c b/keyboards/keebio/nyquist/nyquist.c
deleted file mode 100644
index 2face09d42..0000000000
--- a/keyboards/keebio/nyquist/nyquist.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "nyquist.h"
diff --git a/keyboards/keebio/nyquist/nyquist.h b/keyboards/keebio/nyquist/nyquist.h
deleted file mode 100644
index 63d7680f06..0000000000
--- a/keyboards/keebio/nyquist/nyquist.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_keebio_nyquist_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_keebio_nyquist_rev2
- #include "rev2.h"
-#endif
-#ifdef KEYBOARD_keebio_nyquist_rev3
- #include "rev3.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/keebio/nyquist/rev1/rev1.c b/keyboards/keebio/nyquist/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/keebio/nyquist/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/keebio/nyquist/rev1/rev1.h b/keyboards/keebio/nyquist/rev1/rev1.h
index 2ada41ba92..7bbfb34e4f 100644
--- a/keyboards/keebio/nyquist/rev1/rev1.h
+++ b/keyboards/keebio/nyquist/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "nyquist.h"
-
#include "quantum.h"
#ifndef FLIP_HALF
diff --git a/keyboards/keebio/nyquist/rev2/rev2.h b/keyboards/keebio/nyquist/rev2/rev2.h
index 2ada41ba92..7bbfb34e4f 100644
--- a/keyboards/keebio/nyquist/rev2/rev2.h
+++ b/keyboards/keebio/nyquist/rev2/rev2.h
@@ -1,7 +1,5 @@
#pragma once
-#include "nyquist.h"
-
#include "quantum.h"
#ifndef FLIP_HALF
diff --git a/keyboards/keebio/nyquist/rev3/rev3.h b/keyboards/keebio/nyquist/rev3/rev3.h
index aa60609f28..648c774730 100644
--- a/keyboards/keebio/nyquist/rev3/rev3.h
+++ b/keyboards/keebio/nyquist/rev3/rev3.h
@@ -1,6 +1,5 @@
#pragma once
-#include "nyquist.h"
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/quefrency/quefrency.c b/keyboards/keebio/quefrency/quefrency.c
deleted file mode 100644
index d713a0ff3a..0000000000
--- a/keyboards/keebio/quefrency/quefrency.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "quefrency.h"
diff --git a/keyboards/keebio/quefrency/quefrency.h b/keyboards/keebio/quefrency/quefrency.h
deleted file mode 100644
index d9a14c439c..0000000000
--- a/keyboards/keebio/quefrency/quefrency.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_quefrency_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_keebio_quefrency_rev2
- #include "rev2.h"
-#endif
-#ifdef KEYBOARD_keebio_quefrency_rev3
- #include "rev3.h"
-#endif
-#ifdef KEYBOARD_keebio_quefrency_rev4
- #include "rev4.h"
-#endif
-#ifdef KEYBOARD_keebio_quefrency_rev5
- #include "rev5.h"
-#endif
diff --git a/keyboards/keebio/quefrency/rev1/rev1.c b/keyboards/keebio/quefrency/rev1/rev1.c
index 6704b062f5..f34f85b2cc 100644
--- a/keyboards/keebio/quefrency/rev1/rev1.c
+++ b/keyboards/keebio/quefrency/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "quefrency.h"
+#include "rev1.h"
void eeconfig_init_kb(void) {
#ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/keebio/quefrency/rev1/rev1.h b/keyboards/keebio/quefrency/rev1/rev1.h
index 1c3581b3a9..89a9c4a19d 100644
--- a/keyboards/keebio/quefrency/rev1/rev1.h
+++ b/keyboards/keebio/quefrency/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "quefrency.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/quefrency/rev2/rev2.c b/keyboards/keebio/quefrency/rev2/rev2.c
index 4e3e75a21f..3992687b7a 100644
--- a/keyboards/keebio/quefrency/rev2/rev2.c
+++ b/keyboards/keebio/quefrency/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "quefrency.h"
+#include "rev2.h"
#include "split_util.h"
void matrix_init_kb(void) {
diff --git a/keyboards/keebio/quefrency/rev2/rev2.h b/keyboards/keebio/quefrency/rev2/rev2.h
index 31d1052fac..e9814575b2 100644
--- a/keyboards/keebio/quefrency/rev2/rev2.h
+++ b/keyboards/keebio/quefrency/rev2/rev2.h
@@ -1,6 +1,5 @@
#pragma once
-#include "quefrency.h"
#include "quantum.h"
#define LAYOUT_60( \
diff --git a/keyboards/keebio/quefrency/rev3/rev3.c b/keyboards/keebio/quefrency/rev3/rev3.c
index 52ce977ac7..24791f75d0 100644
--- a/keyboards/keebio/quefrency/rev3/rev3.c
+++ b/keyboards/keebio/quefrency/rev3/rev3.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "quefrency.h"
+#include "rev3.h"
#include "split_util.h"
void matrix_init_kb(void) {
diff --git a/keyboards/keebio/quefrency/rev3/rev3.h b/keyboards/keebio/quefrency/rev3/rev3.h
index 12f76d5c85..120186f9c0 100644
--- a/keyboards/keebio/quefrency/rev3/rev3.h
+++ b/keyboards/keebio/quefrency/rev3/rev3.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
#pragma once
-#include "quefrency.h"
#include "quantum.h"
#define LAYOUT_60( \
diff --git a/keyboards/keebio/quefrency/rev4/rev4.c b/keyboards/keebio/quefrency/rev4/rev4.c
index 66d73a934a..78e48dcf70 100644
--- a/keyboards/keebio/quefrency/rev4/rev4.c
+++ b/keyboards/keebio/quefrency/rev4/rev4.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "quefrency.h"
+#include "rev4.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/keebio/quefrency/rev4/rev4.h b/keyboards/keebio/quefrency/rev4/rev4.h
index 2284a6da43..4f51cc8f32 100644
--- a/keyboards/keebio/quefrency/rev4/rev4.h
+++ b/keyboards/keebio/quefrency/rev4/rev4.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
#pragma once
-#include "quefrency.h"
#include "quantum.h"
#define LAYOUT_60( \
diff --git a/keyboards/keebio/quefrency/rev5/rev5.c b/keyboards/keebio/quefrency/rev5/rev5.c
index 66d73a934a..a94fecd967 100644
--- a/keyboards/keebio/quefrency/rev5/rev5.c
+++ b/keyboards/keebio/quefrency/rev5/rev5.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "quefrency.h"
+#include "rev5.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/keebio/quefrency/rev5/rev5.h b/keyboards/keebio/quefrency/rev5/rev5.h
index 2284a6da43..4f51cc8f32 100644
--- a/keyboards/keebio/quefrency/rev5/rev5.h
+++ b/keyboards/keebio/quefrency/rev5/rev5.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
#pragma once
-#include "quefrency.h"
#include "quantum.h"
#define LAYOUT_60( \
diff --git a/keyboards/keebio/rorschach/rev1/rev1.c b/keyboards/keebio/rorschach/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/keebio/rorschach/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/keebio/rorschach/rev1/rev1.h b/keyboards/keebio/rorschach/rev1/rev1.h
index c06cd337a4..32c421c7d0 100644
--- a/keyboards/keebio/rorschach/rev1/rev1.h
+++ b/keyboards/keebio/rorschach/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "rorschach.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/rorschach/rorschach.c b/keyboards/keebio/rorschach/rorschach.c
deleted file mode 100644
index 49e2917890..0000000000
--- a/keyboards/keebio/rorschach/rorschach.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rorschach.h"
diff --git a/keyboards/keebio/rorschach/rorschach.h b/keyboards/keebio/rorschach/rorschach.h
deleted file mode 100644
index f11093f074..0000000000
--- a/keyboards/keebio/rorschach/rorschach.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_keebio_rorschach_rev1
- #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/keebio/sinc/rev1/rev1.h b/keyboards/keebio/sinc/rev1/rev1.h
index b8c9f7a14f..45d7ab05d1 100644
--- a/keyboards/keebio/sinc/rev1/rev1.h
+++ b/keyboards/keebio/sinc/rev1/rev1.h
@@ -1,6 +1,5 @@
#pragma once
-#include "sinc.h"
#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/keebio/sinc/rev2/rev2.h b/keyboards/keebio/sinc/rev2/rev2.h
index f73af295b2..8960cf7579 100644
--- a/keyboards/keebio/sinc/rev2/rev2.h
+++ b/keyboards/keebio/sinc/rev2/rev2.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
#pragma once
-#include "sinc.h"
#include "quantum.h"
#define LAYOUT_75( \
diff --git a/keyboards/keebio/sinc/rev3/rev3.h b/keyboards/keebio/sinc/rev3/rev3.h
index 57d072398a..b863ddfe20 100644
--- a/keyboards/keebio/sinc/rev3/rev3.h
+++ b/keyboards/keebio/sinc/rev3/rev3.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
#pragma once
-#include "sinc.h"
#include "quantum.h"
#define LAYOUT_75( \
diff --git a/keyboards/keebio/sinc/sinc.c b/keyboards/keebio/sinc/sinc.c
index 9b2f6da512..d50eb82019 100644
--- a/keyboards/keebio/sinc/sinc.c
+++ b/keyboards/keebio/sinc/sinc.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "sinc.h"
+#include "quantum.h"
#include "split_util.h"
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/sinc/sinc.h b/keyboards/keebio/sinc/sinc.h
deleted file mode 100644
index 4607d8125c..0000000000
--- a/keyboards/keebio/sinc/sinc.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Danny Nguyen
-
-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 .
-*/
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_sinc_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_keebio_sinc_rev2
- #include "rev2.h"
-#endif
-#ifdef KEYBOARD_keebio_sinc_rev3
- #include "rev3.h"
-#endif
diff --git a/keyboards/keebio/viterbi/rev1/rev1.c b/keyboards/keebio/viterbi/rev1/rev1.c
deleted file mode 100644
index 509e42dc51..0000000000
--- a/keyboards/keebio/viterbi/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "viterbi.h"
diff --git a/keyboards/keebio/viterbi/rev1/rev1.h b/keyboards/keebio/viterbi/rev1/rev1.h
index 08055df9f8..95776a7aeb 100644
--- a/keyboards/keebio/viterbi/rev1/rev1.h
+++ b/keyboards/keebio/viterbi/rev1/rev1.h
@@ -1,6 +1,5 @@
#pragma once
-#include "viterbi.h"
#include "quantum.h"
#ifndef FLIP_HALF
diff --git a/keyboards/keebio/viterbi/rev2/rev2.c b/keyboards/keebio/viterbi/rev2/rev2.c
index a72cc44436..6158903e22 100644
--- a/keyboards/keebio/viterbi/rev2/rev2.c
+++ b/keyboards/keebio/viterbi/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "viterbi.h"
+#include "rev2.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/viterbi/rev2/rev2.h b/keyboards/keebio/viterbi/rev2/rev2.h
index 9feeaffef1..a48c13d46b 100644
--- a/keyboards/keebio/viterbi/rev2/rev2.h
+++ b/keyboards/keebio/viterbi/rev2/rev2.h
@@ -1,6 +1,5 @@
#pragma once
-#include "viterbi.h"
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/keebio/viterbi/viterbi.c b/keyboards/keebio/viterbi/viterbi.c
deleted file mode 100644
index 509e42dc51..0000000000
--- a/keyboards/keebio/viterbi/viterbi.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "viterbi.h"
diff --git a/keyboards/keebio/viterbi/viterbi.h b/keyboards/keebio/viterbi/viterbi.h
deleted file mode 100644
index b17b322410..0000000000
--- a/keyboards/keebio/viterbi/viterbi.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_viterbi_rev1
- #include "rev1.h"
-#elif KEYBOARD_keebio_viterbi_rev2
- #include "rev2.h"
-#endif
-
-#define LAYOUT_ortho_5x14 LAYOUT
-
diff --git a/keyboards/keycapsss/kimiko/kimiko.c b/keyboards/keycapsss/kimiko/kimiko.c
index c35cb62544..041387ad53 100644
--- a/keyboards/keycapsss/kimiko/kimiko.c
+++ b/keyboards/keycapsss/kimiko/kimiko.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "kimiko.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keycapsss/kimiko/kimiko.h b/keyboards/keycapsss/kimiko/kimiko.h
deleted file mode 100644
index 948f397a90..0000000000
--- a/keyboards/keycapsss/kimiko/kimiko.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 @ben_roe (keycapsss.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 .
- */
-#pragma once
-
-#ifdef KEYBOARD_keycapsss_kimiko_rev1
-# include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/keycapsss/kimiko/rev1/rev1.c b/keyboards/keycapsss/kimiko/rev1/rev1.c
deleted file mode 100644
index bc93aad0af..0000000000
--- a/keyboards/keycapsss/kimiko/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 @ben_roe (keycapsss.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 .
- */
-
-#include "rev1.h"
diff --git a/keyboards/keycapsss/kimiko/rev1/rev1.h b/keyboards/keycapsss/kimiko/rev1/rev1.h
index 619eed8f38..3359a39838 100644
--- a/keyboards/keycapsss/kimiko/rev1/rev1.h
+++ b/keyboards/keycapsss/kimiko/rev1/rev1.h
@@ -16,7 +16,7 @@
#pragma once
-#include "kimiko.h"
+#include "quantum.h"
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
diff --git a/keyboards/keychron/q1/ansi/ansi.c b/keyboards/keychron/q1/ansi/ansi.c
index fc22d1aff3..ee586fef93 100644
--- a/keyboards/keychron/q1/ansi/ansi.c
+++ b/keyboards/keychron/q1/ansi/ansi.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q1/ansi/ansi.h b/keyboards/keychron/q1/ansi/ansi.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q1/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c
index 5909b993e3..bc559b3541 100644
--- a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q1/iso/iso.c b/keyboards/keychron/q1/iso/iso.c
index c8e3165bd3..619d89dffc 100644
--- a/keyboards/keychron/q1/iso/iso.c
+++ b/keyboards/keychron/q1/iso/iso.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q1/iso/iso.h b/keyboards/keychron/q1/iso/iso.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q1/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1/iso_encoder/iso_encoder.c
index c6563ad318..c6b091fff1 100644
--- a/keyboards/keychron/q1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.h b/keyboards/keychron/q1/iso_encoder/iso_encoder.h
deleted file mode 100644
index d62d707b4a..0000000000
--- a/keyboards/keychron/q1/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
\ No newline at end of file
diff --git a/keyboards/keychron/q1/q1.c b/keyboards/keychron/q1/q1.c
index aa0789e852..3df62c4339 100644
--- a/keyboards/keychron/q1/q1.c
+++ b/keyboards/keychron/q1/q1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "q1.h"
+#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b0111111111111101,
diff --git a/keyboards/keychron/q1/q1.h b/keyboards/keychron/q1/q1.h
deleted file mode 100644
index d706779910..0000000000
--- a/keyboards/keychron/q1/q1.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_keychron_q1_ansi)
-# include "ansi.h"
-#elif defined(KEYBOARD_keychron_q1_ansi_encoder)
-# include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q1_iso)
-# include "iso.h"
-#elif defined(KEYBOARD_keychron_q1_iso_encoder)
-# include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q10/iso_encoder/iso_encoder.h b/keyboards/keychron/q10/iso_encoder/iso_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q10/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q10/q10.c b/keyboards/keychron/q10/q10.c
index c823e6939f..455a2a25f2 100644
--- a/keyboards/keychron/q10/q10.c
+++ b/keyboards/keychron/q10/q10.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "q10.h"
+#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b1111111111111111,
diff --git a/keyboards/keychron/q10/q10.h b/keyboards/keychron/q10/q10.h
deleted file mode 100644
index 80e747aca3..0000000000
--- a/keyboards/keychron/q10/q10.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_keychron_q10_ansi_encoder)
-# include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q10_iso_encoder)
-# include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/q2/ansi/ansi.c b/keyboards/keychron/q2/ansi/ansi.c
index 5c5acb3fd8..28f91269c4 100644
--- a/keyboards/keychron/q2/ansi/ansi.c
+++ b/keyboards/keychron/q2/ansi/ansi.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q2/ansi/ansi.h b/keyboards/keychron/q2/ansi/ansi.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q2/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
index c926a5bf75..28f91269c4 100644
--- a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q2/iso/iso.c b/keyboards/keychron/q2/iso/iso.c
index 7f8d388b0e..1f2c76468e 100644
--- a/keyboards/keychron/q2/iso/iso.c
+++ b/keyboards/keychron/q2/iso/iso.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q2/iso/iso.h b/keyboards/keychron/q2/iso/iso.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q2/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q2/iso_encoder/iso_encoder.c b/keyboards/keychron/q2/iso_encoder/iso_encoder.c
index af7b818149..1f2c76468e 100644
--- a/keyboards/keychron/q2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q2/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/keychron/q2/iso_encoder/iso_encoder.h b/keyboards/keychron/q2/iso_encoder/iso_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q2/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q2/q2.c b/keyboards/keychron/q2/q2.c
index 13b2238d17..7ff85556de 100644
--- a/keyboards/keychron/q2/q2.c
+++ b/keyboards/keychron/q2/q2.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "q2.h"
+#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b1111111111111111,
diff --git a/keyboards/keychron/q2/q2.h b/keyboards/keychron/q2/q2.h
deleted file mode 100644
index a256ceae6a..0000000000
--- a/keyboards/keychron/q2/q2.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_keychron_q2_ansi)
-# include "ansi.h"
-#elif defined(KEYBOARD_keychron_q2_ansi_encoder)
-# include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q2_iso)
-# include "iso.h"
-#elif defined(KEYBOARD_keychron_q2_iso_encoder)
-# include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/q3/ansi/ansi.c b/keyboards/keychron/q3/ansi/ansi.c
index beff3bc5ec..432a914058 100644
--- a/keyboards/keychron/q3/ansi/ansi.c
+++ b/keyboards/keychron/q3/ansi/ansi.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/ansi/ansi.h b/keyboards/keychron/q3/ansi/ansi.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
index 13f6c26d2d..f873f77d12 100644
--- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/iso/iso.c b/keyboards/keychron/q3/iso/iso.c
index e753a39c1b..d747d55115 100644
--- a/keyboards/keychron/q3/iso/iso.c
+++ b/keyboards/keychron/q3/iso/iso.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/iso/iso.h b/keyboards/keychron/q3/iso/iso.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.c b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
index 02aac01ddc..d2bb169aac 100644
--- a/keyboards/keychron/q3/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.h b/keyboards/keychron/q3/iso_encoder/iso_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/jis/jis.c b/keyboards/keychron/q3/jis/jis.c
index 20983c6a5f..f262d3c7d8 100644
--- a/keyboards/keychron/q3/jis/jis.c
+++ b/keyboards/keychron/q3/jis/jis.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "jis.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/jis/jis.h b/keyboards/keychron/q3/jis/jis.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/jis/jis.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.c b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
index efaf5fc5f2..0a97c5ca68 100644
--- a/keyboards/keychron/q3/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "jis_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.h b/keyboards/keychron/q3/jis_encoder/jis_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q3/jis_encoder/jis_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q3/q3.c b/keyboards/keychron/q3/q3.c
index 120013e77e..2bf8bf08a0 100644
--- a/keyboards/keychron/q3/q3.c
+++ b/keyboards/keychron/q3/q3.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "q3.h"
+#include "quantum.h"
#include "rgb_matrix.h"
// clang-format off
diff --git a/keyboards/keychron/q3/q3.h b/keyboards/keychron/q3/q3.h
deleted file mode 100644
index bc2d458bb7..0000000000
--- a/keyboards/keychron/q3/q3.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_keychron_q3_ansi)
-# include "ansi.h"
-#elif defined(KEYBOARD_keychron_q3_ansi_encoder)
-# include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q3_iso)
-# include "iso.h"
-#elif defined(KEYBOARD_keychron_q3_iso_encoder)
-# include "iso_encoder.h"
-#elif defined(KEYBOARD_keychron_q3_jis)
-# include "jis.h"
-#elif defined(KEYBOARD_keychron_q3_jis_encoder)
-# include "jis_encoder.h"
-#endif
diff --git a/keyboards/keychron/q4/ansi_v1/ansi_v1.c b/keyboards/keychron/q4/ansi_v1/ansi_v1.c
index e651744262..88599103ef 100644
--- a/keyboards/keychron/q4/ansi_v1/ansi_v1.c
+++ b/keyboards/keychron/q4/ansi_v1/ansi_v1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi_v1.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q4/ansi_v1/ansi_v1.h b/keyboards/keychron/q4/ansi_v1/ansi_v1.h
deleted file mode 100644
index 381c674dad..0000000000
--- a/keyboards/keychron/q4/ansi_v1/ansi_v1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
\ No newline at end of file
diff --git a/keyboards/keychron/q4/ansi_v2/ansi_v2.h b/keyboards/keychron/q4/ansi_v2/ansi_v2.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q4/ansi_v2/ansi_v2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q4/iso/iso.c b/keyboards/keychron/q4/iso/iso.c
index c1d1982b94..24cbcfd745 100644
--- a/keyboards/keychron/q4/iso/iso.c
+++ b/keyboards/keychron/q4/iso/iso.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q4/iso/iso.h b/keyboards/keychron/q4/iso/iso.h
deleted file mode 100644
index 381c674dad..0000000000
--- a/keyboards/keychron/q4/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
\ No newline at end of file
diff --git a/keyboards/keychron/q4/q4.c b/keyboards/keychron/q4/q4.c
index 6d31e45607..c3cb67bcc2 100644
--- a/keyboards/keychron/q4/q4.c
+++ b/keyboards/keychron/q4/q4.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "q4.h"
+#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b11111111111111,
diff --git a/keyboards/keychron/q4/q4.h b/keyboards/keychron/q4/q4.h
deleted file mode 100644
index 34aa4a8505..0000000000
--- a/keyboards/keychron/q4/q4.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_keychron_q4_ansi_v1)
-# include "ansi_v1.h"
-#elif defined(KEYBOARD_keychron_q4_ansi_v2)
-# include "ansi_v2.h"
-#elif defined(KEYBOARD_keychron_q4_iso)
-# include "iso.h"
-#endif
diff --git a/keyboards/keychron/q5/ansi/ansi.c b/keyboards/keychron/q5/ansi/ansi.c
index 6aeb46c07d..dda563cd79 100644
--- a/keyboards/keychron/q5/ansi/ansi.c
+++ b/keyboards/keychron/q5/ansi/ansi.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/ansi/ansi.h b/keyboards/keychron/q5/ansi/ansi.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q5/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
index 43c27433b2..4d3cc0f036 100644
--- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q5/iso/iso.c b/keyboards/keychron/q5/iso/iso.c
index b57474f535..65924abd76 100644
--- a/keyboards/keychron/q5/iso/iso.c
+++ b/keyboards/keychron/q5/iso/iso.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/iso/iso.h b/keyboards/keychron/q5/iso/iso.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q5/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.c b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
index 8ae11bc36b..22ba9e2d4e 100644
--- a/keyboards/keychron/q5/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.h b/keyboards/keychron/q5/iso_encoder/iso_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q5/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q5/q5.c b/keyboards/keychron/q5/q5.c
index 4130dcebe3..7a1cabcd1a 100644
--- a/keyboards/keychron/q5/q5.c
+++ b/keyboards/keychron/q5/q5.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "q5.h"
+#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b111111111111111111,
diff --git a/keyboards/keychron/q5/q5.h b/keyboards/keychron/q5/q5.h
deleted file mode 100644
index 70ccc8dcfa..0000000000
--- a/keyboards/keychron/q5/q5.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_keychron_q5_ansi)
-# include "ansi.h"
-#elif defined(KEYBOARD_keychron_q5_ansi_encoder)
-# include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q5_iso)
-# include "iso.h"
-#elif defined(KEYBOARD_keychron_q5_iso_encoder)
-# include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/q6/ansi/ansi.c b/keyboards/keychron/q6/ansi/ansi.c
index 982996d347..a81d5f9e9f 100644
--- a/keyboards/keychron/q6/ansi/ansi.c
+++ b/keyboards/keychron/q6/ansi/ansi.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q6/ansi/ansi.h b/keyboards/keychron/q6/ansi/ansi.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q6/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
index 6cf593dd25..6fbece3678 100644
--- a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q6/iso/iso.c b/keyboards/keychron/q6/iso/iso.c
index d8c4add867..f2081177e9 100644
--- a/keyboards/keychron/q6/iso/iso.c
+++ b/keyboards/keychron/q6/iso/iso.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q6/iso/iso.h b/keyboards/keychron/q6/iso/iso.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q6/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.c b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
index c6a21a6223..e9a6f6edfc 100644
--- a/keyboards/keychron/q6/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.h b/keyboards/keychron/q6/iso_encoder/iso_encoder.h
deleted file mode 100644
index de5b0aedb1..0000000000
--- a/keyboards/keychron/q6/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q6/q6.c b/keyboards/keychron/q6/q6.c
index d2f9d2aa4e..8a9750e9de 100644
--- a/keyboards/keychron/q6/q6.c
+++ b/keyboards/keychron/q6/q6.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "q6.h"
+#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b11111111111111111111,
diff --git a/keyboards/keychron/q6/q6.h b/keyboards/keychron/q6/q6.h
deleted file mode 100644
index 9e878e700c..0000000000
--- a/keyboards/keychron/q6/q6.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_keychron_q6_ansi)
-# include "ansi.h"
-#elif defined(KEYBOARD_keychron_q6_ansi_encoder)
-# include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q6_iso)
-# include "iso.h"
-#elif defined(KEYBOARD_keychron_q6_iso_encoder)
-# include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/q8/ansi/ansi.h b/keyboards/keychron/q8/ansi/ansi.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q8/iso/iso.h b/keyboards/keychron/q8/iso/iso.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q8/iso_encoder/iso_encoder.h b/keyboards/keychron/q8/iso_encoder/iso_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q8/q8.c b/keyboards/keychron/q8/q8.c
index d86ced3d1b..a653bdc8b9 100644
--- a/keyboards/keychron/q8/q8.c
+++ b/keyboards/keychron/q8/q8.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "q8.h"
+#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b111111111111111,
diff --git a/keyboards/keychron/q8/q8.h b/keyboards/keychron/q8/q8.h
deleted file mode 100644
index 02981db19c..0000000000
--- a/keyboards/keychron/q8/q8.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_keychron_q8_ansi)
-# include "ansi.h"
-#elif defined(KEYBOARD_keychron_q8_ansi_encoder)
-# include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q8_iso)
-# include "iso.h"
-#elif defined(KEYBOARD_keychron_q8_iso_encoder)
-# include "iso_encoder.h"
-#endif
diff --git a/keyboards/keychron/q9/ansi/ansi.c b/keyboards/keychron/q9/ansi/ansi.c
index e10c4de25b..b98149a5f8 100644
--- a/keyboards/keychron/q9/ansi/ansi.c
+++ b/keyboards/keychron/q9/ansi/ansi.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/ansi/ansi.h b/keyboards/keychron/q9/ansi/ansi.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q9/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
index 24c401473d..de0eda1c02 100644
--- a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "ansi_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index 366d3f39c2..0000000000
--- a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 1010 @ Keychron (https://www.keychron.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 1 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q9/iso/iso.c b/keyboards/keychron/q9/iso/iso.c
index e038e8581f..0e258e8c63 100644
--- a/keyboards/keychron/q9/iso/iso.c
+++ b/keyboards/keychron/q9/iso/iso.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/iso/iso.h b/keyboards/keychron/q9/iso/iso.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q9/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q9/iso_encoder/iso_encoder.c b/keyboards/keychron/q9/iso_encoder/iso_encoder.c
index 7f6db9a128..0804f33671 100644
--- a/keyboards/keychron/q9/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q9/iso_encoder/iso_encoder.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "iso_encoder.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/iso_encoder/iso_encoder.h b/keyboards/keychron/q9/iso_encoder/iso_encoder.h
deleted file mode 100644
index 366d3f39c2..0000000000
--- a/keyboards/keychron/q9/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 1010 @ Keychron (https://www.keychron.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 1 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q9/q9.c b/keyboards/keychron/q9/q9.c
index 2f98a72974..51dea886f1 100644
--- a/keyboards/keychron/q9/q9.c
+++ b/keyboards/keychron/q9/q9.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "q9.h"
+#include "quantum.h"
const matrix_row_t matrix_mask[] = {
0b111111111111111,
diff --git a/keyboards/keychron/q9/q9.h b/keyboards/keychron/q9/q9.h
deleted file mode 100644
index d6a0ef1bea..0000000000
--- a/keyboards/keychron/q9/q9.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_keychron_q9_ansi)
-# include "ansi.h"
-#elif defined(KEYBOARD_keychron_q9_ansi_encoder)
-# include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q9_iso)
-# include "iso.h"
-#elif defined(KEYBOARD_keychron_q9_iso_encoder)
-# include "iso_encoder.h"
-#endif
diff --git a/keyboards/kinesis/alvicstep/alvicstep.c b/keyboards/kinesis/alvicstep/alvicstep.c
index a2a62df36a..274ac083c5 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.c
+++ b/keyboards/kinesis/alvicstep/alvicstep.c
@@ -1,4 +1,4 @@
-#include "kinesis.h"
+#include "alvicstep.h"
// begin section origin https://github.com/alvicstep/tmk_keyboard
diff --git a/keyboards/kinesis/alvicstep/alvicstep.h b/keyboards/kinesis/alvicstep/alvicstep.h
index 053698770a..3b71e51678 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.h
+++ b/keyboards/kinesis/alvicstep/alvicstep.h
@@ -1,6 +1,13 @@
#pragma once
-#include "../kinesis.h"
+#include "quantum.h"
+
+void all_led_off(void);
+void all_led_on(void);
+void num_lock_led_on(void);
+void caps_lock_led_on(void);
+void scroll_lock_led_on(void);
+void keypad_led_on(void);
#define ___ KC_NO
diff --git a/keyboards/kinesis/kinesis.c b/keyboards/kinesis/kinesis.c
deleted file mode 100644
index 7a6a1be544..0000000000
--- a/keyboards/kinesis/kinesis.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kinesis.h"
diff --git a/keyboards/kinesis/kinesis.h b/keyboards/kinesis/kinesis.h
deleted file mode 100644
index e3345ee27f..0000000000
--- a/keyboards/kinesis/kinesis.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_kinesis_alvicstep)
-# include "alvicstep.h"
-#elif defined(KEYBOARD_kinesis_stapelberg)
-# include "stapelberg.h"
-#elif defined(KEYBOARD_kinesis_kint2pp)
-# include "kint2pp.h"
-#elif defined(KEYBOARD_kinesis_nguyenvietyen)
-# include "nguyenvietyen.h"
-#elif defined(KEYBOARD_kinesis_kint36)
-# include "kint36.h"
-#elif defined(KEYBOARD_kinesis_kint41)
-# include "kint41.h"
-#elif defined(KEYBOARD_kinesis_kintlc)
-# include "kintlc.h"
-#endif
-
-#include "quantum.h"
-
-void all_led_off(void);
-void all_led_on(void);
-void num_lock_led_on(void);
-void caps_lock_led_on(void);
-void scroll_lock_led_on(void);
-void keypad_led_on(void);
diff --git a/keyboards/kinesis/kint2pp/kint2pp.c b/keyboards/kinesis/kint2pp/kint2pp.c
deleted file mode 100644
index 856e29c31e..0000000000
--- a/keyboards/kinesis/kint2pp/kint2pp.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kint2pp.h"
diff --git a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c b/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c
deleted file mode 100644
index 3f01479389..0000000000
--- a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "nguyenvietyen.h"
diff --git a/keyboards/kinesis/stapelberg/stapelberg.c b/keyboards/kinesis/stapelberg/stapelberg.c
deleted file mode 100644
index a69679eef9..0000000000
--- a/keyboards/kinesis/stapelberg/stapelberg.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "stapelberg.h"
diff --git a/keyboards/kudox/columner/columner.c b/keyboards/kudox/columner/columner.c
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kudox/kudox.c b/keyboards/kudox/kudox.c
deleted file mode 100644
index d7643747ad..0000000000
--- a/keyboards/kudox/kudox.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kumao Kobo
- *
- * 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 .
- */
-#include "kudox.h"
diff --git a/keyboards/kudox/kudox.h b/keyboards/kudox/kudox.h
deleted file mode 100644
index ca61ea82d1..0000000000
--- a/keyboards/kudox/kudox.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Kumao Kobo
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef KEYBOARD_kudox_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_kudox_rev2
- #include "rev2.h"
-#endif
-#ifdef KEYBOARD_kudox_rev3
- #include "rev3.h"
-#endif
-#ifdef KEYBOARD_kudox_columner
- #include "columner.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/kudox/rev1/rev1.c b/keyboards/kudox/rev1/rev1.c
deleted file mode 100644
index abcdf4843e..0000000000
--- a/keyboards/kudox/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kudox.h"
diff --git a/keyboards/kudox/rev1/rev1.h b/keyboards/kudox/rev1/rev1.h
index 7a97cce699..82373daa6f 100644
--- a/keyboards/kudox/rev1/rev1.h
+++ b/keyboards/kudox/rev1/rev1.h
@@ -1,6 +1,5 @@
#pragma once
-#include "kudox.h"
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/kudox/rev2/rev2.c b/keyboards/kudox/rev2/rev2.c
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kudox/rev3/rev3.c b/keyboards/kudox/rev3/rev3.c
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/kudox_full/kudox_full.c b/keyboards/kudox_full/kudox_full.c
index d5ab31fc15..d69f679822 100644
--- a/keyboards/kudox_full/kudox_full.c
+++ b/keyboards/kudox_full/kudox_full.c
@@ -1,7 +1,7 @@
// Copyright 2021 Kumao Kobo (@kumaokobo)
// SPDX-License-Identifier: GPL-2.0+
-#include "kudox_full.h"
+#include "quantum.h"
#ifdef RGBLIGHT_ENABLE
void eeconfig_init_kb(void) {
diff --git a/keyboards/kudox_full/kudox_full.h b/keyboards/kudox_full/kudox_full.h
deleted file mode 100644
index 78a4dcb474..0000000000
--- a/keyboards/kudox_full/kudox_full.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2021 Kumao Kobo (@kumaokobo)
-// SPDX-License-Identifier: GPL-2.0+
-
-#pragma once
-
-#ifdef KEYBOARD_kudox_full_rev1
- #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/kudox_full/rev1/rev1.c b/keyboards/kudox_full/rev1/rev1.c
deleted file mode 100644
index 8dfb941ba2..0000000000
--- a/keyboards/kudox_full/rev1/rev1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 Kumao Kobo (@kumaokobo)
-// SPDX-License-Identifier: GPL-2.0+
-
-#include "rev1.h"
diff --git a/keyboards/kudox_game/kudox_game.c b/keyboards/kudox_game/kudox_game.c
deleted file mode 100644
index cf053afd06..0000000000
--- a/keyboards/kudox_game/kudox_game.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kumao Kobo
- *
- * 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 .
- */
-#include "kudox_game.h"
diff --git a/keyboards/kudox_game/kudox_game.h b/keyboards/kudox_game/kudox_game.h
deleted file mode 100644
index c76f086c87..0000000000
--- a/keyboards/kudox_game/kudox_game.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Kumao Kobo
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef KEYBOARD_kudox_game_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_kudox_game_rev2
- #include "rev2.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/kudox_game/rev1/rev1.c b/keyboards/kudox_game/rev1/rev1.c
deleted file mode 100644
index 32356f8a4a..0000000000
--- a/keyboards/kudox_game/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kudox_game.h"
diff --git a/keyboards/kudox_game/rev1/rev1.h b/keyboards/kudox_game/rev1/rev1.h
index e630a51658..52b30cf61b 100644
--- a/keyboards/kudox_game/rev1/rev1.h
+++ b/keyboards/kudox_game/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "../kudox_game.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/kudox_game/rev2/rev2.c b/keyboards/kudox_game/rev2/rev2.c
deleted file mode 100644
index 32356f8a4a..0000000000
--- a/keyboards/kudox_game/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kudox_game.h"
diff --git a/keyboards/kudox_game/rev2/rev2.h b/keyboards/kudox_game/rev2/rev2.h
index e630a51658..52b30cf61b 100644
--- a/keyboards/kudox_game/rev2/rev2.h
+++ b/keyboards/kudox_game/rev2/rev2.h
@@ -1,7 +1,5 @@
#pragma once
-#include "../kudox_game.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c
index ee0c931be2..37e8b3ab9b 100644
--- a/keyboards/lets_split/lets_split.c
+++ b/keyboards/lets_split/lets_split.c
@@ -1,4 +1,4 @@
-#include "lets_split.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h
deleted file mode 100644
index 90290e586f..0000000000
--- a/keyboards/lets_split/lets_split.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_lets_split_rev1
- #include "rev1.h"
-#elif KEYBOARD_lets_split_rev2
- #include "rev2.h"
-#elif KEYBOARD_lets_split_sockets
- #include "sockets.h"
-#endif
diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c
deleted file mode 100644
index 3caa114c22..0000000000
--- a/keyboards/lets_split/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lets_split.h"
diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h
index 6a65954f22..da7bb4ff92 100644
--- a/keyboards/lets_split/rev1/rev1.h
+++ b/keyboards/lets_split/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "lets_split.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c
deleted file mode 100644
index 3caa114c22..0000000000
--- a/keyboards/lets_split/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lets_split.h"
diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h
index 47f085254a..14db8b445b 100644
--- a/keyboards/lets_split/rev2/rev2.h
+++ b/keyboards/lets_split/rev2/rev2.h
@@ -1,7 +1,5 @@
#pragma once
-#include "lets_split.h"
-
#include "quantum.h"
#ifndef FLIP_HALF
diff --git a/keyboards/lets_split/sockets/sockets.c b/keyboards/lets_split/sockets/sockets.c
deleted file mode 100644
index 3caa114c22..0000000000
--- a/keyboards/lets_split/sockets/sockets.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lets_split.h"
diff --git a/keyboards/lets_split/sockets/sockets.h b/keyboards/lets_split/sockets/sockets.h
index 47f085254a..14db8b445b 100644
--- a/keyboards/lets_split/sockets/sockets.h
+++ b/keyboards/lets_split/sockets/sockets.h
@@ -1,7 +1,5 @@
#pragma once
-#include "lets_split.h"
-
#include "quantum.h"
#ifndef FLIP_HALF
diff --git a/keyboards/lfkeyboards/lfk78/revb/revb.h b/keyboards/lfkeyboards/lfk78/revb/revb.h
index aa48c26ed4..d81a2363cd 100644
--- a/keyboards/lfkeyboards/lfk78/revb/revb.h
+++ b/keyboards/lfkeyboards/lfk78/revb/revb.h
@@ -1,5 +1,7 @@
#pragma once
+#include "lfk78.h"
+
// readability
#define XXX KC_NO
diff --git a/keyboards/lfkeyboards/lfk78/revc/revc.h b/keyboards/lfkeyboards/lfk78/revc/revc.h
index 6a9dd87bf9..e7ab930d2f 100644
--- a/keyboards/lfkeyboards/lfk78/revc/revc.h
+++ b/keyboards/lfkeyboards/lfk78/revc/revc.h
@@ -1,5 +1,7 @@
#pragma once
+#include "lfk78.h"
+
// readability
#define XXX KC_NO
diff --git a/keyboards/lfkeyboards/lfk78/revj/revj.h b/keyboards/lfkeyboards/lfk78/revj/revj.h
index 6a9dd87bf9..e7ab930d2f 100644
--- a/keyboards/lfkeyboards/lfk78/revj/revj.h
+++ b/keyboards/lfkeyboards/lfk78/revj/revj.h
@@ -1,5 +1,7 @@
#pragma once
+#include "lfk78.h"
+
// readability
#define XXX KC_NO
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c
index a1d9f61284..32dbce8fd5 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.c
+++ b/keyboards/lfkeyboards/smk65/revb/revb.c
@@ -15,7 +15,7 @@ along with this program. If not, see .
#include
#include
#include
-#include "smk65.h"
+#include "revb.h"
#include "debug.h"
#include "issi.h"
#include "TWIlib.h"
diff --git a/keyboards/lfkeyboards/smk65/smk65.h b/keyboards/lfkeyboards/smk65/smk65.h
deleted file mode 100644
index 534b763de6..0000000000
--- a/keyboards/lfkeyboards/smk65/smk65.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 LFKeyboards
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_lfkeyboards_smk65_revb
- #include "revb.h"
-#elif KEYBOARD_lfkeyboards_smk65_revf
- #include "revf.h"
-#endif
diff --git a/keyboards/lily58/glow_enc/glow_enc.c b/keyboards/lily58/glow_enc/glow_enc.c
deleted file mode 100644
index 57a0df93db..0000000000
--- a/keyboards/lily58/glow_enc/glow_enc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-Copyright 2020 Ben Roesner (keycapsss.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 .
-*/
-
-#include "lily58.h"
-
diff --git a/keyboards/lily58/glow_enc/glow_enc.h b/keyboards/lily58/glow_enc/glow_enc.h
index f9cc1c26b8..2a81dc0027 100644
--- a/keyboards/lily58/glow_enc/glow_enc.h
+++ b/keyboards/lily58/glow_enc/glow_enc.h
@@ -16,8 +16,6 @@
#pragma once
-#include "lily58.h"
-
#include "quantum.h"
diff --git a/keyboards/lily58/lib/host_led_state_reader.c b/keyboards/lily58/lib/host_led_state_reader.c
index 6bdd4a5a9f..fbf9b99f70 100644
--- a/keyboards/lily58/lib/host_led_state_reader.c
+++ b/keyboards/lily58/lib/host_led_state_reader.c
@@ -1,7 +1,6 @@
#include
#include "led.h"
#include "host.h"
-#include "lily58.h"
char host_led_state_str[24];
diff --git a/keyboards/lily58/lib/keylogger.c b/keyboards/lily58/lib/keylogger.c
index 2fc3e663ec..0d17e654f4 100644
--- a/keyboards/lily58/lib/keylogger.c
+++ b/keyboards/lily58/lib/keylogger.c
@@ -1,6 +1,5 @@
#include
#include "action.h"
-#include "lily58.h"
char keylog_str[24] = {};
char keylogs_str[21] = {};
diff --git a/keyboards/lily58/lib/layer_state_reader.c b/keyboards/lily58/lib/layer_state_reader.c
index 868d8e5cb4..68516c8df2 100644
--- a/keyboards/lily58/lib/layer_state_reader.c
+++ b/keyboards/lily58/lib/layer_state_reader.c
@@ -1,7 +1,6 @@
#include QMK_KEYBOARD_H
#include
-#include "lily58.h"
#define L_BASE 0
#define L_LOWER (1 << 1)
diff --git a/keyboards/lily58/lib/logo_reader.c b/keyboards/lily58/lib/logo_reader.c
index 9f8adb8466..039a538cc5 100644
--- a/keyboards/lily58/lib/logo_reader.c
+++ b/keyboards/lily58/lib/logo_reader.c
@@ -1,5 +1,3 @@
-#include "lily58.h"
-
const char *read_logo(void) {
static char logo[] = {
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
diff --git a/keyboards/lily58/lib/mode_icon_reader.c b/keyboards/lily58/lib/mode_icon_reader.c
index 27c6d92cd0..195ac71862 100644
--- a/keyboards/lily58/lib/mode_icon_reader.c
+++ b/keyboards/lily58/lib/mode_icon_reader.c
@@ -1,6 +1,5 @@
#include
#include
-#include "lily58.h"
char mode_icon[24];
diff --git a/keyboards/lily58/lib/timelogger.c b/keyboards/lily58/lib/timelogger.c
index b00c13cb0a..83fe9706dd 100644
--- a/keyboards/lily58/lib/timelogger.c
+++ b/keyboards/lily58/lib/timelogger.c
@@ -1,6 +1,5 @@
#include
#include "timer.h"
-#include "lily58.h"
char timelog_str[24] = {};
int last_time = 0;
diff --git a/keyboards/lily58/light/light.c b/keyboards/lily58/light/light.c
deleted file mode 100644
index 57a0df93db..0000000000
--- a/keyboards/lily58/light/light.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-Copyright 2020 Ben Roesner (keycapsss.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 .
-*/
-
-#include "lily58.h"
-
diff --git a/keyboards/lily58/light/light.h b/keyboards/lily58/light/light.h
index 833ad13d00..5d873e04cc 100644
--- a/keyboards/lily58/light/light.h
+++ b/keyboards/lily58/light/light.h
@@ -1,7 +1,5 @@
#pragma once
-#include "lily58.h"
-
#include "quantum.h"
diff --git a/keyboards/lily58/lily58.c b/keyboards/lily58/lily58.c
deleted file mode 100644
index 6108d70b90..0000000000
--- a/keyboards/lily58/lily58.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lily58.h"
diff --git a/keyboards/lily58/lily58.h b/keyboards/lily58/lily58.h
deleted file mode 100644
index c082030032..0000000000
--- a/keyboards/lily58/lily58.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_lily58_rev1
- #include "rev1.h"
-#elif KEYBOARD_lily58_light
- #include "light.h"
-#elif KEYBOARD_lily58_glow_enc
- #include "glow_enc.h"
-#endif
diff --git a/keyboards/lily58/rev1/rev1.c b/keyboards/lily58/rev1/rev1.c
deleted file mode 100644
index 6108d70b90..0000000000
--- a/keyboards/lily58/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lily58.h"
diff --git a/keyboards/lily58/rev1/rev1.h b/keyboards/lily58/rev1/rev1.h
index 776df4825a..436f4e710e 100644
--- a/keyboards/lily58/rev1/rev1.h
+++ b/keyboards/lily58/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "lily58.h"
-
#include "quantum.h"
#ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/lime/lime.c b/keyboards/lime/lime.c
index 3f51811329..2a91587e57 100644
--- a/keyboards/lime/lime.c
+++ b/keyboards/lime/lime.c
@@ -1,4 +1,4 @@
-#include "lime.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
diff --git a/keyboards/lime/lime.h b/keyboards/lime/lime.h
deleted file mode 100644
index 97cee454bc..0000000000
--- a/keyboards/lime/lime.h
+++ /dev/null
@@ -1,21 +0,0 @@
- /* Copyright 2021 HellSingCoder
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef KEYBOARD_lime_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/lime/rev1/rev1.c b/keyboards/lime/rev1/rev1.c
index 4cc560623b..50c2e6dff6 100644
--- a/keyboards/lime/rev1/rev1.c
+++ b/keyboards/lime/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "lime.h"
+#include "rev1.h"
/* Encoders */
#ifdef ENCODER_ENABLE
diff --git a/keyboards/malevolti/lyra/lyra.c b/keyboards/malevolti/lyra/lyra.c
index cd8d7c2e8b..0bc9b6b20f 100644
--- a/keyboards/malevolti/lyra/lyra.c
+++ b/keyboards/malevolti/lyra/lyra.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "lyra.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
diff --git a/keyboards/malevolti/lyra/lyra.h b/keyboards/malevolti/lyra/lyra.h
deleted file mode 100644
index 941f292c93..0000000000
--- a/keyboards/malevolti/lyra/lyra.h
+++ /dev/null
@@ -1,23 +0,0 @@
- /* Copyright 2021 Domanic Calleja
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-
-#ifdef KEYBOARD_malevolti_lyra_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/malevolti/lyra/rev1/rev1.c b/keyboards/malevolti/lyra/rev1/rev1.c
deleted file mode 100644
index db31ea975c..0000000000
--- a/keyboards/malevolti/lyra/rev1/rev1.c
+++ /dev/null
@@ -1,19 +0,0 @@
- /* Copyright 2021 Domanic Calleja
- *
- * 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 .
- */
-
-#include "rev1.h"
-
-
diff --git a/keyboards/malevolti/lyra/rev1/rev1.h b/keyboards/malevolti/lyra/rev1/rev1.h
index 81b862c5c6..021350f106 100644
--- a/keyboards/malevolti/lyra/rev1/rev1.h
+++ b/keyboards/malevolti/lyra/rev1/rev1.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "lyra.h"
+#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/malevolti/superlyra/rev1/rev1.c b/keyboards/malevolti/superlyra/rev1/rev1.c
deleted file mode 100644
index 35b44aed16..0000000000
--- a/keyboards/malevolti/superlyra/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 Domanic Calleja
- *
- * 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 .
- */
-
-#include "rev1.h"
diff --git a/keyboards/malevolti/superlyra/rev1/rev1.h b/keyboards/malevolti/superlyra/rev1/rev1.h
index 8bc17d1173..fd3c819e11 100644
--- a/keyboards/malevolti/superlyra/rev1/rev1.h
+++ b/keyboards/malevolti/superlyra/rev1/rev1.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "superlyra.h"
+#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/malevolti/superlyra/superlyra.c b/keyboards/malevolti/superlyra/superlyra.c
deleted file mode 100644
index 045ec9a097..0000000000
--- a/keyboards/malevolti/superlyra/superlyra.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 Domanic Calleja
- *
- * 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 .
- */
-#include "superlyra.h"
-
diff --git a/keyboards/malevolti/superlyra/superlyra.h b/keyboards/malevolti/superlyra/superlyra.h
deleted file mode 100644
index b3c0f16daf..0000000000
--- a/keyboards/malevolti/superlyra/superlyra.h
+++ /dev/null
@@ -1,23 +0,0 @@
- /* Copyright 2021 Domanic Calleja
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-
-#ifdef KEYBOARD_malevolti_superlyra_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/maple_computing/ivy/ivy.c b/keyboards/maple_computing/ivy/ivy.c
deleted file mode 100644
index 007ef67253..0000000000
--- a/keyboards/maple_computing/ivy/ivy.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ivy.h"
diff --git a/keyboards/maple_computing/ivy/ivy.h b/keyboards/maple_computing/ivy/ivy.h
deleted file mode 100644
index 645c5e0ef7..0000000000
--- a/keyboards/maple_computing/ivy/ivy.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_maple_computing_ivy_rev1
- #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/maple_computing/ivy/rev1/rev1.c b/keyboards/maple_computing/ivy/rev1/rev1.c
deleted file mode 100644
index 007ef67253..0000000000
--- a/keyboards/maple_computing/ivy/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ivy.h"
diff --git a/keyboards/maple_computing/ivy/rev1/rev1.h b/keyboards/maple_computing/ivy/rev1/rev1.h
index ac338368ed..444224d2b6 100644
--- a/keyboards/maple_computing/ivy/rev1/rev1.h
+++ b/keyboards/maple_computing/ivy/rev1/rev1.h
@@ -1,6 +1,6 @@
#pragma once
-#include "ivy.h"
+#include "quantum.h"
#define LAYOUT( \
K00, \
diff --git a/keyboards/maple_computing/launchpad/launchpad.c b/keyboards/maple_computing/launchpad/launchpad.c
deleted file mode 100644
index cc2812a76c..0000000000
--- a/keyboards/maple_computing/launchpad/launchpad.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "launchpad.h"
diff --git a/keyboards/maple_computing/launchpad/launchpad.h b/keyboards/maple_computing/launchpad/launchpad.h
deleted file mode 100644
index f2a1b40588..0000000000
--- a/keyboards/maple_computing/launchpad/launchpad.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_maple_computing_launchpad_rev1)
-# include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.c b/keyboards/maple_computing/launchpad/rev1/rev1.c
deleted file mode 100644
index cc2812a76c..0000000000
--- a/keyboards/maple_computing/launchpad/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "launchpad.h"
diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.h b/keyboards/maple_computing/launchpad/rev1/rev1.h
index 2ea6e7e775..54d72d5e54 100644
--- a/keyboards/maple_computing/launchpad/rev1/rev1.h
+++ b/keyboards/maple_computing/launchpad/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "../launchpad.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/maple_computing/lets_split_eh/eh/eh.c b/keyboards/maple_computing/lets_split_eh/eh/eh.c
deleted file mode 100644
index d5a312085d..0000000000
--- a/keyboards/maple_computing/lets_split_eh/eh/eh.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lets_split_eh.h"
diff --git a/keyboards/maple_computing/lets_split_eh/eh/eh.h b/keyboards/maple_computing/lets_split_eh/eh/eh.h
index ff37229787..4b97256c1e 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/eh.h
+++ b/keyboards/maple_computing/lets_split_eh/eh/eh.h
@@ -1,7 +1,5 @@
#pragma once
-#include "lets_split_eh.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c b/keyboards/maple_computing/lets_split_eh/lets_split_eh.c
index 37075aa67d..37e8b3ab9b 100644
--- a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c
+++ b/keyboards/maple_computing/lets_split_eh/lets_split_eh.c
@@ -1,4 +1,4 @@
-#include "lets_split_eh.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.h b/keyboards/maple_computing/lets_split_eh/lets_split_eh.h
deleted file mode 100644
index aae072e0b6..0000000000
--- a/keyboards/maple_computing/lets_split_eh/lets_split_eh.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_maple_computing_lets_split_eh_eh
- #include "eh.h"
-#endif
diff --git a/keyboards/maple_computing/minidox/minidox.c b/keyboards/maple_computing/minidox/minidox.c
deleted file mode 100644
index b4bffbb3e4..0000000000
--- a/keyboards/maple_computing/minidox/minidox.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "minidox.h"
\ No newline at end of file
diff --git a/keyboards/maple_computing/minidox/minidox.h b/keyboards/maple_computing/minidox/minidox.h
deleted file mode 100644
index bae36b5560..0000000000
--- a/keyboards/maple_computing/minidox/minidox.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_maple_computing_minidox_rev1
- #include "rev1.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/maple_computing/minidox/rev1/rev1.c b/keyboards/maple_computing/minidox/rev1/rev1.c
deleted file mode 100644
index 72b473933e..0000000000
--- a/keyboards/maple_computing/minidox/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "minidox.h"
diff --git a/keyboards/maxipad/maxipad.c b/keyboards/maxipad/maxipad.c
deleted file mode 100644
index 44a0c2b742..0000000000
--- a/keyboards/maxipad/maxipad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-#include "maxipad.h"
\ No newline at end of file
diff --git a/keyboards/maxipad/maxipad.h b/keyboards/maxipad/maxipad.h
index e2a0805053..0442643dd0 100644
--- a/keyboards/maxipad/maxipad.h
+++ b/keyboards/maxipad/maxipad.h
@@ -19,12 +19,6 @@
#define ___ KC_NO
-#ifdef KEYBOARD_maxipad_promicro
- #include "promicro.h"
-#elif KEYBOARD_maxipad_teensy2
- #include "teensy2.h"
-#endif
-
/* This a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
diff --git a/keyboards/maxipad/promicro/promicro.c b/keyboards/maxipad/promicro/promicro.c
deleted file mode 100644
index 4ecd974645..0000000000
--- a/keyboards/maxipad/promicro/promicro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-#include "maxipad.h"
diff --git a/keyboards/maxipad/promicro/promicro.h b/keyboards/maxipad/promicro/promicro.h
deleted file mode 100644
index 8f1419c9d7..0000000000
--- a/keyboards/maxipad/promicro/promicro.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-#pragma once
-
-#include "maxipad.h"
-#include "quantum.h"
-
diff --git a/keyboards/maxipad/teensy2/teensy2.c b/keyboards/maxipad/teensy2/teensy2.c
deleted file mode 100644
index 4ecd974645..0000000000
--- a/keyboards/maxipad/teensy2/teensy2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-#include "maxipad.h"
diff --git a/keyboards/maxipad/teensy2/teensy2.h b/keyboards/maxipad/teensy2/teensy2.h
deleted file mode 100644
index acb213acc8..0000000000
--- a/keyboards/maxipad/teensy2/teensy2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019
- *
- * 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 .
- */
-#pragma once
-
-#include "maxipad.h"
-#include "quantum.h"
diff --git a/keyboards/mechkeys/mechmini/mechmini.c b/keyboards/mechkeys/mechmini/mechmini.c
deleted file mode 100644
index 46e29ba3e9..0000000000
--- a/keyboards/mechkeys/mechmini/mechmini.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2017 Luiz Ribeiro
- * Copyright 2018 TurboMech /u/TurboMech @A9entOran9e#6134
- * 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 .
-*/
-
-#include "mechmini.h"
diff --git a/keyboards/mechkeys/mechmini/mechmini.h b/keyboards/mechkeys/mechmini/mechmini.h
deleted file mode 100644
index 9420b3e161..0000000000
--- a/keyboards/mechkeys/mechmini/mechmini.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2017 Luiz Ribeiro
- * Copyright 2018 TurboMech /u/TurboMech @A9entOran9e#6134
- * 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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mechkeys_mechmini_v1)
-# include "v1.h"
-#elif defined(KEYBOARD_mechkeys_mechmini_v2)
-# include "v2.h"
-#endif
diff --git a/keyboards/mechkeys/mechmini/v1/v1.c b/keyboards/mechkeys/mechmini/v1/v1.c
deleted file mode 100644
index ba0e095209..0000000000
--- a/keyboards/mechkeys/mechmini/v1/v1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro
-
-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 .
-*/
-
-#include "v1.h"
diff --git a/keyboards/mechkeys/mechmini/v1/v1.h b/keyboards/mechkeys/mechmini/v1/v1.h
index 07d1e683f7..6991930d6f 100644
--- a/keyboards/mechkeys/mechmini/v1/v1.h
+++ b/keyboards/mechkeys/mechmini/v1/v1.h
@@ -17,7 +17,7 @@ along with this program. If not, see .
#pragma once
-#include "../mechmini.h"
+#include "quantum.h"
#define ___ KC_NO
diff --git a/keyboards/mechkeys/mechmini/v2/v2.c b/keyboards/mechkeys/mechmini/v2/v2.c
deleted file mode 100755
index caf7c6f0f2..0000000000
--- a/keyboards/mechkeys/mechmini/v2/v2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "v2.h"
diff --git a/keyboards/mechkeys/mechmini/v2/v2.h b/keyboards/mechkeys/mechmini/v2/v2.h
index a0a620675e..7e817ae9ab 100755
--- a/keyboards/mechkeys/mechmini/v2/v2.h
+++ b/keyboards/mechkeys/mechmini/v2/v2.h
@@ -15,7 +15,7 @@
#pragma once
-#include "../mechmini.h"
+#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/mechlovin/adelais/adelais.c b/keyboards/mechlovin/adelais/adelais.c
index da954bce04..5758bb7322 100644
--- a/keyboards/mechlovin/adelais/adelais.c
+++ b/keyboards/mechlovin/adelais/adelais.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "adelais.h"
+#include "quantum.h"
#ifdef RGBLIGHT_ENABLE
void keyboard_post_init_kb(void) {
diff --git a/keyboards/mechlovin/adelais/adelais.h b/keyboards/mechlovin/adelais/adelais.h
deleted file mode 100644
index 6c3980a090..0000000000
--- a/keyboards/mechlovin/adelais/adelais.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_mechlovin_adelais_rgb_led_rev1
- #include "rev1.h"
-#elif KEYBOARD_mechlovin_adelais_rgb_led_rev2
- #include "rev2.h"
-#elif KEYBOARD_mechlovin_adelais_rgb_led_rev3
- #include "rev3.h"
-#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev2
- #include "rev2.h"
-#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev3
- #include "rev3.h"
-#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev4
- #include "rev4.h"
-#elif KEYBOARD_mechlovin_adelais_standard_led_avr_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
index 490599c43a..a86b1e5dd5 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "adelais.h"
+#include "rev1.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
index 20b4b69114..78bca55b8e 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "adelais.h"
+#include "rev2.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/mechlovin/hannah60rgb/hannah60rgb.h b/keyboards/mechlovin/hannah60rgb/hannah60rgb.h
deleted file mode 100644
index 9944b12284..0000000000
--- a/keyboards/mechlovin/hannah60rgb/hannah60rgb.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Mechlovin
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mechlovin_hannah60rgb_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_mechlovin_hannah60rgb_rev2)
- #include "rev2.h"
-#endif
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
index b61ac10b14..d8bad04c4f 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
+++ b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "hannah60rgb.h"
+#include "rev1.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/mechlovin/hannah65/hannah65.c b/keyboards/mechlovin/hannah65/hannah65.c
deleted file mode 100644
index 92e0917ebe..0000000000
--- a/keyboards/mechlovin/hannah65/hannah65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * 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 .
- */
-
-#include "hannah65.h"
diff --git a/keyboards/mechlovin/hannah65/hannah65.h b/keyboards/mechlovin/hannah65/hannah65.h
deleted file mode 100644
index 99da5a2a1a..0000000000
--- a/keyboards/mechlovin/hannah65/hannah65.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mechlovin_hannah65_rev1)
-# include "rev1.h"
-#endif
\ No newline at end of file
diff --git a/keyboards/mechlovin/hannah910/hannah910.c b/keyboards/mechlovin/hannah910/hannah910.c
index fa5b04ea76..0208e16348 100644
--- a/keyboards/mechlovin/hannah910/hannah910.c
+++ b/keyboards/mechlovin/hannah910/hannah910.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "hannah910.h"
+#include "quantum.h"
void led_init_ports(void) {
setPinOutput(B2);
diff --git a/keyboards/mechlovin/hannah910/hannah910.h b/keyboards/mechlovin/hannah910/hannah910.h
deleted file mode 100644
index 2cc38d0690..0000000000
--- a/keyboards/mechlovin/hannah910/hannah910.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Mechlovin
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_mechlovin_hannah910_rev1
- #include "rev1.h"
-#elif KEYBOARD_mechlovin_hannah910_rev2
- #include "rev2.h"
-#elif KEYBOARD_mechlovin_hannah910_rev3
- #include "rev3.h"
-#endif
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c b/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c
deleted file mode 100644
index 632a595ece..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-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 .
-*/
-
-#include "cor65.h"
-
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c b/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c
deleted file mode 100644
index ffdf09db28..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-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 .
-*/
-
-#include "retro66.h"
-
diff --git a/keyboards/mechlovin/zed65/zed65.c b/keyboards/mechlovin/zed65/zed65.c
deleted file mode 100644
index 289c98d068..0000000000
--- a/keyboards/mechlovin/zed65/zed65.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-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 .
-*/
-
-#include "zed65.h"
diff --git a/keyboards/mechlovin/zed65/zed65.h b/keyboards/mechlovin/zed65/zed65.h
deleted file mode 100644
index 85bd4eb3d2..0000000000
--- a/keyboards/mechlovin/zed65/zed65.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2022 Mechlovin'
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_mechlovin_zed65_no_backlight_retro66
- #include "retro66.h"
-#elif KEYBOARD_mechlovin_zed65_no_backlight_wearhaus66
- #include "wearhaus66.h"
-#elif KEYBOARD_mechlovin_zed65_no_backlight_cor65
- #include "cor65.h"
-#elif KEYBOARD_mechlovin_zed65_mono_led
- #include "mono_led.h"
-#endif
diff --git a/keyboards/mechwild/obe/obe.h b/keyboards/mechwild/obe/obe.h
index b2b22b37e3..8c57aa283b 100644
--- a/keyboards/mechwild/obe/obe.h
+++ b/keyboards/mechwild/obe/obe.h
@@ -16,10 +16,6 @@
#pragma once
-//#ifdef KEYBOARD_mechwild_obe_eeprom
-//# include "eeprom.h"
-//#endif
-
#include "quantum.h"
/* This is a shortcut to help you visually see your layout.
diff --git a/keyboards/mino/hotswap/hotswap.c b/keyboards/mino/hotswap/hotswap.c
deleted file mode 100644
index 46f2f9aef0..0000000000
--- a/keyboards/mino/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 ShandonCodes
- *
- * 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 .
- */
-
-#include "hotswap.h"
diff --git a/keyboards/mino/mino.c b/keyboards/mino/mino.c
deleted file mode 100644
index dc9e6d9c01..0000000000
--- a/keyboards/mino/mino.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 ShandonCodes
- *
- * 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 .
- */
-#include "mino.h"
\ No newline at end of file
diff --git a/keyboards/mino/mino.h b/keyboards/mino/mino.h
deleted file mode 100644
index fa98480c27..0000000000
--- a/keyboards/mino/mino.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 ShandonCodes
- *
- * 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 .
- */
-
- #pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_mino_hotswap
-# include "hotswap.h"
-#endif
\ No newline at end of file
diff --git a/keyboards/mode/m80v1/m80h/m80h.c b/keyboards/mode/m80v1/m80h/m80h.c
deleted file mode 100644
index 6213a91363..0000000000
--- a/keyboards/mode/m80v1/m80h/m80h.c
+++ /dev/null
@@ -1,14 +0,0 @@
- /* Copyright 2020 Álvaro "Gondolindrim" Volpato
- *
- * 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.
- */
-
-#include "m80h.h"
diff --git a/keyboards/mode/m80v1/m80h/m80h.h b/keyboards/mode/m80v1/m80h/m80h.h
index 49f115fdc6..87867de6b4 100644
--- a/keyboards/mode/m80v1/m80h/m80h.h
+++ b/keyboards/mode/m80v1/m80h/m80h.h
@@ -13,7 +13,7 @@
#pragma once
-#include "m80v1.h"
+#include "quantum.h"
#define LAYOUT_tkl_ansi( \
K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K415, K114, K115, K116, \
diff --git a/keyboards/mode/m80v1/m80s/m80s.c b/keyboards/mode/m80v1/m80s/m80s.c
deleted file mode 100644
index 1f532d0ce4..0000000000
--- a/keyboards/mode/m80v1/m80s/m80s.c
+++ /dev/null
@@ -1,14 +0,0 @@
- /* Copyright 2020 Álvaro "Gondolindrim" Volpato
- *
- * 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.
- */
-
-#include "m80s.h"
diff --git a/keyboards/mode/m80v1/m80s/m80s.h b/keyboards/mode/m80v1/m80s/m80s.h
index b5d1e4dd06..e1a5f990ba 100644
--- a/keyboards/mode/m80v1/m80s/m80s.h
+++ b/keyboards/mode/m80v1/m80s/m80s.h
@@ -13,7 +13,7 @@
#pragma once
-#include "m80v1.h"
+#include "quantum.h"
#define LAYOUT_eighty_m80s( \
K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K415, K114, K115, K116, \
diff --git a/keyboards/mode/m80v1/m80v1.c b/keyboards/mode/m80v1/m80v1.c
deleted file mode 100644
index 225ed9cc8d..0000000000
--- a/keyboards/mode/m80v1/m80v1.c
+++ /dev/null
@@ -1,14 +0,0 @@
- /* Copyright 2020 Álvaro "Gondolindrim" Volpato
- *
- * 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.
- */
-
-#include "m80v1.h"
diff --git a/keyboards/mode/m80v1/m80v1.h b/keyboards/mode/m80v1/m80v1.h
deleted file mode 100644
index 704ea28439..0000000000
--- a/keyboards/mode/m80v1/m80v1.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mode_m80v1_m80h)
- #include "m80h.h"
-#elif defined(KEYBOARD_mode_m80v1_m80s)
- #include "m80s.h"
-#endif // Mode80 solderable "S" and hotswap "H" revisions
diff --git a/keyboards/mode/m80v2/m80v2.c b/keyboards/mode/m80v2/m80v2.c
deleted file mode 100644
index faad98b7a7..0000000000
--- a/keyboards/mode/m80v2/m80v2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright 2020 Álvaro "Gondolindrim" Volpato
-
-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 .
-*/
-
-#include "m80v2.h"
diff --git a/keyboards/mode/m80v2/m80v2.h b/keyboards/mode/m80v2/m80v2.h
deleted file mode 100644
index c00f148e62..0000000000
--- a/keyboards/mode/m80v2/m80v2.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 Álvaro "Gondolindrim" Volpato
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mode_m80v2_m80v2h)
- #include "m80v2h.h"
-#elif defined(KEYBOARD_mode_m80v2_m80v2s)
- #include "m80v2s.h"
-#endif
diff --git a/keyboards/mode/m80v2/m80v2h/m80v2h.c b/keyboards/mode/m80v2/m80v2h/m80v2h.c
deleted file mode 100644
index 0d4e533c30..0000000000
--- a/keyboards/mode/m80v2/m80v2h/m80v2h.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright 2020 Álvaro "Gondolindrim" Volpato
-
-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 .
-*/
-
-#include "m80v2h.h"
diff --git a/keyboards/mode/m80v2/m80v2h/m80v2h.h b/keyboards/mode/m80v2/m80v2h/m80v2h.h
index 28d1d2784c..cacf25b114 100644
--- a/keyboards/mode/m80v2/m80v2h/m80v2h.h
+++ b/keyboards/mode/m80v2/m80v2h/m80v2h.h
@@ -17,7 +17,7 @@ along with this program. If not, see .
#pragma once
-#include "m80v2.h"
+#include "quantum.h"
#define ___ KC_NO
diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.c b/keyboards/mode/m80v2/m80v2s/m80v2s.c
deleted file mode 100644
index 7be89b1288..0000000000
--- a/keyboards/mode/m80v2/m80v2s/m80v2s.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright 2020 Álvaro "Gondolindrim" Volpato
-
-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 .
-*/
-
-#include "m80v2s.h"
diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.h b/keyboards/mode/m80v2/m80v2s/m80v2s.h
index 440b54583a..88f38d8b05 100644
--- a/keyboards/mode/m80v2/m80v2s/m80v2s.h
+++ b/keyboards/mode/m80v2/m80v2s/m80v2s.h
@@ -17,7 +17,7 @@ along with this program. If not, see .
#pragma once
-#include "m80v2.h"
+#include "quantum.h"
#define ___ KC_NO
diff --git a/keyboards/montsinger/rebound/rebound.c b/keyboards/montsinger/rebound/rebound.c
deleted file mode 100644
index fbb10be713..0000000000
--- a/keyboards/montsinger/rebound/rebound.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rebound.h"
diff --git a/keyboards/montsinger/rebound/rebound.h b/keyboards/montsinger/rebound/rebound.h
deleted file mode 100644
index 6bddfb2c3a..0000000000
--- a/keyboards/montsinger/rebound/rebound.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 Ross Montsinger
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_montsinger_rebound_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_montsinger_rebound_rev2)
- #include "rev2.h"
-#elif defined(KEYBOARD_montsinger_rebound_rev3)
- #include "rev3.h"
-#elif defined(KEYBOARD_montsinger_rebound_rev4)
- #include "rev4.h"
-#endif
diff --git a/keyboards/omkbd/ergodash/ergodash.c b/keyboards/omkbd/ergodash/ergodash.c
deleted file mode 100644
index 51e6dbf08f..0000000000
--- a/keyboards/omkbd/ergodash/ergodash.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ergodash.h"
diff --git a/keyboards/omkbd/ergodash/ergodash.h b/keyboards/omkbd/ergodash/ergodash.h
deleted file mode 100644
index 8c8bd3cdc3..0000000000
--- a/keyboards/omkbd/ergodash/ergodash.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_omkbd_ergodash_rev1
- #include "rev1.h"
-#endif // #ifdef KEYBOARD_ergodash_rev1
-
-#ifdef KEYBOARD_omkbd_ergodash_mini
- #include "mini.h"
-#endif
diff --git a/keyboards/omkbd/ergodash/mini/mini.c b/keyboards/omkbd/ergodash/mini/mini.c
index 3aa9e74cce..e4a1c429f8 100644
--- a/keyboards/omkbd/ergodash/mini/mini.c
+++ b/keyboards/omkbd/ergodash/mini/mini.c
@@ -1,4 +1,4 @@
-#include "ergodash.h"
+#include "mini.h"
#ifdef AUDIO_ENABLE
float tone_startup[][2] = SONG(STARTUP_SOUND);
diff --git a/keyboards/omkbd/ergodash/mini/mini.h b/keyboards/omkbd/ergodash/mini/mini.h
index e56cfb17a6..be69cce49b 100644
--- a/keyboards/omkbd/ergodash/mini/mini.h
+++ b/keyboards/omkbd/ergodash/mini/mini.h
@@ -1,7 +1,5 @@
#pragma once
-#include "ergodash.h"
-
#include "quantum.h"
#ifndef FLIP_HALF
diff --git a/keyboards/omkbd/ergodash/rev1/rev1.c b/keyboards/omkbd/ergodash/rev1/rev1.c
index 00f81cae11..eb794f9ac7 100644
--- a/keyboards/omkbd/ergodash/rev1/rev1.c
+++ b/keyboards/omkbd/ergodash/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "ergodash.h"
+#include "rev1.h"
#ifdef AUDIO_ENABLE
float tone_startup[][2] = SONG(STARTUP_SOUND);
diff --git a/keyboards/omkbd/ergodash/rev1/rev1.h b/keyboards/omkbd/ergodash/rev1/rev1.h
index 206c0c9bb9..4a1ee020e7 100644
--- a/keyboards/omkbd/ergodash/rev1/rev1.h
+++ b/keyboards/omkbd/ergodash/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "ergodash.h"
-
#include "quantum.h"
#define XXX KC_NO
diff --git a/keyboards/omkbd/runner3680/3x6/3x6.c b/keyboards/omkbd/runner3680/3x6/3x6.c
deleted file mode 100644
index 1f375c3ecb..0000000000
--- a/keyboards/omkbd/runner3680/3x6/3x6.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "3x6.h"
diff --git a/keyboards/omkbd/runner3680/3x6/3x6.h b/keyboards/omkbd/runner3680/3x6/3x6.h
index c197c6de2c..3d9fd779d8 100644
--- a/keyboards/omkbd/runner3680/3x6/3x6.h
+++ b/keyboards/omkbd/runner3680/3x6/3x6.h
@@ -1,7 +1,5 @@
#pragma once
-#include "runner3680.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/3x7/3x7.c b/keyboards/omkbd/runner3680/3x7/3x7.c
deleted file mode 100644
index 5246953b58..0000000000
--- a/keyboards/omkbd/runner3680/3x7/3x7.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "3x7.h"
diff --git a/keyboards/omkbd/runner3680/3x7/3x7.h b/keyboards/omkbd/runner3680/3x7/3x7.h
index 2e07bc3b35..db11b19c52 100644
--- a/keyboards/omkbd/runner3680/3x7/3x7.h
+++ b/keyboards/omkbd/runner3680/3x7/3x7.h
@@ -1,7 +1,5 @@
#pragma once
-#include "runner3680.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/3x8/3x8.c b/keyboards/omkbd/runner3680/3x8/3x8.c
deleted file mode 100644
index 8ea77001c5..0000000000
--- a/keyboards/omkbd/runner3680/3x8/3x8.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "3x8.h"
diff --git a/keyboards/omkbd/runner3680/3x8/3x8.h b/keyboards/omkbd/runner3680/3x8/3x8.h
index c5856d0034..cd3b81d973 100644
--- a/keyboards/omkbd/runner3680/3x8/3x8.h
+++ b/keyboards/omkbd/runner3680/3x8/3x8.h
@@ -1,7 +1,5 @@
#pragma once
-#include "runner3680.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/4x6/4x6.c b/keyboards/omkbd/runner3680/4x6/4x6.c
deleted file mode 100644
index 5e68c1a9fa..0000000000
--- a/keyboards/omkbd/runner3680/4x6/4x6.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x6.h"
diff --git a/keyboards/omkbd/runner3680/4x6/4x6.h b/keyboards/omkbd/runner3680/4x6/4x6.h
index dfc3a977b7..26bcca6de5 100644
--- a/keyboards/omkbd/runner3680/4x6/4x6.h
+++ b/keyboards/omkbd/runner3680/4x6/4x6.h
@@ -1,7 +1,5 @@
#pragma once
-#include "runner3680.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/4x7/4x7.c b/keyboards/omkbd/runner3680/4x7/4x7.c
deleted file mode 100644
index 568fc2dacd..0000000000
--- a/keyboards/omkbd/runner3680/4x7/4x7.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x7.h"
diff --git a/keyboards/omkbd/runner3680/4x7/4x7.h b/keyboards/omkbd/runner3680/4x7/4x7.h
index 7bd43e1114..50fbe3a5ce 100644
--- a/keyboards/omkbd/runner3680/4x7/4x7.h
+++ b/keyboards/omkbd/runner3680/4x7/4x7.h
@@ -1,7 +1,5 @@
#pragma once
-#include "runner3680.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/4x8/4x8.c b/keyboards/omkbd/runner3680/4x8/4x8.c
deleted file mode 100644
index 2667548078..0000000000
--- a/keyboards/omkbd/runner3680/4x8/4x8.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x8.h"
diff --git a/keyboards/omkbd/runner3680/4x8/4x8.h b/keyboards/omkbd/runner3680/4x8/4x8.h
index bc95b439b0..08fed12164 100644
--- a/keyboards/omkbd/runner3680/4x8/4x8.h
+++ b/keyboards/omkbd/runner3680/4x8/4x8.h
@@ -1,7 +1,5 @@
#pragma once
-#include "runner3680.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/5x6/5x6.c b/keyboards/omkbd/runner3680/5x6/5x6.c
deleted file mode 100644
index 0e9d5481c4..0000000000
--- a/keyboards/omkbd/runner3680/5x6/5x6.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "5x6.h"
diff --git a/keyboards/omkbd/runner3680/5x6/5x6.h b/keyboards/omkbd/runner3680/5x6/5x6.h
index 5a6e70c209..8047894606 100644
--- a/keyboards/omkbd/runner3680/5x6/5x6.h
+++ b/keyboards/omkbd/runner3680/5x6/5x6.h
@@ -1,7 +1,5 @@
#pragma once
-#include "runner3680.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h
index afceac0a89..756f90db4b 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h
+++ b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h
@@ -16,8 +16,6 @@
#pragma once
-#include "runner3680.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/5x7/5x7.c b/keyboards/omkbd/runner3680/5x7/5x7.c
deleted file mode 100644
index aae28e450c..0000000000
--- a/keyboards/omkbd/runner3680/5x7/5x7.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "5x7.h"
diff --git a/keyboards/omkbd/runner3680/5x7/5x7.h b/keyboards/omkbd/runner3680/5x7/5x7.h
index 451ecf6cd4..1fe3397c97 100644
--- a/keyboards/omkbd/runner3680/5x7/5x7.h
+++ b/keyboards/omkbd/runner3680/5x7/5x7.h
@@ -1,7 +1,5 @@
#pragma once
-#include "runner3680.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/5x8/5x8.c b/keyboards/omkbd/runner3680/5x8/5x8.c
deleted file mode 100644
index 3958702572..0000000000
--- a/keyboards/omkbd/runner3680/5x8/5x8.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "5x8.h"
diff --git a/keyboards/omkbd/runner3680/5x8/5x8.h b/keyboards/omkbd/runner3680/5x8/5x8.h
index de53a0eb29..b21b14259d 100644
--- a/keyboards/omkbd/runner3680/5x8/5x8.h
+++ b/keyboards/omkbd/runner3680/5x8/5x8.h
@@ -1,7 +1,5 @@
#pragma once
-#include "runner3680.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/omkbd/runner3680/runner3680.c b/keyboards/omkbd/runner3680/runner3680.c
deleted file mode 100644
index 7d8362363b..0000000000
--- a/keyboards/omkbd/runner3680/runner3680.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "runner3680.h"
diff --git a/keyboards/omkbd/runner3680/runner3680.h b/keyboards/omkbd/runner3680/runner3680.h
deleted file mode 100644
index 59afecfcfa..0000000000
--- a/keyboards/omkbd/runner3680/runner3680.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_omkbd_runner3680_5x8
- #include "5x8.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_5x7
- #include "5x7.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_5x6
- #include "5x6.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_5x6_5x8
- #include "5x6_5x8.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_4x8
- #include "4x8.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_4x7
- #include "4x7.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_4x6
- #include "4x6.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_3x8
- #include "3x8.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_3x7
- #include "3x7.h"
-#endif
-
-#ifdef KEYBOARD_omkbd_runner3680_3x6
- #include "3x6.h"
-#endif
diff --git a/keyboards/orthodox/orthodox.c b/keyboards/orthodox/orthodox.c
deleted file mode 100644
index 0b366e9449..0000000000
--- a/keyboards/orthodox/orthodox.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "orthodox.h"
\ No newline at end of file
diff --git a/keyboards/orthodox/orthodox.h b/keyboards/orthodox/orthodox.h
deleted file mode 100644
index ebf13debb7..0000000000
--- a/keyboards/orthodox/orthodox.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_orthodox_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_orthodox_rev3
-#include "rev3.h"
-#endif
-#ifdef KEYBOARD_orthodox_rev3_teensy
-#include "rev3_teensy.h"
-#endif
diff --git a/keyboards/orthodox/rev1/rev1.c b/keyboards/orthodox/rev1/rev1.c
index 49deba4dbf..1101f4379b 100644
--- a/keyboards/orthodox/rev1/rev1.c
+++ b/keyboards/orthodox/rev1/rev1.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "orthodox.h"
+#include "rev1.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/orthodox/rev1/rev1.h b/keyboards/orthodox/rev1/rev1.h
index d9d0b78dfc..328cb46cc1 100644
--- a/keyboards/orthodox/rev1/rev1.h
+++ b/keyboards/orthodox/rev1/rev1.h
@@ -21,8 +21,6 @@ along with this program. If not, see .
#pragma once
-#include "orthodox.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/orthodox/rev3/rev3.c b/keyboards/orthodox/rev3/rev3.c
index 49deba4dbf..79af5cd668 100644
--- a/keyboards/orthodox/rev3/rev3.c
+++ b/keyboards/orthodox/rev3/rev3.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "orthodox.h"
+#include "rev3.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/orthodox/rev3/rev3.h b/keyboards/orthodox/rev3/rev3.h
index d9d0b78dfc..328cb46cc1 100644
--- a/keyboards/orthodox/rev3/rev3.h
+++ b/keyboards/orthodox/rev3/rev3.h
@@ -21,8 +21,6 @@ along with this program. If not, see .
#pragma once
-#include "orthodox.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.c b/keyboards/orthodox/rev3_teensy/rev3_teensy.c
index 49deba4dbf..9faf94fd9a 100644
--- a/keyboards/orthodox/rev3_teensy/rev3_teensy.c
+++ b/keyboards/orthodox/rev3_teensy/rev3_teensy.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "orthodox.h"
+#include "rev3_teensy.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.h b/keyboards/orthodox/rev3_teensy/rev3_teensy.h
index d9d0b78dfc..328cb46cc1 100644
--- a/keyboards/orthodox/rev3_teensy/rev3_teensy.h
+++ b/keyboards/orthodox/rev3_teensy/rev3_teensy.h
@@ -21,8 +21,6 @@ along with this program. If not, see .
#pragma once
-#include "orthodox.h"
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/peej/rosaline/config.h b/keyboards/peej/rosaline/config.h
index 265558e515..18505def82 100644
--- a/keyboards/peej/rosaline/config.h
+++ b/keyboards/peej/rosaline/config.h
@@ -17,3 +17,6 @@
#pragma once
#define USB_MAX_POWER_CONSUMPTION 100
+
+#define LED1 C5
+#define LED2 C4
diff --git a/keyboards/peej/rosaline/ortho/ortho.h b/keyboards/peej/rosaline/ortho/ortho.h
index b3287784c3..30beb92831 100644
--- a/keyboards/peej/rosaline/ortho/ortho.h
+++ b/keyboards/peej/rosaline/ortho/ortho.h
@@ -16,7 +16,7 @@
#pragma once
-#include "rosaline.h"
+#include "quantum.h"
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
@@ -36,6 +36,8 @@
* └───────┘ └───────┘
*/
+#define XXX KC_NO
+
#define LAYOUT_ortho_4x15( \
k00, k40, k01, k41, k02, k42, k03, k43, k04, k44, k05, k45, k06, k46, k07, \
k10, k50, k11, k51, k12, k52, k13, k53, k14, k54, k15, k55, k16, k56, k17, \
@@ -52,6 +54,3 @@
{ k60, k61, k62, k63, k64, k65, k66, XXX }, \
{ k70, k71, k72, k73, k74, k75, k76, XXX } \
}
-
-#define LED1 C5
-#define LED2 C4
diff --git a/keyboards/peej/rosaline/rosaline.c b/keyboards/peej/rosaline/rosaline.c
index 57141e8064..df0594da44 100644
--- a/keyboards/peej/rosaline/rosaline.c
+++ b/keyboards/peej/rosaline/rosaline.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "rosaline.h"
+#include "quantum.h"
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
writePin(LED1, record->event.pressed);
diff --git a/keyboards/peej/rosaline/rosaline.h b/keyboards/peej/rosaline/rosaline.h
deleted file mode 100644
index 22125f3188..0000000000
--- a/keyboards/peej/rosaline/rosaline.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#if defined(KEYBOARD_peej_rosaline_staggered)
- #include "staggered.h"
-#elif defined(KEYBOARD_peej_rosaline_ortho)
- #include "ortho.h"
-#endif
-
-#define LED1 C5
-#define LED2 C4
diff --git a/keyboards/peej/rosaline/staggered/staggered.h b/keyboards/peej/rosaline/staggered/staggered.h
index cc2703c834..98186320a5 100644
--- a/keyboards/peej/rosaline/staggered/staggered.h
+++ b/keyboards/peej/rosaline/staggered/staggered.h
@@ -16,7 +16,7 @@
#pragma once
-#include "rosaline.h"
+#include "quantum.h"
/*
* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
@@ -36,6 +36,8 @@
* └──────────┴───┴────────┴───┘
*/
+#define XXX KC_NO
+
#define LAYOUT_all( \
k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k06, k16, k07, k17, \
k20, k11, k21, k22, k32, k23, k33, k24, k15, k25, k26, k36, k27, \
@@ -52,6 +54,3 @@
{ XXX, XXX, XXX, XXX, XXX, k65, k66, k67 }, \
{ XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
}
-
-#define LED1 C5
-#define LED2 C4
diff --git a/keyboards/pico/65keys/65keys.c b/keyboards/pico/65keys/65keys.c
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/pico/65keys/65keys.h b/keyboards/pico/65keys/65keys.h
index 61e32efd2c..444d8d2ee5 100644
--- a/keyboards/pico/65keys/65keys.h
+++ b/keyboards/pico/65keys/65keys.h
@@ -1,6 +1,5 @@
#pragma once
-#include "pico.h"
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/pico/70keys/70keys.c b/keyboards/pico/70keys/70keys.c
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/pico/70keys/70keys.h b/keyboards/pico/70keys/70keys.h
index 67f7161ca5..6235d8e136 100644
--- a/keyboards/pico/70keys/70keys.h
+++ b/keyboards/pico/70keys/70keys.h
@@ -1,6 +1,5 @@
#pragma once
-#include "pico.h"
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/pico/pico.c b/keyboards/pico/pico.c
deleted file mode 100644
index 7a7a7a6457..0000000000
--- a/keyboards/pico/pico.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kumao Kobo
- *
- * 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 .
- */
-#include "pico.h"
diff --git a/keyboards/pico/pico.h b/keyboards/pico/pico.h
deleted file mode 100644
index 72024efd80..0000000000
--- a/keyboards/pico/pico.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Kumao Kobo
- *
- * 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 .
- */
-
-#pragma once
-
-#ifdef KEYBOARD_pico_65keys
- #include "65keys.h"
-#endif
-#ifdef KEYBOARD_pico_70keys
- #include "70keys.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/pinky/3/3.c b/keyboards/pinky/3/3.c
deleted file mode 100644
index 200510d0aa..0000000000
--- a/keyboards/pinky/3/3.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "pinky.h"
diff --git a/keyboards/pinky/3/3.h b/keyboards/pinky/3/3.h
index 64d61f760d..f492646176 100644
--- a/keyboards/pinky/3/3.h
+++ b/keyboards/pinky/3/3.h
@@ -1,7 +1,5 @@
#pragma once
-#include "../pinky.h"
-
#include "quantum.h"
#define LAYOUT_split_3x7_4( \
diff --git a/keyboards/pinky/4/4.c b/keyboards/pinky/4/4.c
deleted file mode 100644
index 200510d0aa..0000000000
--- a/keyboards/pinky/4/4.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "pinky.h"
diff --git a/keyboards/pinky/4/4.h b/keyboards/pinky/4/4.h
index 50e31702f9..381ce82bce 100644
--- a/keyboards/pinky/4/4.h
+++ b/keyboards/pinky/4/4.h
@@ -1,7 +1,5 @@
#pragma once
-#include "../pinky.h"
-
#include "quantum.h"
#define LAYOUT_split_4x7_4( \
diff --git a/keyboards/pinky/pinky.c b/keyboards/pinky/pinky.c
deleted file mode 100644
index aa873c7a72..0000000000
--- a/keyboards/pinky/pinky.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 'Masayuki Sunahara'
- *
- * 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 .
- */
-#include "pinky.h"
diff --git a/keyboards/pinky/pinky.h b/keyboards/pinky/pinky.h
deleted file mode 100644
index 67dfbe3370..0000000000
--- a/keyboards/pinky/pinky.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2018 'Masayuki Sunahara'
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_pinky_3)
-# include "3.h"
-#elif defined(KEYBOARD_pinky_4)
-# include "4.h"
-#endif
diff --git a/keyboards/ploopyco/trackball/rev1/rev1.h b/keyboards/ploopyco/trackball/rev1/rev1.h
deleted file mode 100644
index a82c20a116..0000000000
--- a/keyboards/ploopyco/trackball/rev1/rev1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna)
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * 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 .
- */
-
-#pragma once
-
-#include "trackball.h"
diff --git a/keyboards/ploopyco/trackball/rev1_005/rev1_005.h b/keyboards/ploopyco/trackball/rev1_005/rev1_005.h
deleted file mode 100644
index a82c20a116..0000000000
--- a/keyboards/ploopyco/trackball/rev1_005/rev1_005.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna)
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * 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 .
- */
-
-#pragma once
-
-#include "trackball.h"
diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/trackball/trackball.h
index 4cdae526aa..f4516222e0 100644
--- a/keyboards/ploopyco/trackball/trackball.h
+++ b/keyboards/ploopyco/trackball/trackball.h
@@ -21,11 +21,6 @@
#include "quantum.h"
#include "analog.h"
#include "opt_encoder.h"
-#if defined(KEYBOARD_ploopyco_trackball_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_ploopyco_trackball_rev1_005)
-# include "rev1_005.h"
-#endif
// Sensor defs
#define OPT_ENC1 F0
diff --git a/keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h
deleted file mode 100644
index 4f34e17dd4..0000000000
--- a/keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna)
- * Copyright 2019 Sunjun Kim
- * Copyright 2019 Hiroyuki Okada
- *
- * 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 .
- */
-
-#pragma once
-
-#include "trackball_mini.h"
diff --git a/keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h b/keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h
deleted file mode 100644
index 4f34e17dd4..0000000000
--- a/keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna)
- * Copyright 2019 Sunjun Kim
- * Copyright 2019 Hiroyuki Okada
- *
- * 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 .
- */
-
-#pragma once
-
-#include "trackball_mini.h"
diff --git a/keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h
deleted file mode 100644
index 4f34e17dd4..0000000000
--- a/keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna)
- * Copyright 2019 Sunjun Kim
- * Copyright 2019 Hiroyuki Okada
- *
- * 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 .
- */
-
-#pragma once
-
-#include "trackball_mini.h"
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h
deleted file mode 100644
index f43818665c..0000000000
--- a/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna)
- * Copyright 2019 Sunjun Kim
- *
- * 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 .
- */
-
-#pragma once
-
-#include "trackball_thumb.h"
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
index 356b8902db..8ee17634f1 100644
--- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
@@ -21,9 +21,6 @@
#include "quantum.h"
#include "analog.h"
#include "opt_encoder.h"
-#if defined(KEYBOARD_ploopyco_trackball_thumb_rev1_001)
-# include "rev1_001.h"
-#endif
// Sensor defs
#define OPT_ENC1 F4
diff --git a/keyboards/primekb/prime_l/prime_l.c b/keyboards/primekb/prime_l/prime_l.c
deleted file mode 100644
index 5a7a0a1008..0000000000
--- a/keyboards/primekb/prime_l/prime_l.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat
- * Copyright 2020 Holten Campbell
- *
- * 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 .
- */
-#include "prime_l.h"
\ No newline at end of file
diff --git a/keyboards/primekb/prime_l/prime_l.h b/keyboards/primekb/prime_l/prime_l.h
deleted file mode 100644
index 10b587b6a0..0000000000
--- a/keyboards/primekb/prime_l/prime_l.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat
- * Copyright 2020 Holten Campbell
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_primekb_prime_l_v1)
- #include "v1.h"
-#elif defined(KEYBOARD_primekb_prime_l_v2)
- #include "v2.h"
-#endif
diff --git a/keyboards/primekb/prime_l/v1/v1.h b/keyboards/primekb/prime_l/v1/v1.h
index bb82bacf5b..4ee291679f 100644
--- a/keyboards/primekb/prime_l/v1/v1.h
+++ b/keyboards/primekb/prime_l/v1/v1.h
@@ -16,7 +16,7 @@
#pragma once
-#include "prime_l.h"
+#include "quantum.h"
#define LAYOUT( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
diff --git a/keyboards/primekb/prime_l/v2/v2.h b/keyboards/primekb/prime_l/v2/v2.h
index ebac56e76c..b0924d5d79 100644
--- a/keyboards/primekb/prime_l/v2/v2.h
+++ b/keyboards/primekb/prime_l/v2/v2.h
@@ -16,7 +16,7 @@
#pragma once
-#include "prime_l.h"
+#include "quantum.h"
#define LAYOUT( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
diff --git a/keyboards/program_yoink/ortho/ortho.c b/keyboards/program_yoink/ortho/ortho.c
deleted file mode 100644
index a8e1b732a9..0000000000
--- a/keyboards/program_yoink/ortho/ortho.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * 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 .
- */
-
-#include "ortho.h"
diff --git a/keyboards/program_yoink/ortho/ortho.h b/keyboards/program_yoink/ortho/ortho.h
index 964c0e363b..e847f16edc 100644
--- a/keyboards/program_yoink/ortho/ortho.h
+++ b/keyboards/program_yoink/ortho/ortho.h
@@ -16,7 +16,7 @@
#pragma once
-#include "program_yoink.h"
+#include "quantum.h"
/* This is a shortcut to help you visually see your layout.
*
diff --git a/keyboards/program_yoink/program_yoink.c b/keyboards/program_yoink/program_yoink.c
index 7733aa2ad5..d1373a5283 100644
--- a/keyboards/program_yoink/program_yoink.c
+++ b/keyboards/program_yoink/program_yoink.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "program_yoink.h"
+#include "quantum.h"
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) return false;
diff --git a/keyboards/program_yoink/program_yoink.h b/keyboards/program_yoink/program_yoink.h
deleted file mode 100644
index d6a1d33b53..0000000000
--- a/keyboards/program_yoink/program_yoink.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_program_yoink_staggered)
- #include "staggered.h"
-#elif defined(KEYBOARD_program_yoink_ortho)
- #include "ortho.h"
-#endif
diff --git a/keyboards/program_yoink/staggered/staggered.c b/keyboards/program_yoink/staggered/staggered.c
deleted file mode 100644
index 1bdb4a2162..0000000000
--- a/keyboards/program_yoink/staggered/staggered.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * 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 .
- */
-
-#include "staggered.h"
diff --git a/keyboards/program_yoink/staggered/staggered.h b/keyboards/program_yoink/staggered/staggered.h
index 1b35e28da7..15def50979 100644
--- a/keyboards/program_yoink/staggered/staggered.h
+++ b/keyboards/program_yoink/staggered/staggered.h
@@ -16,7 +16,7 @@
#pragma once
-#include "program_yoink.h"
+#include "quantum.h"
/* This is a shortcut to help you visually see your layout.
*
diff --git a/keyboards/qwertyydox/qwertyydox.c b/keyboards/qwertyydox/qwertyydox.c
deleted file mode 100644
index 53c3eca648..0000000000
--- a/keyboards/qwertyydox/qwertyydox.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "qwertyydox.h"
diff --git a/keyboards/qwertyydox/qwertyydox.h b/keyboards/qwertyydox/qwertyydox.h
deleted file mode 100644
index 9eb4073dfe..0000000000
--- a/keyboards/qwertyydox/qwertyydox.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_qwertyydox_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/qwertyydox/rev1/rev1.c b/keyboards/qwertyydox/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/qwertyydox/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/qwertyydox/rev1/rev1.h b/keyboards/qwertyydox/rev1/rev1.h
index 22fc412a8b..d1c5588606 100644
--- a/keyboards/qwertyydox/rev1/rev1.h
+++ b/keyboards/qwertyydox/rev1/rev1.h
@@ -1,6 +1,6 @@
#pragma once
-#include "qwertyydox.h"
+#include "quantum.h"
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
diff --git a/keyboards/rate/pistachio/pistachio.c b/keyboards/rate/pistachio/pistachio.c
deleted file mode 100644
index 2a850f64a4..0000000000
--- a/keyboards/rate/pistachio/pistachio.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 rate
- *
- * 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 .
- */
-
-#include "pistachio.h"
-
diff --git a/keyboards/rate/pistachio/pistachio.h b/keyboards/rate/pistachio/pistachio.h
deleted file mode 100644
index 7bf2c59ad6..0000000000
--- a/keyboards/rate/pistachio/pistachio.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 rate
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_rate_pistachio_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_rate_pistachio_rev2)
-# include "rev2.h"
-#endif
diff --git a/keyboards/rate/pistachio/rev1/rev1.c b/keyboards/rate/pistachio/rev1/rev1.c
deleted file mode 100644
index 5824157f53..0000000000
--- a/keyboards/rate/pistachio/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 rate
-
-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 .
-*/
-
-#include "rev1.h"
diff --git a/keyboards/rate/pistachio/rev2/rev2.c b/keyboards/rate/pistachio/rev2/rev2.c
deleted file mode 100644
index c6e64a526d..0000000000
--- a/keyboards/rate/pistachio/rev2/rev2.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 rate
-
-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 .
-*/
-
-
-#include "rev2.h"
diff --git a/keyboards/recompile_keys/nomu30/nomu30.c b/keyboards/recompile_keys/nomu30/nomu30.c
deleted file mode 100644
index 37a8614c11..0000000000
--- a/keyboards/recompile_keys/nomu30/nomu30.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Naoto Takai
- *
- * 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 .
- */
-#include "nomu30.h"
diff --git a/keyboards/recompile_keys/nomu30/nomu30.h b/keyboards/recompile_keys/nomu30/nomu30.h
index 964eb2a65f..1b33c17be1 100644
--- a/keyboards/recompile_keys/nomu30/nomu30.h
+++ b/keyboards/recompile_keys/nomu30/nomu30.h
@@ -16,11 +16,6 @@
#pragma once
#include "quantum.h"
-#ifdef KEYBOARD_recompile_keys_nomu30_rev1
- #include "rev1.h"
-#elif KEYBOARD_recompile_keys_nomu30_rev2
- #include "rev2.h"
-#endif
#define LAYOUT( \
K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
diff --git a/keyboards/recompile_keys/nomu30/rev1/rev1.c b/keyboards/recompile_keys/nomu30/rev1/rev1.c
deleted file mode 100644
index 8adf9859f8..0000000000
--- a/keyboards/recompile_keys/nomu30/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * 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 .
- */
-
-#include "rev1.h"
diff --git a/keyboards/recompile_keys/nomu30/rev1/rev1.h b/keyboards/recompile_keys/nomu30/rev1/rev1.h
deleted file mode 100644
index fa161f267e..0000000000
--- a/keyboards/recompile_keys/nomu30/rev1/rev1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/recompile_keys/nomu30/rev2/rev2.c b/keyboards/recompile_keys/nomu30/rev2/rev2.c
deleted file mode 100644
index 5eabb33ac6..0000000000
--- a/keyboards/recompile_keys/nomu30/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * 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 .
- */
-
-#include "rev2.h"
diff --git a/keyboards/recompile_keys/nomu30/rev2/rev2.h b/keyboards/recompile_keys/nomu30/rev2/rev2.h
deleted file mode 100644
index fa161f267e..0000000000
--- a/keyboards/recompile_keys/nomu30/rev2/rev2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/redox/redox.c b/keyboards/redox/redox.c
deleted file mode 100644
index 7fa3545a47..0000000000
--- a/keyboards/redox/redox.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * 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 .
- */
-#include "redox.h"
diff --git a/keyboards/redox/redox.h b/keyboards/redox/redox.h
deleted file mode 100644
index 4160096b28..0000000000
--- a/keyboards/redox/redox.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * 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 .
- */
-
-#pragma once
-
-#if defined(KEYBOARD_redox_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_redox_media)
-# include "media.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/redox/rev1/proton_c/proton_c.c b/keyboards/redox/rev1/proton_c/proton_c.c
deleted file mode 100644
index 796e2c8c3d..0000000000
--- a/keyboards/redox/rev1/proton_c/proton_c.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 xerootg
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "proton_c.h"
diff --git a/keyboards/redox/rev1/proton_c/proton_c.h b/keyboards/redox/rev1/proton_c/proton_c.h
deleted file mode 100644
index d8813d9c4d..0000000000
--- a/keyboards/redox/rev1/proton_c/proton_c.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 xerootg
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "rev1.h"
diff --git a/keyboards/redox/rev1/rev1.c b/keyboards/redox/rev1/rev1.c
deleted file mode 100644
index b1ab15df32..0000000000
--- a/keyboards/redox/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "redox.h"
diff --git a/keyboards/redox/rev1/rev1.h b/keyboards/redox/rev1/rev1.h
index a3253e9411..4ad423d897 100644
--- a/keyboards/redox/rev1/rev1.h
+++ b/keyboards/redox/rev1/rev1.h
@@ -1,11 +1,5 @@
#pragma once
-#include "redox.h"
-
-#if defined(KEYBOARD_redox_rev1_proton_c)
-# include "proton_c.h"
-#endif
-
#include "quantum.h"
#define LAYOUT( \
diff --git a/keyboards/rgbkb/sol/rev1/rev1.h b/keyboards/rgbkb/sol/rev1/rev1.h
deleted file mode 100644
index 6f70f09bee..0000000000
--- a/keyboards/rgbkb/sol/rev1/rev1.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/rgbkb/sol/rev2/rev2.h b/keyboards/rgbkb/sol/rev2/rev2.h
deleted file mode 100644
index 6f70f09bee..0000000000
--- a/keyboards/rgbkb/sol/rev2/rev2.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/rgbkb/sol/sol.c b/keyboards/rgbkb/sol/sol.c
deleted file mode 100644
index 5945cc60a4..0000000000
--- a/keyboards/rgbkb/sol/sol.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "sol.h"
diff --git a/keyboards/rgbkb/sol/sol.h b/keyboards/rgbkb/sol/sol.h
index e885dc78c4..695dc6db61 100644
--- a/keyboards/rgbkb/sol/sol.h
+++ b/keyboards/rgbkb/sol/sol.h
@@ -1,12 +1,6 @@
#pragma once
#include "quantum.h"
-#ifdef KEYBOARD_rgbkb_sol_rev1
-#include "rev1.h"
-#else
-#include "rev2.h"
-#endif
-
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, L06, R06, R00, R01, R02, R03, R04, R05, \
diff --git a/keyboards/rura66/rev1/rev1.c b/keyboards/rura66/rev1/rev1.c
index f42bdad44b..d1b6a4ff6a 100644
--- a/keyboards/rura66/rev1/rev1.c
+++ b/keyboards/rura66/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "rura66.h"
+#include "rev1.h"
bool is_mac_mode(void) {
return keymap_config.swap_lalt_lgui == false;
diff --git a/keyboards/rura66/rura66.c b/keyboards/rura66/rura66.c
deleted file mode 100644
index 641643ef25..0000000000
--- a/keyboards/rura66/rura66.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2021 T.Shinohara
- *
- * 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 .
- */
-#include "rura66.h"
diff --git a/keyboards/rura66/rura66.h b/keyboards/rura66/rura66.h
deleted file mode 100644
index 9df9980b82..0000000000
--- a/keyboards/rura66/rura66.h
+++ /dev/null
@@ -1,22 +0,0 @@
- /* Copyright 2021 T.Shinohara
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-#if defined(KEYBOARD_rura66_rev1)
-# include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/7skb/7skb.c b/keyboards/salicylic_acid3/7skb/7skb.c
deleted file mode 100644
index 3044e02233..0000000000
--- a/keyboards/salicylic_acid3/7skb/7skb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "7skb.h"
diff --git a/keyboards/salicylic_acid3/7skb/7skb.h b/keyboards/salicylic_acid3/7skb/7skb.h
deleted file mode 100644
index 5043a46747..0000000000
--- a/keyboards/salicylic_acid3/7skb/7skb.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_7skb_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/7skb/rev1/rev1.c b/keyboards/salicylic_acid3/7skb/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/salicylic_acid3/7skb/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/salicylic_acid3/7skb/rev1/rev1.h b/keyboards/salicylic_acid3/7skb/rev1/rev1.h
index 8ab845240d..d523bf96e5 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/7skb/rev1/rev1.h
@@ -1,7 +1,5 @@
#pragma once
-#include "7skb.h"
-
#include "quantum.h"
//////////////////////////////////////////////////////////////////////////////
diff --git a/keyboards/salicylic_acid3/getta25/getta25.c b/keyboards/salicylic_acid3/getta25/getta25.c
deleted file mode 100644
index 4f8cc63b42..0000000000
--- a/keyboards/salicylic_acid3/getta25/getta25.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "getta25.h"
diff --git a/keyboards/salicylic_acid3/getta25/getta25.h b/keyboards/salicylic_acid3/getta25/getta25.h
deleted file mode 100644
index 67632bba4d..0000000000
--- a/keyboards/salicylic_acid3/getta25/getta25.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_getta25_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/getta25/rev1/rev1.c b/keyboards/salicylic_acid3/getta25/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/salicylic_acid3/getta25/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/salicylic_acid3/getta25/rev1/rev1.h b/keyboards/salicylic_acid3/getta25/rev1/rev1.h
index 98f4318a6a..f2c5b9b8ed 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/getta25/rev1/rev1.h
@@ -1,6 +1,6 @@
#pragma once
-#include "getta25.h"
+#include "quantum.h"
/*
* ,-----------------------.
diff --git a/keyboards/salicylic_acid3/jisplit89/jisplit89.c b/keyboards/salicylic_acid3/jisplit89/jisplit89.c
deleted file mode 100644
index 0f03aa4ce2..0000000000
--- a/keyboards/salicylic_acid3/jisplit89/jisplit89.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Salicylic_Acid
-
-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 .
-*/
-
-#include "jisplit89.h"
diff --git a/keyboards/salicylic_acid3/jisplit89/jisplit89.h b/keyboards/salicylic_acid3/jisplit89/jisplit89.h
deleted file mode 100644
index 8de2326de6..0000000000
--- a/keyboards/salicylic_acid3/jisplit89/jisplit89.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2020 Salicylic_Acid
-
-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 .
-*/
-
-#pragma once
-
-#ifdef KEYBOARD_salicylic_acid3_jisplit89_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c
deleted file mode 100644
index 13e201e63a..0000000000
--- a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Salicylic_Acid
-
-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 .
-*/
-
-#include "rev1.h"
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h
index 71515f5ef6..7a1887dc2d 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h
@@ -17,8 +17,6 @@ along with this program. If not, see .
#pragma once
-#include "jisplit89.h"
-
#include "quantum.h"
/*
diff --git a/keyboards/salicylic_acid3/naked48/naked48.c b/keyboards/salicylic_acid3/naked48/naked48.c
deleted file mode 100644
index c2a10ed3e6..0000000000
--- a/keyboards/salicylic_acid3/naked48/naked48.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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 .
-*/
-
-#include "naked48.h"
diff --git a/keyboards/salicylic_acid3/naked48/naked48.h b/keyboards/salicylic_acid3/naked48/naked48.h
deleted file mode 100644
index bbfa6d2e84..0000000000
--- a/keyboards/salicylic_acid3/naked48/naked48.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_naked48_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.c b/keyboards/salicylic_acid3/naked48/rev1/rev1.c
index 0129b6c1a3..5c9d8035c0 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/rev1.c
+++ b/keyboards/salicylic_acid3/naked48/rev1/rev1.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "naked48.h"
+#include "rev1.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.h b/keyboards/salicylic_acid3/naked48/rev1/rev1.h
index dc35f89342..d43e9f4fb3 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/naked48/rev1/rev1.h
@@ -17,8 +17,6 @@ along with this program. If not, see .
#pragma once
-#include "naked48.h"
-
#include "quantum.h"
#ifdef RGBLIGHT_ENABLE
//rgb led driver
diff --git a/keyboards/salicylic_acid3/naked60/naked60.c b/keyboards/salicylic_acid3/naked60/naked60.c
deleted file mode 100644
index d1d46394f6..0000000000
--- a/keyboards/salicylic_acid3/naked60/naked60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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 .
-*/
-
-#include "naked60.h"
diff --git a/keyboards/salicylic_acid3/naked60/naked60.h b/keyboards/salicylic_acid3/naked60/naked60.h
deleted file mode 100644
index 9ad73df67f..0000000000
--- a/keyboards/salicylic_acid3/naked60/naked60.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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 .
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_naked60_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/naked60/rev1/rev1.c b/keyboards/salicylic_acid3/naked60/rev1/rev1.c
deleted file mode 100644
index d1d46394f6..0000000000
--- a/keyboards/salicylic_acid3/naked60/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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 .
-*/
-
-#include "naked60.h"
diff --git a/keyboards/salicylic_acid3/naked60/rev1/rev1.h b/keyboards/salicylic_acid3/naked60/rev1/rev1.h
index 12798022e9..fcb26d5fc2 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/naked60/rev1/rev1.h
@@ -17,8 +17,6 @@ along with this program. If not, see .
#pragma once
-#include "naked60.h"
-
#include "quantum.h"
diff --git a/keyboards/salicylic_acid3/naked64/naked64.c b/keyboards/salicylic_acid3/naked64/naked64.c
deleted file mode 100644
index a2863f0477..0000000000
--- a/keyboards/salicylic_acid3/naked64/naked64.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "naked64.h"
diff --git a/keyboards/salicylic_acid3/naked64/naked64.h b/keyboards/salicylic_acid3/naked64/naked64.h
deleted file mode 100644
index cb73e2142d..0000000000
--- a/keyboards/salicylic_acid3/naked64/naked64.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_naked64_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/naked64/rev1/rev1.c b/keyboards/salicylic_acid3/naked64/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/salicylic_acid3/naked64/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/salicylic_acid3/naked64/rev1/rev1.h b/keyboards/salicylic_acid3/naked64/rev1/rev1.h
index 0ac804ee0f..d8965556c7 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/naked64/rev1/rev1.h
@@ -1,6 +1,6 @@
#pragma once
-#include "naked64.h"
+#include "quantum.h"
//////////////////////////////////////////////////////////////////////////////
diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.h b/keyboards/salicylic_acid3/setta21/rev1/rev1.h
index 772c843c57..c309296049 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/setta21/rev1/rev1.h
@@ -1,6 +1,6 @@
#pragma once
-#include "setta21.h"
+#include "quantum.h"
#define LAYOUT_numpad_6x4( \
L05, L15, L25, L35, \
diff --git a/keyboards/salicylic_acid3/setta21/setta21.c b/keyboards/salicylic_acid3/setta21/setta21.c
deleted file mode 100644
index 73c07682f7..0000000000
--- a/keyboards/salicylic_acid3/setta21/setta21.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "setta21.h"
diff --git a/keyboards/salicylic_acid3/setta21/setta21.h b/keyboards/salicylic_acid3/setta21/setta21.h
deleted file mode 100644
index 9e5b17e2c3..0000000000
--- a/keyboards/salicylic_acid3/setta21/setta21.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_setta21_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/sofle/keyhive/keyhive.c b/keyboards/sofle/keyhive/keyhive.c
deleted file mode 100755
index 72e2d583f1..0000000000
--- a/keyboards/sofle/keyhive/keyhive.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright
- * 2021 solartempest
- * 2021 QMK
- *
- * 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 .
- */
-
-#include "keyhive.h"
diff --git a/keyboards/sofle/rev1/rev1.c b/keyboards/sofle/rev1/rev1.c
index 88a28e6a40..567f8301e3 100644
--- a/keyboards/sofle/rev1/rev1.c
+++ b/keyboards/sofle/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "sofle.h"
+#include "rev1.h"
#ifdef RGB_MATRIX_ENABLE
// Physical Layout
diff --git a/keyboards/sofle/sofle.c b/keyboards/sofle/sofle.c
index cdb8c1671a..bd3f3e157c 100644
--- a/keyboards/sofle/sofle.c
+++ b/keyboards/sofle/sofle.c
@@ -1,4 +1,4 @@
-#include "sofle.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
diff --git a/keyboards/sofle/sofle.h b/keyboards/sofle/sofle.h
deleted file mode 100644
index 90ee00bfd7..0000000000
--- a/keyboards/sofle/sofle.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_sofle_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_sofle_keyhive)
-# include "keyhive.h"
-#endif
diff --git a/keyboards/spacetime/rev1/rev1.c b/keyboards/spacetime/rev1/rev1.c
deleted file mode 100644
index b9942a3511..0000000000
--- a/keyboards/spacetime/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kyle Terry
- *
- * 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 .
- */
-#include "rev1.h"
diff --git a/keyboards/spacetime/spacetime.c b/keyboards/spacetime/spacetime.c
deleted file mode 100644
index 7db11f1bc4..0000000000
--- a/keyboards/spacetime/spacetime.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "spacetime.h"
diff --git a/keyboards/spacetime/spacetime.h b/keyboards/spacetime/spacetime.h
deleted file mode 100644
index 0235c2b254..0000000000
--- a/keyboards/spacetime/spacetime.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_spacetime_rev1
- #include "rev1.h"
-#endif
-
-#ifdef KEYBOARD_spacetime_rev2
- #include "rev2.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/splitkb/kyria/kyria.h b/keyboards/splitkb/kyria/kyria.h
deleted file mode 100644
index 9018220eba..0000000000
--- a/keyboards/splitkb/kyria/kyria.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 Thomas Baart
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_splitkb_kyria_rev1)
-# include "rev1.h"
-#endif
-#if defined(KEYBOARD_splitkb_kyria_rev2)
-# include "rev2.h"
-#endif
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.c b/keyboards/splitkb/kyria/rev1/proton_c/proton_c.c
deleted file mode 100644
index 628fabb2e5..0000000000
--- a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Thomas Baart
- *
- * 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 .
- */
-
-#include "proton_c.h"
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.h b/keyboards/splitkb/kyria/rev1/proton_c/proton_c.h
deleted file mode 100644
index 718f5636ff..0000000000
--- a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 Thomas Baart
- *
- * 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 .
- */
-
-#pragma once
-
-#include "rev1.h"
diff --git a/keyboards/splitkb/kyria/rev1/rev1.h b/keyboards/splitkb/kyria/rev1/rev1.h
index 8a5fbeb21d..9b5ea58ead 100644
--- a/keyboards/splitkb/kyria/rev1/rev1.h
+++ b/keyboards/splitkb/kyria/rev1/rev1.h
@@ -15,10 +15,7 @@
*/
#pragma once
-#include "kyria.h"
-#ifdef KEYBOARD_splitkb_kyria_rev1_proton_c
-# include "proton_c.h"
-#endif
+#include "quantum.h"
/* This a shortcut to help you visually see your layout.
*
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.c b/keyboards/splitkb/kyria/rev2/proton_c/proton_c.c
deleted file mode 100644
index 9c74b45f77..0000000000
--- a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Thomas Baart
- *
- * 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 .
- */
-
-#include "proton_c.h"
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.h b/keyboards/splitkb/kyria/rev2/proton_c/proton_c.h
deleted file mode 100644
index 143b9e39dd..0000000000
--- a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Thomas Baart
- *
- * 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 .
- */
-
-#pragma once
-
-#include "rev2.h"
diff --git a/keyboards/splitkb/kyria/rev2/rev2.h b/keyboards/splitkb/kyria/rev2/rev2.h
index ed4169b0ed..89d69abc9a 100644
--- a/keyboards/splitkb/kyria/rev2/rev2.h
+++ b/keyboards/splitkb/kyria/rev2/rev2.h
@@ -15,10 +15,7 @@
*/
#pragma once
-#include "kyria.h"
-#ifdef KEYBOARD_splitkb_kyria_rev2_proton_c
-# include "proton_c.h"
-#endif
+#include "quantum.h"
/* This a shortcut to help you visually see your layout.
*
diff --git a/keyboards/splitkb/kyria/rev3/rev3.c b/keyboards/splitkb/kyria/rev3/rev3.c
index 4ff592ef55..3dc5299377 100644
--- a/keyboards/splitkb/kyria/rev3/rev3.c
+++ b/keyboards/splitkb/kyria/rev3/rev3.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include QMK_KEYBOARD_H
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
// clang-format off
diff --git a/keyboards/splitty/rev1/rev1.c b/keyboards/splitty/rev1/rev1.c
deleted file mode 100644
index 0cf9a1d9c3..0000000000
--- a/keyboards/splitty/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Nicolas Schodet
- *
- * 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 .
- */
-
-#include "splitty.h"
diff --git a/keyboards/splitty/rev1/rev1.h b/keyboards/splitty/rev1/rev1.h
index 9205165730..7d9e9e09dc 100644
--- a/keyboards/splitty/rev1/rev1.h
+++ b/keyboards/splitty/rev1/rev1.h
@@ -16,7 +16,7 @@
#pragma once
-#include QMK_KEYBOARD_H
+#include "splitty.h"
// clang-format off
#define LAYOUT( \
diff --git a/keyboards/studiokestra/galatea/galatea.c b/keyboards/studiokestra/galatea/galatea.c
deleted file mode 100644
index 30e7939159..0000000000
--- a/keyboards/studiokestra/galatea/galatea.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Studio Kestra
- *
- * 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 .
- */
-
-#include "galatea.h"
diff --git a/keyboards/studiokestra/galatea/galatea.h b/keyboards/studiokestra/galatea/galatea.h
deleted file mode 100644
index a1f2aa77b5..0000000000
--- a/keyboards/studiokestra/galatea/galatea.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Studio Kestra
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_studiokestra_galatea_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_studiokestra_galatea_rev2)
- #include "rev2.h"
-#endif
diff --git a/keyboards/studiokestra/galatea/rev1/rev1.c b/keyboards/studiokestra/galatea/rev1/rev1.c
deleted file mode 100644
index f34f9f9200..0000000000
--- a/keyboards/studiokestra/galatea/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Studio Kestra
- *
- * 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 .
- */
-
-#include "rev1.h"
diff --git a/keyboards/studiokestra/galatea/rev2/rev2.c b/keyboards/studiokestra/galatea/rev2/rev2.c
deleted file mode 100644
index 5e7125b0b6..0000000000
--- a/keyboards/studiokestra/galatea/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Studio Kestra
- *
- * 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 .
- */
-
-#include "rev2.h"
diff --git a/keyboards/uzu42/rev1/rev1.c b/keyboards/uzu42/rev1/rev1.c
deleted file mode 100644
index e22860d04b..0000000000
--- a/keyboards/uzu42/rev1/rev1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "uzu42.h"
diff --git a/keyboards/uzu42/rev1/rev1.h b/keyboards/uzu42/rev1/rev1.h
index e4aba8b79b..156605f87a 100644
--- a/keyboards/uzu42/rev1/rev1.h
+++ b/keyboards/uzu42/rev1/rev1.h
@@ -5,8 +5,6 @@
#include "uzu42.h"
-#include "quantum.h"
-
#define LAYOUT( \
L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
diff --git a/keyboards/uzu42/uzu42.h b/keyboards/uzu42/uzu42.h
index c23baac333..8678588bc3 100644
--- a/keyboards/uzu42/uzu42.h
+++ b/keyboards/uzu42/uzu42.h
@@ -3,6 +3,8 @@
#pragma once
+#include "quantum.h"
+
#ifdef KEYBOARD_uzu42_rev1
#include "rev1.h"
#endif
diff --git a/keyboards/vitamins_included/rev1/rev1.c b/keyboards/vitamins_included/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/vitamins_included/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/vitamins_included/rev1/rev1.h b/keyboards/vitamins_included/rev1/rev1.h
deleted file mode 100644
index 53ae64a6ea..0000000000
--- a/keyboards/vitamins_included/rev1/rev1.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#pragma once
-#include QMK_KEYBOARD_H
diff --git a/keyboards/vitamins_included/rev2/rev2.c b/keyboards/vitamins_included/rev2/rev2.c
index 15b47089e8..d34cdb4fc1 100644
--- a/keyboards/vitamins_included/rev2/rev2.c
+++ b/keyboards/vitamins_included/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "rev2.h"
+#include "quantum.h"
bool is_keyboard_left(void) {
#if defined(MASTER_LEFT)
diff --git a/keyboards/vitamins_included/rev2/rev2.h b/keyboards/vitamins_included/rev2/rev2.h
deleted file mode 100644
index 7e12888dda..0000000000
--- a/keyboards/vitamins_included/rev2/rev2.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include QMK_KEYBOARD_H
diff --git a/keyboards/vitamins_included/vitamins_included.c b/keyboards/vitamins_included/vitamins_included.c
index e83c81633c..a6429d87e8 100644
--- a/keyboards/vitamins_included/vitamins_included.c
+++ b/keyboards/vitamins_included/vitamins_included.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "vitamins_included.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/vitamins_included/vitamins_included.h b/keyboards/vitamins_included/vitamins_included.h
index 489e90977f..21509d9743 100644
--- a/keyboards/vitamins_included/vitamins_included.h
+++ b/keyboards/vitamins_included/vitamins_included.h
@@ -2,12 +2,6 @@
#include "quantum.h"
-#ifdef KEYBOARD_vitamins_included_rev1
- #include "rev1.h"
-#else
- #include "rev2.h"
-#endif
-
#define LAYOUT( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
diff --git a/keyboards/whale/sk/sk.c b/keyboards/whale/sk/sk.c
deleted file mode 100644
index c151f73fb6..0000000000
--- a/keyboards/whale/sk/sk.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "sk.h"
diff --git a/keyboards/whale/sk/sk.h b/keyboards/whale/sk/sk.h
deleted file mode 100644
index d9c75f15b2..0000000000
--- a/keyboards/whale/sk/sk.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_whale_sk_v3
- #include "v3.h"
-#endif
diff --git a/keyboards/whale/sk/v3/v3.h b/keyboards/whale/sk/v3/v3.h
index 06ebc45dc9..a392705a83 100644
--- a/keyboards/whale/sk/v3/v3.h
+++ b/keyboards/whale/sk/v3/v3.h
@@ -1,7 +1,5 @@
#pragma once
-#include "sk.h"
-
#include "quantum.h"
#define LAYOUT_all( \
diff --git a/keyboards/xelus/dawn60/dawn60.c b/keyboards/xelus/dawn60/dawn60.c
deleted file mode 100644
index 3e009b3bdf..0000000000
--- a/keyboards/xelus/dawn60/dawn60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "dawn60.h"
diff --git a/keyboards/xelus/dawn60/dawn60.h b/keyboards/xelus/dawn60/dawn60.h
deleted file mode 100644
index feec9b5e1d..0000000000
--- a/keyboards/xelus/dawn60/dawn60.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 Harrison Chan (Xelus)
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_xelus_dawn60_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_xelus_dawn60_rev1_qmk)
- #include "rev1_qmk.h"
-#endif
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
index c17160a659..951c0a22ff 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
+++ b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
@@ -14,13 +14,13 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
-#include
+#include "rev1_qmk.h"
+
+#include "i2c_master.h"
+#include "led_tables.h"
+#include "rgb_matrix.h"
#include "drivers/led/issi/is31fl3731.h"
#include "ws2812.h"
-#include "rev1_qmk.h"
#ifdef RGB_MATRIX_ENABLE
LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
diff --git a/keyboards/xelus/pachi/rgb/rgb.c b/keyboards/xelus/pachi/rgb/rgb.c
deleted file mode 100644
index 93ca8406de..0000000000
--- a/keyboards/xelus/pachi/rgb/rgb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * 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 .
- */
-#include "rgb.h"
diff --git a/keyboards/xelus/pachi/rgb/rgb.h b/keyboards/xelus/pachi/rgb/rgb.h
deleted file mode 100644
index 36ca2937a6..0000000000
--- a/keyboards/xelus/pachi/rgb/rgb.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_xelus_pachi_rgb_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_xelus_pachi_rgb_rev2)
- #include "rev2.h"
-#endif
diff --git a/keyboards/xelus/rs60/rev1/rev1.c b/keyboards/xelus/rs60/rev1/rev1.c
deleted file mode 100644
index d997ff979e..0000000000
--- a/keyboards/xelus/rs60/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * 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 .
- */
- #include "rev1.h"
diff --git a/keyboards/xelus/rs60/rev2_0/rev2_0.c b/keyboards/xelus/rs60/rev2_0/rev2_0.c
deleted file mode 100644
index d2abbda521..0000000000
--- a/keyboards/xelus/rs60/rev2_0/rev2_0.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * 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 .
- */
- #include "rev2_0.h"
diff --git a/keyboards/xelus/rs60/rev2_1/rev2_1.c b/keyboards/xelus/rs60/rev2_1/rev2_1.c
deleted file mode 100644
index dc234542b5..0000000000
--- a/keyboards/xelus/rs60/rev2_1/rev2_1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * 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 .
- */
- #include "rev2_1.h"
diff --git a/keyboards/xelus/rs60/rs60.c b/keyboards/xelus/rs60/rs60.c
deleted file mode 100644
index cd2fa80061..0000000000
--- a/keyboards/xelus/rs60/rs60.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * 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 .
- */
- #include "rs60.h"
diff --git a/keyboards/xelus/rs60/rs60.h b/keyboards/xelus/rs60/rs60.h
deleted file mode 100644
index 5a52d37a7f..0000000000
--- a/keyboards/xelus/rs60/rs60.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_xelus_rs60_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_xelus_rs60_rev2_0)
- #include "rev2_0.h"
-#elif defined(KEYBOARD_xelus_rs60_rev2_1)
- #include "rev2_1.h"
-#endif
diff --git a/keyboards/ymdk/ymd75/rev1/rev1.c b/keyboards/ymdk/ymd75/rev1/rev1.c
deleted file mode 100644
index c1ad021b15..0000000000
--- a/keyboards/ymdk/ymd75/rev1/rev1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro
-
-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 .
-*/
-
-#include "ymd75.h"
diff --git a/keyboards/ymdk/ymd75/rev2/rev2.c b/keyboards/ymdk/ymd75/rev2/rev2.c
deleted file mode 100644
index c1ad021b15..0000000000
--- a/keyboards/ymdk/ymd75/rev2/rev2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro
-
-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 .
-*/
-
-#include "ymd75.h"
diff --git a/keyboards/ymdk/ymd75/rev3/rev3.c b/keyboards/ymdk/ymd75/rev3/rev3.c
deleted file mode 100644
index c1ad021b15..0000000000
--- a/keyboards/ymdk/ymd75/rev3/rev3.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro
-
-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 .
-*/
-
-#include "ymd75.h"
diff --git a/keyboards/ymdk/ymd75/ymd75.c b/keyboards/ymdk/ymd75/ymd75.c
deleted file mode 100644
index 2fca021f78..0000000000
--- a/keyboards/ymdk/ymd75/ymd75.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ymd75.h"
diff --git a/keyboards/ymdk/ymd75/ymd75.h b/keyboards/ymdk/ymd75/ymd75.h
deleted file mode 100644
index dbaf93e7db..0000000000
--- a/keyboards/ymdk/ymd75/ymd75.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_ymdk_ymd75_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_ymdk_ymd75_rev2)
- #include "rev2.h"
-#elif defined(KEYBOARD_ymdk_ymd75_rev3)
- #include "rev3.h"
-#endif
diff --git a/keyboards/yosino58/lib/host_led_state_reader.c b/keyboards/yosino58/lib/host_led_state_reader.c
index 2a17e0a33b..abcfefffb4 100644
--- a/keyboards/yosino58/lib/host_led_state_reader.c
+++ b/keyboards/yosino58/lib/host_led_state_reader.c
@@ -1,5 +1,4 @@
#include
-#include "yosino58.h"
char host_led_state_str[24];
diff --git a/keyboards/yosino58/lib/keylogger.c b/keyboards/yosino58/lib/keylogger.c
index c50de94c20..dc9c21406f 100644
--- a/keyboards/yosino58/lib/keylogger.c
+++ b/keyboards/yosino58/lib/keylogger.c
@@ -1,5 +1,4 @@
#include
-#include "yosino58.h"
char keylog_str[24] = {};
char keylogs_str[21] = {};
diff --git a/keyboards/yosino58/lib/layer_state_reader.c b/keyboards/yosino58/lib/layer_state_reader.c
index 7e5747cb75..2dec336b86 100644
--- a/keyboards/yosino58/lib/layer_state_reader.c
+++ b/keyboards/yosino58/lib/layer_state_reader.c
@@ -1,7 +1,6 @@
#include QMK_KEYBOARD_H
#include
-#include "yosino58.h"
#define L_BASE 0
#define L_LOWER 8
diff --git a/keyboards/yosino58/lib/logo_reader.c b/keyboards/yosino58/lib/logo_reader.c
index 96c9b897ef..b340979807 100644
--- a/keyboards/yosino58/lib/logo_reader.c
+++ b/keyboards/yosino58/lib/logo_reader.c
@@ -1,5 +1,3 @@
-#include "yosino58.h"
-
const char *read_logo(void) {
static char logo[] = {
0x2B,0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
diff --git a/keyboards/yosino58/lib/mode_icon_reader.c b/keyboards/yosino58/lib/mode_icon_reader.c
index 865d9537de..9dadd6ac86 100644
--- a/keyboards/yosino58/lib/mode_icon_reader.c
+++ b/keyboards/yosino58/lib/mode_icon_reader.c
@@ -1,5 +1,4 @@
#include
-#include "yosino58.h"
char mode_icon[24];
diff --git a/keyboards/yosino58/lib/timelogger.c b/keyboards/yosino58/lib/timelogger.c
index ce8b0c270f..db75d77fac 100644
--- a/keyboards/yosino58/lib/timelogger.c
+++ b/keyboards/yosino58/lib/timelogger.c
@@ -1,5 +1,4 @@
#include
-#include "yosino58.h"
char timelog_str[24] = {};
int last_time = 0;
diff --git a/keyboards/yosino58/rev1/rev1.c b/keyboards/yosino58/rev1/rev1.c
deleted file mode 100644
index 45534122b3..0000000000
--- a/keyboards/yosino58/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "yosino58.h"
diff --git a/keyboards/yosino58/yosino58.c b/keyboards/yosino58/yosino58.c
deleted file mode 100644
index 85545f3f44..0000000000
--- a/keyboards/yosino58/yosino58.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "yosino58.h"
\ No newline at end of file
diff --git a/keyboards/yosino58/yosino58.h b/keyboards/yosino58/yosino58.h
deleted file mode 100644
index 5414c31bd8..0000000000
--- a/keyboards/yosino58/yosino58.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_yosino58_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/yushakobo/navpad/10/10.c b/keyboards/yushakobo/navpad/10/10.c
deleted file mode 100644
index c1f6fc485d..0000000000
--- a/keyboards/yushakobo/navpad/10/10.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * 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 .
- */
-
-#include "10.h"
diff --git a/keyboards/yushakobo/navpad/10/10.h b/keyboards/yushakobo/navpad/10/10.h
deleted file mode 100644
index 5fd02cd073..0000000000
--- a/keyboards/yushakobo/navpad/10/10.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * 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 .
- */
-
-#pragma once
-
-#include "quantum.h"
-#include "navpad_prefs.h"
-
-#if defined(KEYBOARD_yushakobo_navpad_10_rev0)
-# include "rev0.h"
-#elif defined(KEYBOARD_yushakobo_navpad_10_rev1)
-# include "rev1.h"
-#endif
diff --git a/keyboards/yushakobo/navpad/10/rev0/rev0.c b/keyboards/yushakobo/navpad/10/rev0/rev0.c
deleted file mode 100644
index c1feab87a3..0000000000
--- a/keyboards/yushakobo/navpad/10/rev0/rev0.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * 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 .
- */
-
-#include "rev0.h"
diff --git a/keyboards/yushakobo/navpad/10/rev0/rev0.h b/keyboards/yushakobo/navpad/10/rev0/rev0.h
index 97a651bc1c..7e2dbab462 100644
--- a/keyboards/yushakobo/navpad/10/rev0/rev0.h
+++ b/keyboards/yushakobo/navpad/10/rev0/rev0.h
@@ -18,6 +18,8 @@
#include "quantum.h"
+#include "navpad_prefs.h"
+
/* This is a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
diff --git a/keyboards/yushakobo/navpad/10/rev1/rev1.c b/keyboards/yushakobo/navpad/10/rev1/rev1.c
deleted file mode 100644
index bf47612035..0000000000
--- a/keyboards/yushakobo/navpad/10/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * 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 .
- */
-
-#include "rev1.h"
diff --git a/keyboards/yushakobo/navpad/10/rev1/rev1.h b/keyboards/yushakobo/navpad/10/rev1/rev1.h
index 50fd54a026..b56b6f67cf 100644
--- a/keyboards/yushakobo/navpad/10/rev1/rev1.h
+++ b/keyboards/yushakobo/navpad/10/rev1/rev1.h
@@ -18,6 +18,8 @@
#include "quantum.h"
+#include "navpad_prefs.h"
+
/* This is a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
diff --git a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c b/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c
deleted file mode 100644
index 8be5220d56..0000000000
--- a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 yushakobo
- *
- * 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 .
- */
-
-#include "10_helix_r.h"