diff --git a/include/aspi.h b/include/aspi.h
index e19d3909891..57703e07b28 100644
--- a/include/aspi.h
+++ b/include/aspi.h
@@ -115,4 +115,6 @@ struct ASPI_DEVICE_INFO {
 typedef struct ASPI_DEVICE_INFO ASPI_DEVICE_INFO;
 static ASPI_DEVICE_INFO *ASPI_open_devices = NULL;
 
+#pragma pack(4)
+
 #endif
diff --git a/include/mmsystem.h b/include/mmsystem.h
index 67c3521c583..16946ee6d9e 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -2837,8 +2837,6 @@ BOOL16		WINAPI	DriverCallback16(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev,
 					 WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
 DWORD		WINAPI	auxMessage(WORD wDevID, WORD wMsg, DWORD dwUser, 
 				   DWORD dwParam1, DWORD dwParam2);
-
-#pragma pack(4)
 DWORD		WINAPI	mixMessage(WORD wDevID, WORD wMsg, DWORD dwUser, 
 				   DWORD dwParam1, DWORD dwParam2);
 DWORD		WINAPI	midMessage(WORD wDevID, WORD wMsg, DWORD dwUser, 
diff --git a/include/winaspi.h b/include/winaspi.h
index 081df68daa7..0af1d5e033b 100644
--- a/include/winaspi.h
+++ b/include/winaspi.h
@@ -97,4 +97,6 @@ union SRB16 {
 
 typedef union SRB16 SRB16;
 
+#pragma pack(4)
+
 #endif
diff --git a/include/winioctl.h b/include/winioctl.h
index cc197c7b131..d0685565b86 100644
--- a/include/winioctl.h
+++ b/include/winioctl.h
@@ -3,8 +3,6 @@
 
 #include "winnt.h"
 
-#pragma pack(1)
-
 #define CTL_CODE( DeviceType, Function, Method, Access ) (                 \
     (DWORD)((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \
 )
@@ -248,7 +246,7 @@ typedef struct tagMID {
     BYTE  midVolLabel[11];
     BYTE  midFileSysType[8];
 } MID, *PMID;
-#pragma pack()
+#pragma pack(4)
 
 /* End VWIN32 information */
 
diff --git a/include/winnt.h b/include/winnt.h
index a97a18777dd..07483b5124c 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -378,7 +378,7 @@ typedef enum _TOKEN_INFORMATION_CLASS {
 #ifndef _SECURITY_DEFINED
 #define _SECURITY_DEFINED
 
-#pragma pack (1)
+#pragma pack(1)
 
 typedef struct {
     BYTE Value[6];
@@ -784,4 +784,6 @@ typedef enum tagSID_NAME_USE {
 #define DACL_SECURITY_INFORMATION   0x00000004
 #define SACL_SECURITY_INFORMATION   0x00000008
 
+#pragma pack(4)
+
 #endif  /* __WINE_WINNT_H */
diff --git a/include/wnaspi32.h b/include/wnaspi32.h
index 78702d97d38..8f6981c6c33 100644
--- a/include/wnaspi32.h
+++ b/include/wnaspi32.h
@@ -93,4 +93,6 @@ union SRB {
 
 typedef union SRB SRB;
 
+#pragma pack(4)
+
 #endif
diff --git a/programs/view/globals.h b/programs/view/globals.h
index 5577af6a5dc..c79be2d6fe1 100644
--- a/programs/view/globals.h
+++ b/programs/view/globals.h
@@ -32,4 +32,4 @@ typedef struct
 
 #define APMHEADER_KEY	0x9AC6CDD7l
 
-
+#pragma pack(4)