diff --git a/Source/RSP/OpCode.h b/Source/RSP/OpCode.h
index 8f26092af..74ad55a60 100644
--- a/Source/RSP/OpCode.h
+++ b/Source/RSP/OpCode.h
@@ -29,49 +29,45 @@
 
 #include "Types.h"
 
-typedef struct tagOPCODE {
-	union {
+typedef union tagOPCODE {
+	unsigned long Hex;
+	unsigned char Ascii[4];
 
-		unsigned long Hex;
-		unsigned char Ascii[4];
-		
-		struct {
-			unsigned offset : 16;
-			unsigned rt : 5;
-			unsigned rs : 5;
-			unsigned op : 6;
-		};
+	struct {
+		unsigned immediate : 16;
+		unsigned rt : 5;
+		unsigned rs : 5;
+		unsigned op : 6;
+	};
 
-		struct {
-			unsigned immediate : 16;
-			unsigned : 5;
-			unsigned base : 5;
-			unsigned : 6;
-		};
-		
-		struct {
-			unsigned target : 26;
-			unsigned : 6;
-		};
-		
-		struct {
-			unsigned funct : 6;
-			unsigned sa : 5;
-			unsigned rd : 5;
-			unsigned : 5;
-			unsigned : 5;
-			unsigned : 6;
-		};
+	struct {
+		unsigned offset : 16;
+		unsigned : 5;
+		unsigned base : 5;
+		unsigned : 6;
+	};
 
-		struct {
-			signed   voffset : 7;
-			unsigned del    : 4;
-			unsigned : 5;
-			unsigned dest   : 5;
-			unsigned : 5;
-			unsigned : 6;
-		};
+	struct {
+		unsigned target : 26;
+		unsigned : 6;
+	};
 
+	struct {
+		unsigned funct : 6;
+		unsigned sa : 5;
+		unsigned rd : 5;
+		unsigned : 5;
+		unsigned : 5;
+		unsigned : 6;
+	};
+
+	struct {
+		signed   voffset : 7;
+		unsigned del    : 4;
+		unsigned : 5;
+		unsigned dest   : 5;
+		unsigned : 5;
+		unsigned : 6;
 	};
 } OPCODE;
 
diff --git a/Source/RSP/X86.h b/Source/RSP/X86.h
index aa4311164..ee324dae6 100644
--- a/Source/RSP/X86.h
+++ b/Source/RSP/X86.h
@@ -246,16 +246,14 @@ void SseMoveUnalignedRegToN64Mem	( int sseReg, int AddrReg );
 void SseMoveRegToReg				( int Dest, int Source );
 void SseXorRegToReg					( int Dest, int Source );
 
-typedef struct {
-	union {
-		struct {
-			unsigned Reg0 : 2;
-			unsigned Reg1 : 2;
-			unsigned Reg2 : 2;
-			unsigned Reg3 : 2;
-		};
-		unsigned UB:8;
+typedef union {
+	struct {
+		unsigned Reg0 : 2;
+		unsigned Reg1 : 2;
+		unsigned Reg2 : 2;
+		unsigned Reg3 : 2;
 	};
+	unsigned UB:8;
 } SHUFFLE;
 
 void SseShuffleReg					( int Dest, int Source, BYTE Immed );