diff --git a/av1/common/resize.c b/av1/common/resize.c
index b5db615e8..322b5934e 100644
--- a/av1/common/resize.c
+++ b/av1/common/resize.c
@@ -902,7 +902,7 @@ void av1_superres_upscale(AV1_COMMON *cm, BufferPool *const pool) {
 
   if (aom_alloc_frame_buffer(&copy_buffer, cm->width, cm->height,
                              cm->subsampling_x, cm->subsampling_y,
-#ifdef CONFIG_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
                              cm->use_highbitdepth,
 #endif  // CONFIG_HIGHBITDEPTH
                              AOM_BORDER_IN_PIXELS, cm->byte_alignment))
@@ -933,7 +933,7 @@ void av1_superres_upscale(AV1_COMMON *cm, BufferPool *const pool) {
     if (aom_realloc_frame_buffer(
             frame_to_show, cm->superres_upscaled_width,
             cm->superres_upscaled_height, cm->subsampling_x, cm->subsampling_y,
-#ifdef CONFIG_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
             cm->use_highbitdepth,
 #endif  // CONFIG_HIGHBITDEPTH
             AOM_BORDER_IN_PIXELS, cm->byte_alignment, fb, cb, cb_priv))
@@ -945,7 +945,7 @@ void av1_superres_upscale(AV1_COMMON *cm, BufferPool *const pool) {
     if (aom_alloc_frame_buffer(frame_to_show, cm->superres_upscaled_width,
                                cm->superres_upscaled_height, cm->subsampling_x,
                                cm->subsampling_y,
-#ifdef CONFIG_HIGHBITDEPTH
+#if CONFIG_HIGHBITDEPTH
                                cm->use_highbitdepth,
 #endif  // CONFIG_HIGHBITDEPTH
                                AOM_BORDER_IN_PIXELS, cm->byte_alignment))
diff --git a/av1/encoder/context_tree.c b/av1/encoder/context_tree.c
index 4c7d6ff00..229495f18 100644
--- a/av1/encoder/context_tree.c
+++ b/av1/encoder/context_tree.c
@@ -141,7 +141,7 @@ static void alloc_tree_contexts(AV1_COMMON *cm, PC_TREE *tree,
                      &tree->verticalb[1]);
   alloc_mode_context(cm, num_4x4_blk / 4, PARTITION_VERT_B,
                      &tree->verticalb[2]);
-#ifdef CONFIG_SUPERTX
+#if CONFIG_SUPERTX
   alloc_mode_context(cm, num_4x4_blk, PARTITION_HORZ,
                      &tree->horizontal_supertx);
   alloc_mode_context(cm, num_4x4_blk, PARTITION_VERT, &tree->vertical_supertx);
@@ -159,7 +159,7 @@ static void alloc_tree_contexts(AV1_COMMON *cm, PC_TREE *tree,
   alloc_mode_context(cm, num_4x4_blk, &tree->none);
   alloc_mode_context(cm, num_4x4_blk / 2, &tree->horizontal[0]);
   alloc_mode_context(cm, num_4x4_blk / 2, &tree->vertical[0]);
-#ifdef CONFIG_SUPERTX
+#if CONFIG_SUPERTX
   alloc_mode_context(cm, num_4x4_blk, &tree->horizontal_supertx);
   alloc_mode_context(cm, num_4x4_blk, &tree->vertical_supertx);
   alloc_mode_context(cm, num_4x4_blk, &tree->split_supertx);
@@ -190,7 +190,7 @@ static void free_tree_contexts(PC_TREE *tree) {
   free_mode_context(&tree->horizontal[1]);
   free_mode_context(&tree->vertical[0]);
   free_mode_context(&tree->vertical[1]);
-#ifdef CONFIG_SUPERTX
+#if CONFIG_SUPERTX
   free_mode_context(&tree->horizontal_supertx);
   free_mode_context(&tree->vertical_supertx);
   free_mode_context(&tree->split_supertx);
diff --git a/av1/encoder/context_tree.h b/av1/encoder/context_tree.h
index 4f9d5e374..a52029e61 100644
--- a/av1/encoder/context_tree.h
+++ b/av1/encoder/context_tree.h
@@ -86,7 +86,7 @@ typedef struct PC_TREE {
     struct PC_TREE *split[4];
     PICK_MODE_CONTEXT *leaf_split[4];
   };
-#ifdef CONFIG_SUPERTX
+#if CONFIG_SUPERTX
   PICK_MODE_CONTEXT horizontal_supertx;
   PICK_MODE_CONTEXT vertical_supertx;
   PICK_MODE_CONTEXT split_supertx;