Change keyboard level include guards to `pragma once` (#14248)

* Change keyboard level include guards to `pragma once`

And clean up a lot of layout macros

* Oops

* Remove dangling endif

2 files changed, 22 insertions, 28 deletions

diff --git a/keyboards/thevankeyboards/roadkit/config.h b/keyboards/thevankeyboards/roadkit/config.h
index 815dd715b4..ebcb8b820e 100644
--- a/keyboards/thevankeyboards/roadkit/config.h
+++ b/keyboards/thevankeyboards/roadkit/config.h
@@ -15,8 +15,7 @@ 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
+#pragma once
 
 #include "config_common.h"
 
@@ -151,5 +150,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/thevankeyboards/roadkit/roadkit.h b/keyboards/thevankeyboards/roadkit/roadkit.h
index 62cfabc5eb..f367c88ff4 100644
--- a/keyboards/thevankeyboards/roadkit/roadkit.h
+++ b/keyboards/thevankeyboards/roadkit/roadkit.h
@@ -1,33 +1,30 @@
-#ifndef ROADKIT_H
-#define ROADKIT_H
+#pragma once
 
 #include "quantum.h"
 
+#define XXX KC_NO
+
 // This is a shortcut to help you visually see your layout.
 #define LAYOUT_numpad_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K23, \
-    K30,      K32       \
-) \
-{ \
-    { K00, K01,   K02, K03   }, \
-    { K10, K11,   K12, KC_NO }, \
-    { K20, K21,   K22, K23   }, \
-    { K30, KC_NO, K32, KC_NO }  \
+    k00, k01, k02, k03, \
+    k10, k11, k12, \
+    k20, k21, k22, k23, \
+    k30,      k32 \
+) { \
+    { k00, k01, k02, k03 }, \
+    { k10, k11, k12, XXX }, \
+    { k20, k21, k22, k23 }, \
+    { k30, XXX, k32, XXX } \
 }
 
 #define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-) \
-{ \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }  \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13, \
+    k20, k21, k22, k23, \
+    k30, k31, k32, k33 \
+) { \
+    { k00, k01, k02, k03 }, \
+    { k10, k11, k12, k13 }, \
+    { k20, k21, k22, k23 }, \
+    { k30, k31, k32, k33 } \
 }
-
-#endif