diff --git a/efi_types.h b/efi_types.h
index e15a2fa..33966b9 100644
--- a/efi_types.h
+++ b/efi_types.h
@@ -197,10 +197,7 @@ typedef struct {
 } EFI_GUID;
 
 // MBR Partition Entry
-#if defined(_MSC_VER)
 #pragma pack(1)
-#endif
-
 typedef struct {
 	UINT8 BootIndicator;
 	UINT8 StartHead;
@@ -212,36 +209,22 @@ typedef struct {
 	UINT8 EndTrack;
 	UINT8 StartingLBA[4];
 	UINT8 SizeInLBA[4];
-#if defined(_MSC_VER)
 } MBR_PARTITION_RECORD;
 #pragma pack()
-#else
-} __attribute__((packed)) MBR_PARTITION_RECORD;
-#endif
 
 // Master Boot Record
-#if defined(_MSC_VER)
 #pragma pack(1)
-#endif
-
 typedef struct {
 	UINT8 BootStrapCode[440];
 	UINT8 UniqueMbrSignature[4];
 	UINT8 Unknown[2];
 	MBR_PARTITION_RECORD Partition[4];
 	UINT16 Signature;
-#if defined(_MSC_VER)
 } MASTER_BOOT_RECORD;
 #pragma pack()
-#else
-} __attribute__((packed)) MASTER_BOOT_RECORD;
-#endif
 
 // GPT Partition Entry
-#if defined(_MSC_VER)
 #pragma pack(1)
-#endif
-
 typedef struct {
 	EFI_GUID PartitionTypeGUID;
 	EFI_GUID UniquePartitionGUID;
@@ -249,11 +232,7 @@ typedef struct {
 	EFI_LBA EndingLBA;
 	UINT64 Attributes;
 	CHAR16 PartitionName[36];
-#if defined(_MSC_VER)
 } EFI_PARTITION_ENTRY;
 #pragma pack()
-#else
-} __attribute__((packed)) EFI_PARTITION_ENTRY;
-#endif
 
 #endif /* EFI_TYPES_H */
diff --git a/protocols/media_access.h b/protocols/media_access.h
index a90c8cc..d9b585a 100644
--- a/protocols/media_access.h
+++ b/protocols/media_access.h
@@ -1041,11 +1041,10 @@ typedef struct _EFI_RAM_DISK_PROTOCOL {
 #define PARTITION_TYPE_MBR 0x01
 #define PARTITION_TYPE_GPT 0x02
 
-#if defined(_MSC_VER)
-#pragma pack(1)
-#endif
+typedef struct _EFI_PARTITION_INFO_PROTOCOL EFI_PARTITION_INFO_PROTOCOL;
 
-typedef struct {
+#pragma pack(1)
+typedef struct _EFI_PARTITION_INFO_PROTOCOL {
 	UINT32 Revision;
 	UINT32 Type;
 	UINT8 System;
@@ -1054,12 +1053,8 @@ typedef struct {
 		MBR_PARTITION_RECORD Mbr;
 		EFI_PARTITION_ENTRY Gpt;
 	} Info;
-#if defined(_MSC_VER)
 } EFI_PARTITION_INFO_PROTOCOL;
 #pragma pack()
-#else
-} __attribute__((packed)) EFI_PARTITION_INFO_PROTOCOL;
-#endif
 
 ////
 // NVDIMM Label Protocol