diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
index 24201706e1..e79d6cc096 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
@@ -28,9 +28,7 @@
 #include "l2cap.h" // Local
 #include "WiiMote_HID_Attr.h"
 
-#if defined(_MSC_VER)
 #pragma pack(push, 1)
-#endif
 
 #define SDP_CHANNEL						0x01
 #define HIDP_CONTROL_CHANNEL			0x11
@@ -131,9 +129,7 @@ struct SL2CAP_CommandDisconnectionResponse // 0x07
 	u16 scid;
 };
 
-#if defined(_MSC_VER)
 #pragma pack(pop)
-#endif
 
 static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb;
 
diff --git a/Source/Core/Core/Src/IPC_HLE/l2cap.h b/Source/Core/Core/Src/IPC_HLE/l2cap.h
index 85538abe45..c61b816878 100644
--- a/Source/Core/Core/Src/IPC_HLE/l2cap.h
+++ b/Source/Core/Core/Src/IPC_HLE/l2cap.h
@@ -31,10 +31,11 @@ typedef unsigned short __u16;
 typedef unsigned char __u8;
 typedef unsigned long __u32;
 
-#ifdef _MSC_VER
+
 #define __attribute__(a)
 #pragma pack(push)
 #pragma pack(1)
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4200)
 #endif
diff --git a/Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h b/Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h
index f87ad3cd41..93121a21c3 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h
+++ b/Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h
@@ -22,9 +22,10 @@
 
 #ifdef _MSC_VER
 #pragma warning(disable:4200)
-#pragma pack(push, 1)
 #endif
 
+#pragma pack(push, 1)
+
 // Source: HID_010_SPC_PFL/1.0 (official HID specification)
 
 struct hid_packet {
@@ -301,8 +302,6 @@ struct accel_cal
 };
 
 
-#if defined(_MSC_VER)
-	#pragma pack(pop)
-#endif
+#pragma pack(pop)
 
 #endif	//WIIMOTE_HID_H