diff --git a/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc
index 82b3e14585..56101a11cf 100644
--- a/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc
+++ b/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc
@@ -10,7 +10,7 @@
 
 #include <ctime>
 
-#include "testing/gflags/include/gflags/gflags.h"
+#include <gflags/gflags.h>
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/test/libtest/include/bit_flip_encryption.h"
 #include "webrtc/test/libtest/include/random_encryption.h"
diff --git a/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
index 9b4dfb7865..76f9e521c0 100644
--- a/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
+++ b/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
@@ -15,7 +15,7 @@
 
 #include <cstdio>
 
-#include "testing/gflags/include/gflags/gflags.h"
+#include <gflags/gflags.h>
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/test/testsupport/metrics/video_metrics.h"
 #include "webrtc/test/testsupport/metrics/video_metrics.h"
diff --git a/webrtc/video_engine/test/auto_test/interface/vie_autotest.h b/webrtc/video_engine/test/auto_test/interface/vie_autotest.h
index 284a95dd7f..3684cdbfb5 100644
--- a/webrtc/video_engine/test/auto_test/interface/vie_autotest.h
+++ b/webrtc/video_engine/test/auto_test/interface/vie_autotest.h
@@ -15,7 +15,7 @@
 #ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_H_
 #define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_H_
 
-#include "testing/gflags/include/gflags/gflags.h"
+#include <gflags/gflags.h>
 #include "webrtc/common_types.h"
 #include "webrtc/modules/video_render/include/video_render_defines.h"
 #include "webrtc/video_engine/include/vie_base.h"
diff --git a/webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h b/webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h
index 29c8ab43b1..6af87e8b3e 100644
--- a/webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h
+++ b/webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h
@@ -11,9 +11,11 @@
 #ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_LINUX_H_
 #define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_LINUX_H_
 
+// Note(pbos): This MUST be included before the X11 headers
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
 
 // Forward declaration
 
diff --git a/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc b/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc
index 30bcdf0c24..030802e5cf 100644
--- a/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include "testing/gflags/include/gflags/gflags.h"
+#include <gflags/gflags.h>
 
 namespace webrtc {
 
diff --git a/webrtc/video_engine/test/auto_test/primitives/input_helpers.h b/webrtc/video_engine/test/auto_test/primitives/input_helpers.h
index 341efe998f..47862d2b0d 100644
--- a/webrtc/video_engine/test/auto_test/primitives/input_helpers.h
+++ b/webrtc/video_engine/test/auto_test/primitives/input_helpers.h
@@ -17,7 +17,7 @@
 #include <string>
 #include <vector>
 
-#include "testing/gflags/include/gflags/gflags.h"
+#include <gflags/gflags.h>
 
 namespace webrtc {
 
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_capture.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_capture.cc
index 91947f2fe3..cd5dcbb4b1 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_capture.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_capture.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "testing/gflags/include/gflags/gflags.h"
+#include <gflags/gflags.h>
 #include "webrtc/common_types.h"
 #include "webrtc/engine_configurations.h"
 #include "webrtc/modules/video_capture/include/video_capture_factory.h"
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
index b72d390993..029756bb05 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
@@ -14,7 +14,7 @@
 
 #include <algorithm>
 
-#include "testing/gflags/include/gflags/gflags.h"
+#include <gflags/gflags.h>
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/test/channel_transport/include/channel_transport.h"
 #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_main.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_main.cc
index a5bd95946b..e5319d471a 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_main.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_main.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
 
-#include "testing/gflags/include/gflags/gflags.h"
+#include <gflags/gflags.h>
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/test/testsupport/fileutils.h"