diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h
index 06e4db8deb9..6a36eaa4302 100644
--- a/base/system/diskpart/diskpart.h
+++ b/base/system/diskpart/diskpart.h
@@ -51,8 +51,8 @@
 
 #include <fmifs/fmifs.h>
 #include <guiddef.h>
+#include <diskguid.h>
 
-#include "guid.h"
 #include "resource.h"
 
 //#define DUMP_PARTITION_TABLE
diff --git a/base/system/diskpart/guid.c b/base/system/diskpart/guid.c
index 6c44c329871..a7a9f0a8b75 100644
--- a/base/system/diskpart/guid.c
+++ b/base/system/diskpart/guid.c
@@ -1,6 +1,4 @@
 
 #define INITGUID
 #include <guiddef.h>
-
-#include "guid.h"
-
+#include <diskguid.h>
diff --git a/base/system/diskpart/guid.h b/base/system/diskpart/guid.h
deleted file mode 100644
index 69b12a4bea7..00000000000
--- a/base/system/diskpart/guid.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-DEFINE_GUID(PARTITION_ENTRY_UNUSED_GUID, 0x00000000L, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
-DEFINE_GUID(PARTITION_SYSTEM_GUID, 0xc12a7328L, 0xf81f, 0x11d2, 0xba, 0x4b, 0x00, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b);
-DEFINE_GUID(PARTITION_MSFT_RESERVED_GUID, 0xe3c9e316L, 0x0b5c, 0x4db8, 0x81, 0x7d, 0xf9, 0x2d, 0xf0, 0x02, 0x15, 0xae);
-DEFINE_GUID(PARTITION_BASIC_DATA_GUID, 0xebd0a0a2L, 0xb9e5, 0x4433, 0x87, 0xc0, 0x68, 0xb6, 0xb7, 0x26, 0x99, 0xc7);
-
-DEFINE_GUID(PARTITION_LDM_METADATA_GUID, 0x5808c8aaL, 0x7e8f, 0x42e0, 0x85, 0xd2, 0xe1, 0xe9, 0x04, 0x34, 0xcf, 0xb3);
-DEFINE_GUID(PARTITION_LDM_DATA_GUID, 0xaf9b60a0L, 0x1431, 0x4f62, 0xbc, 0x68, 0x33, 0x11, 0x71, 0x4a, 0x69, 0xad);
-DEFINE_GUID(PARTITION_MSFT_RECOVERY_GUID, 0xde94bba4L, 0x06d1, 0x4d40, 0xa1, 0x6a, 0xbf, 0xd5, 0x01, 0x79, 0xd6, 0xac);
diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c
index 2268e89f5af..64697278880 100644
--- a/base/system/diskpart/partlist.c
+++ b/base/system/diskpart/partlist.c
@@ -9,7 +9,6 @@
 /* INCLUDES *******************************************************************/
 
 #include "diskpart.h"
-#include "guid.h"
 #include <ntddscsi.h>
 
 #define NDEBUG