diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
index b417b43fb7..e0d1539e2e 100644
--- a/hw/xfree86/ddc/edid.h
+++ b/hw/xfree86/ddc/edid.h
@@ -204,14 +204,4 @@ typedef struct {
 
 extern _X_EXPORT xf86MonPtr ConfiguredMonitor;
 
-#define IEEE_ID_HDMI    0x000C03
-#define CEA_AUDIO_BLK   1
-#define CEA_VIDEO_BLK   2
-#define CEA_VENDOR_BLK  3
-#define CEA_SPEAKER_ALLOC_BLK 4
-#define CEA_VESA_DTC_BLK 5
-#define VENDOR_LATENCY_PRESENT(x)     ( (x) >> 7)
-#define VENDOR_LATENCY_PRESENT_I(x) ( ( (x) >> 6) & 0x01)
-#define HDMI_MAX_TMDS_UNIT   (5000)
-
 #endif                          /* _EDID_H_ */
diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index a07a37f121..d5c4eac0ea 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -50,6 +50,10 @@
 #define CEA_EXT_MAX_DATA_OFFSET 127
 #define CEA_EXT_DET_TIMING_NUM 6
 
+#define IEEE_ID_HDMI    0x000C03
+#define CEA_VIDEO_BLK   2
+#define CEA_VENDOR_BLK  3
+
 struct cea_ext_body {
     uint8_t tag;
     uint8_t rev;