diff --git a/aom/aomcx.h b/aom/aomcx.h
index 9003dca..d3a61a1 100644
--- a/aom/aomcx.h
+++ b/aom/aomcx.h
@@ -238,16 +238,6 @@
    */
   AV1E_SET_LOSSLESS = AV1E_SET_GF_CBR_BOOST_PCT + 2,
 
-#if CONFIG_TEMPMV_SIGNALING
-  /*!\brief Codec control function to set temporal mv prediction
-  * enabling/disabling.
-  *
-  * This will enable or disable temporal mv predicton. The default value is 0.
-  *
-  * Supported in codecs: AV1
-  */
-  AV1E_SET_DISABLE_TEMPMV,
-#endif
   /*!\brief Codec control function to set number of tile columns.
    *
    * In encoding and decoding, AV1 allows an input image frame be partitioned
@@ -286,21 +276,6 @@
    * By default, the value is 0, i.e. one single row tile for entire image.
    */
   AV1E_SET_TILE_ROWS,
-#if CONFIG_LOOPFILTERING_ACROSS_TILES
-  /*!\brief Codec control function to set loop_filter_across_tiles_enabled.
-   *
-   * In encoding and decoding, AV1 allows disabling loop filter across tile
-   * boundary The parameter for this control describes the value of this flag,
-   * which has a valid range [0, 1]:
-   *            0 = disable loop filter across tile boundary
-   *            1 = enable loop filter across tile boundary
-   *
-   * By default, the value is 1, i.e. enable loop filter across tile boundary.
-   *
-   * Supported in codecs: AV1
-   */
-  AV1E_SET_TILE_LOOPFILTER,
-#endif
 
   /*!\brief Codec control function to enable frame parallel decoding feature.
    *
@@ -490,8 +465,6 @@
   *            1 = enable dependent horizontal tile,
   *
   * By default, the value is 0, i.e. disable dependent horizontal tile.
-  *
-  * Supported in codecs: AV1
   */
   AV1E_SET_TILE_DEPENDENT_ROWS,
 
@@ -506,6 +479,29 @@
    * Experiment: ANS
    */
   AV1E_SET_ANS_WINDOW_SIZE_LOG2,
+
+  /*!\brief Codec control function to set temporal mv prediction
+  * enabling/disabling.
+  *
+  * This will enable or disable temporal mv predicton. The default value is 0.
+  *
+  * Experiment: TEMPMV_SIGNALING
+  */
+  AV1E_SET_DISABLE_TEMPMV,
+
+  /*!\brief Codec control function to set loop_filter_across_tiles_enabled.
+   *
+   * In encoding and decoding, AV1 allows disabling loop filter across tile
+   * boundary The parameter for this control describes the value of this flag,
+   * which has a valid range [0, 1]:
+   *            0 = disable loop filter across tile boundary
+   *            1 = enable loop filter across tile boundary
+   *
+   * By default, the value is 1, i.e. enable loop filter across tile boundary.
+   *
+   * Experiment: LOOPFILTERING_ACROSS_TILES
+   */
+  AV1E_SET_TILE_LOOPFILTER,
 };
 
 /*!\brief aom 1-D scaling mode
@@ -620,15 +616,11 @@
 AOM_CTRL_USE_TYPE(AV1E_SET_TILE_ROWS, int)
 #define AOM_CTRL_AV1E_SET_TILE_ROWS
 
-#if CONFIG_DEPENDENT_HORZTILES
 AOM_CTRL_USE_TYPE(AV1E_SET_TILE_DEPENDENT_ROWS, int)
 #define AOM_CTRL_AV1E_SET_TILE_DEPENDENT_ROWS
-#endif
 
-#if CONFIG_LOOPFILTERING_ACROSS_TILES
 AOM_CTRL_USE_TYPE(AV1E_SET_TILE_LOOPFILTER, int)
 #define AOM_CTRL_AV1E_SET_TILE_LOOPFILTER
-#endif  // CONFIG_LOOPFILTERING_ACROSS_TILES
 
 AOM_CTRL_USE_TYPE(AOME_GET_LAST_QUANTIZER, int *)
 #define AOM_CTRL_AOME_GET_LAST_QUANTIZER
@@ -660,10 +652,8 @@
 AOM_CTRL_USE_TYPE(AV1E_SET_MTU, unsigned int)
 #define AOM_CTRL_AV1E_SET_MTU
 
-#if CONFIG_TEMPMV_SIGNALING
 AOM_CTRL_USE_TYPE(AV1E_SET_DISABLE_TEMPMV, unsigned int)
 #define AOM_CTRL_AV1E_SET_DISABLE_TEMPMV
-#endif
 
 AOM_CTRL_USE_TYPE(AV1E_SET_FRAME_PARALLEL_DECODING, unsigned int)
 #define AOM_CTRL_AV1E_SET_FRAME_PARALLEL_DECODING