diff --git a/test/acm_random.h b/test/acm_random.h
index 0233870..0a8317f 100644
--- a/test/acm_random.h
+++ b/test/acm_random.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef TEST_ACM_RANDOM_H_
-#define TEST_ACM_RANDOM_H_
+#ifndef AOM_TEST_ACM_RANDOM_H_
+#define AOM_TEST_ACM_RANDOM_H_
 
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 
@@ -81,4 +81,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_ACM_RANDOM_H_
+#endif  // AOM_TEST_ACM_RANDOM_H_
diff --git a/test/av1_convolve_2d_test_util.h b/test/av1_convolve_2d_test_util.h
index cd4607d..e0eb584 100644
--- a/test/av1_convolve_2d_test_util.h
+++ b/test/av1_convolve_2d_test_util.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
-#define TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
+#ifndef AOM_TEST_AV1_CONVOLVE_2D_TEST_UTIL_H_
+#define AOM_TEST_AV1_CONVOLVE_2D_TEST_UTIL_H_
 
 #include "config/av1_rtcd.h"
 #include "config/aom_dsp_rtcd.h"
@@ -114,4 +114,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
+#endif  // AOM_TEST_AV1_CONVOLVE_2D_TEST_UTIL_H_
diff --git a/test/av1_txfm_test.h b/test/av1_txfm_test.h
index 70d1a89..a181647 100644
--- a/test/av1_txfm_test.h
+++ b/test/av1_txfm_test.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef AV1_TXFM_TEST_H_
-#define AV1_TXFM_TEST_H_
+#ifndef AOM_TEST_AV1_TXFM_TEST_H_
+#define AOM_TEST_AV1_TXFM_TEST_H_
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -132,4 +132,4 @@
                             const int8_t cos_bit, int low_range,
                             int high_range);
 }  // namespace libaom_test
-#endif  // AV1_TXFM_TEST_H_
+#endif  // AOM_TEST_AV1_TXFM_TEST_H_
diff --git a/test/clear_system_state.h b/test/clear_system_state.h
index 7aa7824..d38ff5d 100644
--- a/test/clear_system_state.h
+++ b/test/clear_system_state.h
@@ -8,8 +8,8 @@
  * Media Patent License 1.0 was not distributed with this source code in the
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
-#ifndef TEST_CLEAR_SYSTEM_STATE_H_
-#define TEST_CLEAR_SYSTEM_STATE_H_
+#ifndef AOM_TEST_CLEAR_SYSTEM_STATE_H_
+#define AOM_TEST_CLEAR_SYSTEM_STATE_H_
 
 #include "config/aom_config.h"
 
@@ -28,4 +28,4 @@
 }
 
 }  // namespace libaom_test
-#endif  // TEST_CLEAR_SYSTEM_STATE_H_
+#endif  // AOM_TEST_CLEAR_SYSTEM_STATE_H_
diff --git a/test/codec_factory.h b/test/codec_factory.h
index bcea05a..dd99110 100644
--- a/test/codec_factory.h
+++ b/test/codec_factory.h
@@ -8,8 +8,8 @@
  * Media Patent License 1.0 was not distributed with this source code in the
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
-#ifndef TEST_CODEC_FACTORY_H_
-#define TEST_CODEC_FACTORY_H_
+#ifndef AOM_TEST_CODEC_FACTORY_H_
+#define AOM_TEST_CODEC_FACTORY_H_
 
 #include "config/aom_config.h"
 
@@ -167,4 +167,4 @@
           __VA_ARGS__))
 
 }  // namespace libaom_test
-#endif  // TEST_CODEC_FACTORY_H_
+#endif  // AOM_TEST_CODEC_FACTORY_H_
diff --git a/test/comp_avg_pred_test.h b/test/comp_avg_pred_test.h
index fe7c0ca..9661dd9 100644
--- a/test/comp_avg_pred_test.h
+++ b/test/comp_avg_pred_test.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef TEST_COMP_AVG_PRED_TEST_H_
-#define TEST_COMP_AVG_PRED_TEST_H_
+#ifndef AOM_TEST_COMP_AVG_PRED_TEST_H_
+#define AOM_TEST_COMP_AVG_PRED_TEST_H_
 
 #include "config/aom_dsp_rtcd.h"
 
