diff --git a/av1/common/daala_tx.c b/av1/common/daala_tx.c
index 1b6277199d510b095439b36f0029186f60f69052..b1519bb2046b0f36510a413e4d00e994dc156feb 100644
--- a/av1/common/daala_tx.c
+++ b/av1/common/daala_tx.c
@@ -4225,6 +4225,11 @@ void daala_idst16(const tran_low_t *input, tran_low_t *output) {
   for (i = 0; i < 16; i++) output[i] = (tran_low_t)x[i];
 }
 
+void daala_idtx16(const tran_low_t *input, tran_low_t *output) {
+  int i;
+  for (i = 0; i < 16; i++) output[i] = input[i];
+}
+
 void daala_fdct32(const tran_low_t *input, tran_low_t *output) {
   int i;
   od_coeff x[32];
diff --git a/av1/common/daala_tx.h b/av1/common/daala_tx.h
index 1dd673c73958589a120a5b3be41529f65f753d66..ee288daf834694f07756884197cf53deb16bdf84 100644
--- a/av1/common/daala_tx.h
+++ b/av1/common/daala_tx.h
@@ -18,6 +18,7 @@ void daala_fdct16(const tran_low_t *input, tran_low_t *output);
 void daala_idct16(const tran_low_t *input, tran_low_t *output);
 void daala_fdst16(const tran_low_t *input, tran_low_t *output);
 void daala_idst16(const tran_low_t *input, tran_low_t *output);
+void daala_idtx16(const tran_low_t *input, tran_low_t *output);
 void daala_fdct32(const tran_low_t *input, tran_low_t *output);
 void daala_idct32(const tran_low_t *input, tran_low_t *output);
 #if CONFIG_TX64X64
diff --git a/av1/common/idct.c b/av1/common/idct.c
index 8dbcb10b231eaba39401aa74756010a50072b800..21ed0426d8c3d50e83d816666501ccdad0710015 100644
--- a/av1/common/idct.c
+++ b/av1/common/idct.c
@@ -50,11 +50,7 @@ static void iidtx8_c(const tran_low_t *input, tran_low_t *output) {
 static void iidtx16_c(const tran_low_t *input, tran_low_t *output) {
   int i;
   for (i = 0; i < 16; ++i) {
-#if CONFIG_DAALA_DCT16
-    output[i] = input[i];
-#else
     output[i] = (tran_low_t)dct_const_round_shift(input[i] * 2 * Sqrt2);
-#endif
   }
 }
 
@@ -1290,13 +1286,13 @@ void av1_iht16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride,
     { daala_idst16, daala_idst16 },  // FLIPADST_FLIPADST
     { daala_idst16, daala_idst16 },  // ADST_FLIPADST
     { daala_idst16, daala_idst16 },  // FLIPADST_ADST
-    { iidtx16_c, iidtx16_c },        // IDTX
-    { daala_idct16, iidtx16_c },     // V_DCT
-    { iidtx16_c, daala_idct16 },     // H_DCT
-    { daala_idst16, iidtx16_c },     // V_ADST
-    { iidtx16_c, daala_idst16 },     // H_ADST
-    { daala_idst16, iidtx16_c },     // V_FLIPADST
-    { iidtx16_c, daala_idst16 },     // H_FLIPADST
+    { daala_idtx16, daala_idtx16 },  // IDTX
+    { daala_idct16, daala_idtx16 },  // V_DCT
+    { daala_idtx16, daala_idct16 },  // H_DCT
+    { daala_idst16, daala_idtx16 },  // V_ADST
+    { daala_idtx16, daala_idst16 },  // H_ADST
+    { daala_idst16, daala_idtx16 },  // V_FLIPADST
+    { daala_idtx16, daala_idst16 },  // H_FLIPADST
 #endif
 #else
     { aom_idct16_c, aom_idct16_c },    // DCT_DCT  = 0
diff --git a/av1/encoder/dct.c b/av1/encoder/dct.c
index 0965a70bd4da439abc7688725e3879d4a0ce1ee0..c37ffc4be7429d18e978f5f0269ff6d2c5ef757c 100644
--- a/av1/encoder/dct.c
+++ b/av1/encoder/dct.c
@@ -1133,11 +1133,7 @@ static void fidtx8(const tran_low_t *input, tran_low_t *output) {
 static void fidtx16(const tran_low_t *input, tran_low_t *output) {
   int i;
   for (i = 0; i < 16; ++i) {
-#if CONFIG_DAALA_DCT16
-    output[i] = input[i];
-#else
     output[i] = (tran_low_t)fdct_round_shift(input[i] * 2 * Sqrt2);
-#endif
   }
 }
 
@@ -2338,13 +2334,13 @@ void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride,
     { daala_fdst16, daala_fdst16 },  // FLIPADST_FLIPADST
     { daala_fdst16, daala_fdst16 },  // ADST_FLIPADST
     { daala_fdst16, daala_fdst16 },  // FLIPADST_ADST
-    { fidtx16, fidtx16 },            // IDTX
-    { daala_fdct16, fidtx16 },       // V_DCT
-    { fidtx16, daala_fdct16 },       // H_DCT
-    { daala_fdst16, fidtx16 },       // V_ADST
-    { fidtx16, daala_fdst16 },       // H_ADST
-    { daala_fdst16, fidtx16 },       // V_FLIPADST
-    { fidtx16, daala_fdst16 },       // H_FLIPADST
+    { daala_idtx16, daala_idtx16 },  // IDTX
+    { daala_fdct16, daala_idtx16 },  // V_DCT
+    { daala_idtx16, daala_fdct16 },  // H_DCT
+    { daala_fdst16, daala_idtx16 },  // V_ADST
+    { daala_idtx16, daala_fdst16 },  // H_ADST
+    { daala_fdst16, daala_idtx16 },  // V_FLIPADST
+    { daala_idtx16, daala_fdst16 },  // H_FLIPADST
 #endif
 #else
     { fdct16, fdct16 },    // DCT_DCT