8 files changed, 19 insertions, 43 deletions

diff --git a/keyboards/meira/config.h b/keyboards/meira/config.h
index 4d864a8a7..999ab1bf8 100644
--- a/keyboards/meira/config.h
+++ b/keyboards/meira/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"
 
@@ -44,5 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 15    // Number of LEDs
 #endif
-
-#endif
diff --git a/keyboards/meira/featherble/config.h b/keyboards/meira/featherble/config.h
index b3ee95474..24f50ec17 100644
--- a/keyboards/meira/featherble/config.h
+++ b/keyboards/meira/featherble/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 FEATHERBLECONFIG_H
-#define FEATHERBLECONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -144,5 +143,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/meira/featherble/featherble.h b/keyboards/meira/featherble/featherble.h
index b7599b994..afc05d7c7 100644
--- a/keyboards/meira/featherble/featherble.h
+++ b/keyboards/meira/featherble/featherble.h
@@ -1,9 +1,5 @@
-#ifndef FEATHERBLE_H
-#define FEATHERBLE_H
+#pragma once
 
 #include "../meira.h"
 
 #include "quantum.h"
-
-
-#endif
diff --git a/keyboards/meira/issi.h b/keyboards/meira/issi.h
index 51777f6ee..74379ddbc 100755
--- a/keyboards/meira/issi.h
+++ b/keyboards/meira/issi.h
@@ -1,6 +1,6 @@
+#pragma once
+
 #ifdef ISSI_ENABLE
-#ifndef ISSI_H
-#define ISSI_H
 
 typedef struct ISSIDeviceStruct{
     uint8_t fn_dirty;       // function registers need to be resent
@@ -37,4 +37,3 @@ void activateLED(uint8_t matrix, uint8_t cx, uint8_t cy, uint8_t pwm);
 void update_issi(uint8_t device_addr, uint8_t blocking);
 
 #endif
-#endif
\ No newline at end of file
diff --git a/keyboards/meira/lighting.h b/keyboards/meira/lighting.h
index dc55b70ef..42fee8ac9 100755
--- a/keyboards/meira/lighting.h
+++ b/keyboards/meira/lighting.h
@@ -1,9 +1,6 @@
-#ifndef LIGHTING_H
-#define LIGHTING_H
+#pragma once
 
 void led_test(void);
 void force_issi_refresh(void);
 void set_backlight(uint8_t level);
 void set_backlight_by_keymap(uint8_t col, uint8_t row);
-
-#endif
diff --git a/keyboards/meira/meira.h b/keyboards/meira/meira.h
index d96839440..c88561fa0 100644
--- a/keyboards/meira/meira.h
+++ b/keyboards/meira/meira.h
@@ -13,8 +13,8 @@
  * 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 MEIRA_H
-#define MEIRA_H
+
+#pragma once
 
 #include "quantum.h"
 #include "issi.h"
@@ -26,19 +26,15 @@ void reset_keyboard_kb(void);
 // The first section contains all of the arguments
 // The second converts the arguments into a two-dimensional array
 #define LAYOUT_ortho_4x12( \
-   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, k36, 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, k36, 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, k36, 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, k36, k37, k38, k39, k3A, k3B } \
 }
 
 #define LAYOUT LAYOUT_ortho_4x12
-
-#endif
-
diff --git a/keyboards/meira/promicro/config.h b/keyboards/meira/promicro/config.h
index 53844745b..0fb8b5207 100644
--- a/keyboards/meira/promicro/config.h
+++ b/keyboards/meira/promicro/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 PROMICROCONFIG_H
-#define PROMICROCONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -135,5 +134,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/meira/promicro/promicro.h b/keyboards/meira/promicro/promicro.h
index 9e6800b49..afc05d7c7 100644
--- a/keyboards/meira/promicro/promicro.h
+++ b/keyboards/meira/promicro/promicro.h
@@ -1,8 +1,5 @@
-#ifndef FEATHERBLE_H
-#define FEATHERBLE_H
+#pragma once
 
 #include "../meira.h"
 
 #include "quantum.h"
-
-#endif