@@ -552,4 +552,4 @@
 }  // namespace AV1JNTCOMPAVG
 }  // namespace libaom_test
 
-#endif  // TEST_COMP_AVG_PRED_TEST_H_
+#endif  // AOM_TEST_COMP_AVG_PRED_TEST_H_
diff --git a/test/decode_test_driver.h b/test/decode_test_driver.h
index 916efda..d13e13e 100644
--- a/test/decode_test_driver.h
+++ b/test/decode_test_driver.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef TEST_DECODE_TEST_DRIVER_H_
-#define TEST_DECODE_TEST_DRIVER_H_
+#ifndef AOM_TEST_DECODE_TEST_DRIVER_H_
+#define AOM_TEST_DECODE_TEST_DRIVER_H_
 #include <cstring>
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 
@@ -162,4 +162,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_DECODE_TEST_DRIVER_H_
+#endif  // AOM_TEST_DECODE_TEST_DRIVER_H_
diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h
index 138cd6a..4f3f855 100644
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -8,8 +8,8 @@
  * Media Patent License 1.0 was not distributed with this source code in the
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
-#ifndef TEST_ENCODE_TEST_DRIVER_H_
-#define TEST_ENCODE_TEST_DRIVER_H_
+#ifndef AOM_TEST_ENCODE_TEST_DRIVER_H_
+#define AOM_TEST_ENCODE_TEST_DRIVER_H_
 
 #include <string>
 #include <vector>
@@ -246,4 +246,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_ENCODE_TEST_DRIVER_H_
+#endif  // AOM_TEST_ENCODE_TEST_DRIVER_H_
diff --git a/test/function_equivalence_test.h b/test/function_equivalence_test.h
index 4b22c74..f270689 100644
--- a/test/function_equivalence_test.h
+++ b/test/function_equivalence_test.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef TEST_FUNCTION_EQUIVALENCE_TEST_H_
-#define TEST_FUNCTION_EQUIVALENCE_TEST_H_
+#ifndef AOM_TEST_FUNCTION_EQUIVALENCE_TEST_H_
+#define AOM_TEST_FUNCTION_EQUIVALENCE_TEST_H_
 
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 #include "test/acm_random.h"
@@ -66,4 +66,4 @@
 };
 
 }  // namespace libaom_test
-#endif  // TEST_FUNCTION_EQUIVALENCE_TEST_H_
+#endif  // AOM_TEST_FUNCTION_EQUIVALENCE_TEST_H_
diff --git a/test/hiprec_convolve_test_util.h b/test/hiprec_convolve_test_util.h
index 81471c8..2abe24b 100644
--- a/test/hiprec_convolve_test_util.h
+++ b/test/hiprec_convolve_test_util.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
-#define TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
+#ifndef AOM_TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
+#define AOM_TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
 
 #include "config/av1_rtcd.h"
 
@@ -90,4 +90,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
+#endif  // AOM_TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
diff --git a/test/i420_video_source.h b/test/i420_video_source.h
index 0825296..233e715 100644
--- a/test/i420_video_source.h
+++ b/test/i420_video_source.h
@@ -8,8 +8,8 @@
  * Media Patent License 1.0 was not distributed with this source code in the
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
-#ifndef TEST_I420_VIDEO_SOURCE_H_
-#define TEST_I420_VIDEO_SOURCE_H_
+#ifndef AOM_TEST_I420_VIDEO_SOURCE_H_
+#define AOM_TEST_I420_VIDEO_SOURCE_H_
 #include <cstdio>
 #include <cstdlib>
 #include <string>
