diff --git a/keyboards/handwired/planck/config.h b/keyboards/handwired/planck/config.h
index 1e9818232dd..29d96e809aa 100644
--- a/keyboards/handwired/planck/config.h
+++ b/keyboards/handwired/planck/config.h
@@ -1,3 +1,18 @@
+/* Copyright 2021 Wholteza
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #ifndef CONFIG_H
 #define CONFIG_H
 
diff --git a/keyboards/handwired/planck/kb.c b/keyboards/handwired/planck/kb.c
deleted file mode 100644
index e5e00a32962..00000000000
--- a/keyboards/handwired/planck/kb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kb.h"
diff --git a/keyboards/handwired/planck/kb.h b/keyboards/handwired/planck/kb.h
deleted file mode 100644
index 55d080fea75..00000000000
--- a/keyboards/handwired/planck/kb.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef KB_H
-#define KB_H
-
-#include "quantum.h"
-
-#define LAYOUT_planck_1x2uC( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT LAYOUT_planck_1x2uC
-
-#endif
diff --git a/keyboards/handwired/planck/keymaps/wholteza/keymap.c b/keyboards/handwired/planck/keymaps/wholteza/keymap.c
index cbad461174a..36d7438ded1 100644
--- a/keyboards/handwired/planck/keymaps/wholteza/keymap.c
+++ b/keyboards/handwired/planck/keymaps/wholteza/keymap.c
@@ -1,4 +1,19 @@
-#include "kb.h"
+/* Copyright 2021 Wholteza
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "planck.h"
 #include "keymap_swedish.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/handwired/planck/planck.c b/keyboards/handwired/planck/planck.c
new file mode 100644
index 00000000000..43a7c7d67c9
--- /dev/null
+++ b/keyboards/handwired/planck/planck.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Wholteza
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "planck.h"
+
diff --git a/keyboards/handwired/planck/planck.h b/keyboards/handwired/planck/planck.h
new file mode 100644
index 00000000000..72acc315b10
--- /dev/null
+++ b/keyboards/handwired/planck/planck.h
@@ -0,0 +1,36 @@
+/* Copyright 2021 Wholteza
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef PLANCK_H
+#define PLANCK_H
+
+#include "quantum.h"
+
+#define LAYOUT_planck_1x2uC( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
+    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
+}
+
+#define LAYOUT LAYOUT_planck_1x2uC
+
+#endif