diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h
index 1cba5d35ac5eb02ce6c36ca87dbbe4935a932515..4e5d9e813ae40f7b27254133e70b649b5b114e16 100644
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -233,7 +233,7 @@ static B_PREDICTION_MODE pred_mode_conv(MB_PREDICTION_MODE mode) {
 union b_mode_info {
   struct {
     B_PREDICTION_MODE first;
-#if CONFIG_HYBRIDTRANSFORM
+#if CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM
     B_PREDICTION_MODE test;
     TX_TYPE           tx_type;
 #endif
diff --git a/vp8/common/idctllm.c b/vp8/common/idctllm.c
index ea39634b5ff8431da2beedb26e00e4ed2f43ec5c..bf019af0657ab6471bc0d1a6ed4c47c771b87f00 100644
--- a/vp8/common/idctllm.c
+++ b/vp8/common/idctllm.c
@@ -37,7 +37,7 @@ static const int rounding = 0;
 
 // TODO: these transforms can be further converted into integer forms
 //       for complexity optimization
-#if CONFIG_HYBRIDTRANSFORM
+#if CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM8X8
 float idct_4[16] = {
   0.500000000000000,   0.653281482438188,   0.500000000000000,   0.270598050073099,
   0.500000000000000,   0.270598050073099,  -0.500000000000000,  -0.653281482438188,
@@ -51,9 +51,7 @@ float iadst_4[16] = {
   0.577350269189626,                   0,  -0.577350269189626,   0.577350269189626,
   0.656538502008139,  -0.577350269189626,   0.428525073124359,  -0.228013428883779
 };
-#endif
 
-#if CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM8X8
 float idct_8[64] = {
   0.353553390593274,   0.490392640201615,   0.461939766255643,   0.415734806151273,
   0.353553390593274,   0.277785116509801,   0.191341716182545,   0.097545161008064,
@@ -91,9 +89,7 @@ float iadst_8[64] = {
   0.483002021635509,  -0.466553967085785,   0.434217976756762,  -0.387095214016348,
   0.326790388032145,  -0.255357107325375,   0.175227946595736,  -0.089131608307532
 };
-#endif
 
-#if CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM
 void vp8_ihtllm_c(short *input, short *output, int pitch,
                   TX_TYPE tx_type, int tx_dim) {
   int i, j, k;
diff --git a/vp8/encoder/dct.c b/vp8/encoder/dct.c
index a7747b8435291766f838743728610c509cdd5d2b..5f46a980466551a34608aad15e1a80cd54b230bf 100644
--- a/vp8/encoder/dct.c
+++ b/vp8/encoder/dct.c
@@ -13,7 +13,7 @@
 #include "vpx_ports/config.h"
 #include "vp8/common/idct.h"
 
-#if CONFIG_HYBRIDTRANSFORM
+#if CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM8X8
 
 #include "vp8/common/blockd.h"
 
@@ -32,9 +32,7 @@ float adst_4[16] = {
   0.656538502008139, -0.228013428883779, -0.577350269189626,  0.428525073124359,
   0.428525073124360, -0.656538502008139,  0.577350269189626, -0.228013428883779
 };
-#endif
 
-#if CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM8X8
 float dct_8[64] = {
   0.353553390593274,   0.353553390593274,   0.353553390593274,   0.353553390593274,
   0.353553390593274,   0.353553390593274,   0.353553390593274,   0.353553390593274,