@@ -31,4 +31,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_I420_VIDEO_SOURCE_H_
+#endif  // AOM_TEST_I420_VIDEO_SOURCE_H_
diff --git a/test/ivf_video_source.h b/test/ivf_video_source.h
index 4b27135..ff28414 100644
--- a/test/ivf_video_source.h
+++ b/test/ivf_video_source.h
@@ -8,8 +8,8 @@
  * Media Patent License 1.0 was not distributed with this source code in the
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
-#ifndef TEST_IVF_VIDEO_SOURCE_H_
-#define TEST_IVF_VIDEO_SOURCE_H_
+#ifndef AOM_TEST_IVF_VIDEO_SOURCE_H_
+#define AOM_TEST_IVF_VIDEO_SOURCE_H_
 
 #include <cstdio>
 #include <cstdlib>
@@ -111,4 +111,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_IVF_VIDEO_SOURCE_H_
+#endif  // AOM_TEST_IVF_VIDEO_SOURCE_H_
diff --git a/test/md5_helper.h b/test/md5_helper.h
index b2b14cf..9443cb2 100644
--- a/test/md5_helper.h
+++ b/test/md5_helper.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef TEST_MD5_HELPER_H_
-#define TEST_MD5_HELPER_H_
+#ifndef AOM_TEST_MD5_HELPER_H_
+#define AOM_TEST_MD5_HELPER_H_
 
 #include "aom/aom_decoder.h"
 #include "common/md5_utils.h"
@@ -73,4 +73,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_MD5_HELPER_H_
+#endif  // AOM_TEST_MD5_HELPER_H_
diff --git a/test/register_state_check.h b/test/register_state_check.h
index ef1f775..d404621 100644
--- a/test/register_state_check.h
+++ b/test/register_state_check.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef TEST_REGISTER_STATE_CHECK_H_
-#define TEST_REGISTER_STATE_CHECK_H_
+#ifndef AOM_TEST_REGISTER_STATE_CHECK_H_
+#define AOM_TEST_REGISTER_STATE_CHECK_H_
 
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 
@@ -145,4 +145,4 @@
 #define API_REGISTER_STATE_CHECK ASM_REGISTER_STATE_CHECK
 #endif
 
-#endif  // TEST_REGISTER_STATE_CHECK_H_
+#endif  // AOM_TEST_REGISTER_STATE_CHECK_H_
diff --git a/test/test_vectors.h b/test/test_vectors.h
index 229f063..be37f6e 100644
--- a/test/test_vectors.h
+++ b/test/test_vectors.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef TEST_TEST_VECTORS_H_
-#define TEST_TEST_VECTORS_H_
+#ifndef AOM_TEST_TEST_VECTORS_H_
+#define AOM_TEST_TEST_VECTORS_H_
 
 #include "config/aom_config.h"
 
@@ -23,4 +23,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_TEST_VECTORS_H_
+#endif  // AOM_TEST_TEST_VECTORS_H_
diff --git a/test/transform_test_base.h b/test/transform_test_base.h
index 67e8faf..8ebcf5f 100644
--- a/test/transform_test_base.h
+++ b/test/transform_test_base.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef TEST_TRANSFORM_TEST_BASE_H_
-#define TEST_TRANSFORM_TEST_BASE_H_
+#ifndef AOM_TEST_TRANSFORM_TEST_BASE_H_
+#define AOM_TEST_TRANSFORM_TEST_BASE_H_
 
 #include "config/aom_config.h"
 
@@ -339,4 +339,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_TRANSFORM_TEST_BASE_H_
+#endif  // AOM_TEST_TRANSFORM_TEST_BASE_H_
diff --git a/test/util.h b/test/util.h
index db00875..c3f4e44 100644
--- a/test/util.h
+++ b/test/util.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef TEST_UTIL_H_
-#define TEST_UTIL_H_
+#ifndef AOM_TEST_UTIL_H_
+#define AOM_TEST_UTIL_H_
 
 #include <stdio.h>
 #include <math.h>
@@ -50,4 +50,4 @@
   return static_cast<double>(aom_usec_timer_elapsed(t));
 }
 
