diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index 4eb8b1a94458f975d0117aa1cb31f763e21d9938..1234d54c7f04a2f1a2e540d6ce41cb5b394128d0 100644
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -17,14 +17,10 @@
 #include "vpx_ports/mem.h"
 #include "vpx_scale/yv12config.h"
 
-#include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_common_data.h"
-#include "vp9/common/vp9_enums.h"
 #include "vp9/common/vp9_filter.h"
-#include "vp9/common/vp9_idct.h"
 #include "vp9/common/vp9_mv.h"
 #include "vp9/common/vp9_scale.h"
-#include "vp9/common/vp9_seg_common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h
index 8cdfc5c4766d9b5c8960ecb2dafaf8a5d2f310c1..239c0494c638bb51258dbe8b4f4849dde2c01c74 100644
--- a/vp9/common/vp9_entropy.h
+++ b/vp9/common/vp9_entropy.h
@@ -13,8 +13,8 @@
 
 #include "vpx/vpx_integer.h"
 
-#include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_common.h"
+#include "vp9/common/vp9_prob.h"
 #include "vp9/common/vp9_scan.h"
 
 #ifdef __cplusplus
diff --git a/vp9/common/vp9_quant_common.h b/vp9/common/vp9_quant_common.h
index b6266059de812345e0e6d523d1091bb8c4029574..4bae4a89677abf14c6364402cc6bf3cd463ded96 100644
--- a/vp9/common/vp9_quant_common.h
+++ b/vp9/common/vp9_quant_common.h
@@ -12,7 +12,7 @@
 #define VP9_COMMON_VP9_QUANT_COMMON_H_
 
 #include "vpx/vpx_codec.h"
-#include "vp9/common/vp9_blockd.h"
+#include "vp9/common/vp9_seg_common.h"
 
 #ifdef __cplusplus
 extern "C" {