diff --git a/Core/gb.h b/Core/gb.h
index 1b444d4..3fec460 100644
--- a/Core/gb.h
+++ b/Core/gb.h
@@ -44,6 +44,11 @@
 #error Unable to detect endianess
 #endif
 
+#ifdef GB_BIG_ENDIAN
+#define GB_REGISTER_ORDER a,f,b,c,d,e,h,l;
+#else
+#define GB_REGISTER_ORDER f,a,c,b,e,d,l,h;
+#endif
 
 typedef struct {
     struct GB_color_s {
@@ -335,17 +340,7 @@ typedef union {
                  pc;
     };
     struct {
-#ifdef GB_BIG_ENDIAN
-        uint8_t a, f,
-                b, c,
-                d, e,
-                h, l;
-#else
-        uint8_t f, a,
-                c, b,
-                e, d,
-                l, h;
-#endif
+        uint8_t GB_REGISTER_ORDER
     };
 } GB_registers_t;
 
@@ -383,17 +378,7 @@ struct GB_gameboy_internal_s {
                          pc;
             };
             struct {
-#ifdef GB_BIG_ENDIAN
-                uint8_t a, f,
-                        b, c,
-                        d, e,
-                        h, l;
-#else
-                uint8_t f, a,
-                        c, b,
-                        e, d,
-                        l, h;
-#endif
+                uint8_t GB_REGISTER_ORDER
             };
         };
         uint8_t ime;