-#endif  // TEST_UTIL_H_
+#endif  // AOM_TEST_UTIL_H_
diff --git a/test/video_source.h b/test/video_source.h
index dc39b5a..3c1c5e5 100644
--- a/test/video_source.h
+++ b/test/video_source.h
@@ -8,8 +8,8 @@
  * Media Patent License 1.0 was not distributed with this source code in the
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
-#ifndef TEST_VIDEO_SOURCE_H_
-#define TEST_VIDEO_SOURCE_H_
+#ifndef AOM_TEST_VIDEO_SOURCE_H_
+#define AOM_TEST_VIDEO_SOURCE_H_
 
 #if defined(_WIN32)
 #undef NOMINMAX
@@ -256,4 +256,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_VIDEO_SOURCE_H_
+#endif  // AOM_TEST_VIDEO_SOURCE_H_
diff --git a/test/warp_filter_test_util.h b/test/warp_filter_test_util.h
index 5224819..b8998e5 100644
--- a/test/warp_filter_test_util.h
+++ b/test/warp_filter_test_util.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef TEST_WARP_FILTER_TEST_UTIL_H_
-#define TEST_WARP_FILTER_TEST_UTIL_H_
+#ifndef AOM_TEST_WARP_FILTER_TEST_UTIL_H_
+#define AOM_TEST_WARP_FILTER_TEST_UTIL_H_
 
 #include "config/av1_rtcd.h"
 #include "config/aom_dsp_rtcd.h"
@@ -100,4 +100,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_WARP_FILTER_TEST_UTIL_H_
+#endif  // AOM_TEST_WARP_FILTER_TEST_UTIL_H_
diff --git a/test/webm_video_source.h b/test/webm_video_source.h
index 482f5de..bb3d117 100644
--- a/test/webm_video_source.h
+++ b/test/webm_video_source.h
@@ -8,8 +8,8 @@
  * Media Patent License 1.0 was not distributed with this source code in the
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
-#ifndef TEST_WEBM_VIDEO_SOURCE_H_
-#define TEST_WEBM_VIDEO_SOURCE_H_
+#ifndef AOM_TEST_WEBM_VIDEO_SOURCE_H_
+#define AOM_TEST_WEBM_VIDEO_SOURCE_H_
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
@@ -93,4 +93,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_WEBM_VIDEO_SOURCE_H_
+#endif  // AOM_TEST_WEBM_VIDEO_SOURCE_H_
diff --git a/test/y4m_video_source.h b/test/y4m_video_source.h
index 277ded9..3dea901 100644
--- a/test/y4m_video_source.h
+++ b/test/y4m_video_source.h
@@ -8,8 +8,8 @@
  * Media Patent License 1.0 was not distributed with this source code in the
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
-#ifndef TEST_Y4M_VIDEO_SOURCE_H_
-#define TEST_Y4M_VIDEO_SOURCE_H_
+#ifndef AOM_TEST_Y4M_VIDEO_SOURCE_H_
+#define AOM_TEST_Y4M_VIDEO_SOURCE_H_
 #include <algorithm>
 #include <string>
 
@@ -120,4 +120,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_Y4M_VIDEO_SOURCE_H_
+#endif  // AOM_TEST_Y4M_VIDEO_SOURCE_H_
diff --git a/test/yuv_video_source.h b/test/yuv_video_source.h
index 51554af..774ecc0 100644
--- a/test/yuv_video_source.h
+++ b/test/yuv_video_source.h
@@ -8,8 +8,8 @@
  * Media Patent License 1.0 was not distributed with this source code in the
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
-#ifndef TEST_YUV_VIDEO_SOURCE_H_
-#define TEST_YUV_VIDEO_SOURCE_H_
+#ifndef AOM_TEST_YUV_VIDEO_SOURCE_H_
+#define AOM_TEST_YUV_VIDEO_SOURCE_H_
 
 #include <cstdio>
 #include <cstdlib>
@@ -120,4 +120,4 @@
 
 }  // namespace libaom_test
 
-#endif  // TEST_YUV_VIDEO_SOURCE_H_
+#endif  // AOM_TEST_YUV_VIDEO_SOURCE_H_