3 files changed, 13 insertions, 18 deletions
diff --git a/keyboards/newgame40/newgame40.h b/keyboards/newgame40/newgame40.h
index 6044f37657..e6146e4f14 100644
--- a/keyboards/newgame40/newgame40.h
+++ b/keyboards/newgame40/newgame40.h
@@ -1,19 +1,15 @@
-#ifndef NEWGAME40_H
-#define NEWGAME40_H
+#pragma once
 
 #include "quantum.h"
 
 #define LAYOUT_ortho_4x10( \
-      k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, \
-      k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, \
-      k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, \
-      k401, k402, k403, k404, k405, k406, k407, k408, k409, k410 \
-) \
-{ \
-      {k101, k102, k103, k104, k105, k106, k107, k108, k109, k110}, \
-      {k201, k202, k203, k204, k205, k206, k207, k208, k209, k210}, \
-      {k301, k302, k303, k304, k305, k306, k307, k308, k309, k310}, \
-      {k401, k402, k403, k404, k405, k406, k407, k408, k409, k410} \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 } \
 }
-
-#endif
diff --git a/keyboards/newgame40/post_rules.mk b/keyboards/newgame40/post_rules.mk
new file mode 100644
index 0000000000..68229fe12b
--- /dev/null
+++ b/keyboards/newgame40/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(IOS_DEVICE_ENABLE )), yes)
+    OPT_DEFS += -DIOS_DEVICE_ENABLE 
+endif
diff --git a/keyboards/newgame40/rules.mk b/keyboards/newgame40/rules.mk
index 28039b7e57..12c3cef966 100644
--- a/keyboards/newgame40/rules.mk
+++ b/keyboards/newgame40/rules.mk
@@ -20,10 +20,6 @@ UNICODE_ENABLE = yes        # Unicode
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 IOS_DEVICE_ENABLE = no     # connect to IOS Device
 
-  ifeq ($(strip $(IOS_DEVICE_ENABLE )), yes)
-    OPT_DEFS += -DIOS_DEVICE_ENABLE 
-  endif
-
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend