diff --git a/src/gallium/frontends/mediafoundation/hmft_entrypoints.h b/src/gallium/frontends/mediafoundation/hmft_entrypoints.h
index 3308de44313..26ec5fa8dfc 100644
--- a/src/gallium/frontends/mediafoundation/hmft_entrypoints.h
+++ b/src/gallium/frontends/mediafoundation/hmft_entrypoints.h
@@ -269,87 +269,6 @@ DEFINE_CODECAPI_GUID( AVEncVideoEnableSpatialAdaptiveQuantization,
    DEFINE_CODECAPI_GUIDNAMED( AVEncVideoEnableSpatialAdaptiveQuantization )
 #endif
 
-#ifndef CODECAPI_AVEncVideoOutputQPMapBlockSize
-// AVEncVideoOutputQPMapBlockSize (VT_UI4)
-// The block size used in reporting the output QP map for each block in an encoded video frame.
-// ulVal should be zero or power of 2, such as 16 or 32, etc.
-// Zero value is used to disable the QP map reporting.
-DEFINE_CODECAPI_GUID( AVEncVideoOutputQPMapBlockSize,
-                      "97038743-4AE3-44C3-A0F2-5BD58A4634EF",
-                      0x97038743,
-                      0x4ae3,
-                      0x44c3,
-                      0xa0,
-                      0xf2,
-                      0x5b,
-                      0xd5,
-                      0x8a,
-                      0x46,
-                      0x34,
-                      0xef )
-#define CODECAPI_AVEncVideoOutputQPMapBlockSize DEFINE_CODECAPI_GUIDNAMED( AVEncVideoOutputQPMapBlockSize )
-
-// MFSampleExtension_VideoEncodeQPMap {2C68A331-B712-49CA-860A-3A1D58237D88}
-// Type: IMFMediaBuffer
-// The QP map of an encoded video frame.
-DEFINE_GUID( MFSampleExtension_VideoEncodeQPMap, 0x2c68a331, 0xb712, 0x49ca, 0x86, 0x0a, 0x3a, 0x1d, 0x58, 0x23, 0x7d, 0x88 );
-
-#endif
-
-#ifndef CODECAPI_AVEncVideoOutputBitsUsedMapBlockSize
-// AVEncVideoOutputBitsUsedMapBlockSize (VT_UI4)
-// The block size used in reporting the output bits used map for each block in an encoded video frame.
-// ulVal should be zero or power of 2, such as 16 or 32, etc.
-// Zero value is used to disable the bits used map reporting.
-DEFINE_CODECAPI_GUID( AVEncVideoOutputBitsUsedMapBlockSize,
-                      "6C2CD11A-CA3B-44BD-9A9E-93B03634C36E",
-                      0x6c2cd11a,
-                      0xca3b,
-                      0x44bd,
-                      0x9a,
-                      0x9e,
-                      0x93,
-                      0xb0,
-                      0x36,
-                      0x34,
-                      0xc3,
-                      0x6e )
-#define CODECAPI_AVEncVideoOutputBitsUsedMapBlockSize DEFINE_CODECAPI_GUIDNAMED( AVEncVideoOutputBitsUsedMapBlockSize )
-
-// MFSampleExtension_VideoEncodeBitsUsedMap {6894263D-E6E2-4BCC-849D-8570365F5114}
-// Type: IMFMediaBuffer
-// The bits used map of an encoded video frame.
-DEFINE_GUID( MFSampleExtension_VideoEncodeBitsUsedMap, 0x6894263d, 0xe6e2, 0x4bcc, 0x84, 0x9d, 0x85, 0x70, 0x36, 0x5f, 0x51, 0x14 );
-
-#endif
-
-#ifndef CODECAPI_AVEncVideoSatdMapBlockSize
-// AVEncVideoSatdMapBlockSize (VT_UI4)
-// The block size used in reporting the output SATD map for each block in an encoded video frame.
-// ulVal should be zero or power of 2, such as 16 or 32.
-// A zero value disables the SATD map reporting.
-DEFINE_CODECAPI_GUID( AVEncVideoSatdMapBlockSize,
-                      "596F1106-8CE0-4302-AF79-C4EC67AADC6D",
-                      0x596f1106,
-                      0x8ce0,
-                      0x4302,
-                      0xaf,
-                      0x79,
-                      0xc4,
-                      0xec,
-                      0x67,
-                      0xaa,
-                      0xdc,
-                      0x6d )
-#define CODECAPI_AVEncVideoSatdMapBlockSize DEFINE_CODECAPI_GUIDNAMED( AVEncVideoSatdMapBlockSize )
-
-// MFSampleExtension_VideoEncodeSatdMap {ADF61D96-C2D3-4B57-A138-DDE4D351EAA9}
-// Type: IMFMediaBuffer
-// The SATD map of an encoded video frame.
-DEFINE_GUID( MFSampleExtension_VideoEncodeSatdMap, 0xadf61d96, 0xc2d3, 0x4b57, 0xa1, 0x38, 0xdd, 0xe4, 0xd3, 0x51, 0xea, 0xa9 );
-
-#endif
-
 #ifndef CODECAPI_AVEncVideoD3D12ReconstructedPictureOutputMode
 
 // MFSampleExtension_VideoEncodeD3D12ReconstructedPicture {3E8A1B7F-5C92-4D6E-B834-F0A729E65C48}