diff --git a/DEPS b/DEPS
index a1f2210f17..6047c8e42e 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
   "googlecode_url": "http://%s.googlecode.com/svn",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
   "chromium_revision": "114939",
-  "libjingle_revision": "100",
+  "libjingle_revision": "101",
 
   # External resources like video and audio files used for testing purposes.
   # Downloaded on demand when needed.
diff --git a/src/video_engine/Android.mk b/src/video_engine/Android.mk
index 66b3c910f1..212d203c60 100644
--- a/src/video_engine/Android.mk
+++ b/src/video_engine/Android.mk
@@ -52,7 +52,7 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/main/interface \
+    $(LOCAL_PATH)/include\
     $(LOCAL_PATH)/.. \
     $(LOCAL_PATH)/../common_video/interface \
     $(LOCAL_PATH)/../common_video/jpeg/main/interface \
diff --git a/src/video_engine/main/interface/vie_base.h b/src/video_engine/include/vie_base.h
similarity index 100%
rename from src/video_engine/main/interface/vie_base.h
rename to src/video_engine/include/vie_base.h
diff --git a/src/video_engine/main/interface/vie_capture.h b/src/video_engine/include/vie_capture.h
similarity index 100%
rename from src/video_engine/main/interface/vie_capture.h
rename to src/video_engine/include/vie_capture.h
diff --git a/src/video_engine/main/interface/vie_codec.h b/src/video_engine/include/vie_codec.h
similarity index 100%
rename from src/video_engine/main/interface/vie_codec.h
rename to src/video_engine/include/vie_codec.h
diff --git a/src/video_engine/main/interface/vie_encryption.h b/src/video_engine/include/vie_encryption.h
similarity index 100%
rename from src/video_engine/main/interface/vie_encryption.h
rename to src/video_engine/include/vie_encryption.h
diff --git a/src/video_engine/main/interface/vie_errors.h b/src/video_engine/include/vie_errors.h
similarity index 100%
rename from src/video_engine/main/interface/vie_errors.h
rename to src/video_engine/include/vie_errors.h
diff --git a/src/video_engine/main/interface/vie_external_codec.h b/src/video_engine/include/vie_external_codec.h
similarity index 100%
rename from src/video_engine/main/interface/vie_external_codec.h
rename to src/video_engine/include/vie_external_codec.h
diff --git a/src/video_engine/main/interface/vie_file.h b/src/video_engine/include/vie_file.h
similarity index 100%
rename from src/video_engine/main/interface/vie_file.h
rename to src/video_engine/include/vie_file.h
diff --git a/src/video_engine/main/interface/vie_image_process.h b/src/video_engine/include/vie_image_process.h
similarity index 100%
rename from src/video_engine/main/interface/vie_image_process.h
rename to src/video_engine/include/vie_image_process.h
diff --git a/src/video_engine/main/interface/vie_network.h b/src/video_engine/include/vie_network.h
similarity index 100%
rename from src/video_engine/main/interface/vie_network.h
rename to src/video_engine/include/vie_network.h
diff --git a/src/video_engine/main/interface/vie_render.h b/src/video_engine/include/vie_render.h
similarity index 100%
rename from src/video_engine/main/interface/vie_render.h
rename to src/video_engine/include/vie_render.h
diff --git a/src/video_engine/main/interface/vie_rtp_rtcp.h b/src/video_engine/include/vie_rtp_rtcp.h
similarity index 100%
rename from src/video_engine/main/interface/vie_rtp_rtcp.h
rename to src/video_engine/include/vie_rtp_rtcp.h
diff --git a/src/video_engine/main/test/android_test/jni/Android.mk b/src/video_engine/main/test/android_test/jni/Android.mk
index 707828b3fd..4121cc6d26 100644
--- a/src/video_engine/main/test/android_test/jni/Android.mk
+++ b/src/video_engine/main/test/android_test/jni/Android.mk
@@ -24,7 +24,7 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     external/gtest/include \
     $(LOCAL_PATH)/../../../../.. \
-    $(LOCAL_PATH)/../../../interface \
+    $(LOCAL_PATH)/../../../../include \
     $(LOCAL_PATH)/../../../../../voice_engine/main/interface 
 
 LOCAL_PRELINK_MODULE := false
@@ -38,4 +38,3 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_LDLIBS := $(LIBS_PATH)/VideoEngine_android_gcc.a -llog -lgcc 
 
 include $(BUILD_SHARED_LIBRARY)
-
diff --git a/src/video_engine/test/auto_test/helpers/vie_to_file_renderer.h b/src/video_engine/test/auto_test/helpers/vie_to_file_renderer.h
index a7d4554de9..36dae550dc 100644
--- a/src/video_engine/test/auto_test/helpers/vie_to_file_renderer.h
+++ b/src/video_engine/test/auto_test/helpers/vie_to_file_renderer.h
@@ -14,7 +14,7 @@
 #include <cstdio>
 #include <string>
 
-#include "video_engine/main/interface/vie_render.h"
+#include "video_engine/include/vie_render.h"
 
 class ViEToFileRenderer: public webrtc::ExternalRenderer {
  public:
diff --git a/src/video_engine/test/auto_test/primitives/codec_primitives.h b/src/video_engine/test/auto_test/primitives/codec_primitives.h
index aabb35f932..e7780447c4 100644
--- a/src/video_engine/test/auto_test/primitives/codec_primitives.h
+++ b/src/video_engine/test/auto_test/primitives/codec_primitives.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_VIDEO_ENGINE_TEST_AUTO_TEST_PRIMITIVES_CODEC_PRIMITIVES_H_
 #define WEBRTC_VIDEO_ENGINE_TEST_AUTO_TEST_PRIMITIVES_CODEC_PRIMITIVES_H_
 
-#include "video_engine/main/interface/vie_codec.h"
-#include "video_engine/main/interface/vie_image_process.h"
+#include "video_engine/include/vie_codec.h"
+#include "video_engine/include/vie_image_process.h"
 #include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
 #include "video_engine/test/auto_test/primitives/general_primitives.h"
 
diff --git a/src/video_engine/test/auto_test/primitives/framedrop_primitives.h b/src/video_engine/test/auto_test/primitives/framedrop_primitives.h
index 6b03dda468..44012774b7 100644
--- a/src/video_engine/test/auto_test/primitives/framedrop_primitives.h
+++ b/src/video_engine/test/auto_test/primitives/framedrop_primitives.h
@@ -14,8 +14,8 @@
 #include <list>
 #include <map>
 
-#include "video_engine/main/interface/vie_codec.h"
-#include "video_engine/main/interface/vie_image_process.h"
+#include "video_engine/include/vie_codec.h"
+#include "video_engine/include/vie_image_process.h"
 #include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
 #include "video_engine/test/auto_test/helpers/vie_to_file_renderer.h"
 
diff --git a/src/video_engine/test/auto_test/source/Android.mk b/src/video_engine/test/auto_test/source/Android.mk
index 00585dbefe..9e19418de9 100644
--- a/src/video_engine/test/auto_test/source/Android.mk
+++ b/src/video_engine/test/auto_test/source/Android.mk
@@ -42,7 +42,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../helpers \
     $(LOCAL_PATH)/../primitives \
     $(LOCAL_PATH)/../../../.. \
-    $(LOCAL_PATH)/../../../main/interface \
+    $(LOCAL_PATH)/../../../include \
     $(LOCAL_PATH)/../../.. \
     $(LOCAL_PATH)/../../../../modules/video_coding/codecs/interface \
     $(LOCAL_PATH)/../../../../system_wrappers/interface \
diff --git a/src/video_engine/test/auto_test/vie_auto_test.gypi b/src/video_engine/test/auto_test/vie_auto_test.gypi
index c8125f6a4f..d3b699ed10 100644
--- a/src/video_engine/test/auto_test/vie_auto_test.gypi
+++ b/src/video_engine/test/auto_test/vie_auto_test.gypi
@@ -25,7 +25,7 @@
         'interface/',
         'helpers/',
         'primitives',
-        '../../main/interface',
+        '../../include',
         '../..',
         '../../../modules/video_coding/codecs/interface',
         '../../../common_video/interface',
diff --git a/src/video_engine/video_engine_core.gypi b/src/video_engine/video_engine_core.gypi
index 32f3428bbc..e17e79922c 100644
--- a/src/video_engine/video_engine_core.gypi
+++ b/src/video_engine/video_engine_core.gypi
@@ -35,29 +35,29 @@
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
       'include_dirs': [
-        'main/interface',
+        'include',
         '../common_video/interface',
         '../modules/video_capture/main/interface',
         '../modules/video_render/main/interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          'main/interface',
+          'include',
         ],
       },
       'sources': [
         # interface
-        'main/interface/vie_base.h',
-        'main/interface/vie_capture.h',
-        'main/interface/vie_codec.h',
-        'main/interface/vie_encryption.h',
-        'main/interface/vie_errors.h',
-        'main/interface/vie_external_codec.h',
-        'main/interface/vie_file.h',
-        'main/interface/vie_image_process.h',
-        'main/interface/vie_network.h',
-        'main/interface/vie_render.h',
-        'main/interface/vie_rtp_rtcp.h',
+        'include/vie_base.h',
+        'include/vie_capture.h',
+        'include/vie_codec.h',
+        'include/vie_encryption.h',
+        'include/vie_errors.h',
+        'include/vie_external_codec.h',
+        'include/vie_file.h',
+        'include/vie_image_process.h',
+        'include/vie_network.h',
+        'include/vie_render.h',
+        'include/vie_rtp_rtcp.h',
 
         # headers
         'vie_base_impl.h',
diff --git a/src/video_engine/vie_capture_impl.cc b/src/video_engine/vie_capture_impl.cc
index ea01159a92..213a4166f8 100644
--- a/src/video_engine/vie_capture_impl.cc
+++ b/src/video_engine/vie_capture_impl.cc
@@ -11,7 +11,7 @@
 #include "video_engine/vie_capture_impl.h"
 
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_errors.h"
+#include "video_engine/include/vie_errors.h"
 #include "video_engine/vie_capturer.h"
 #include "video_engine/vie_channel.h"
 #include "video_engine/vie_channel_manager.h"
diff --git a/src/video_engine/vie_capture_impl.h b/src/video_engine/vie_capture_impl.h
index e5aba5b19d..e6dda9f765 100644
--- a/src/video_engine/vie_capture_impl.h
+++ b/src/video_engine/vie_capture_impl.h
@@ -12,7 +12,7 @@
 #define WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_
 
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_capture.h"
+#include "video_engine/include/vie_capture.h"
 #include "video_engine/vie_defines.h"
 #include "video_engine/vie_ref_count.h"
 #include "video_engine/vie_shared_data.h"
diff --git a/src/video_engine/vie_capturer.cc b/src/video_engine/vie_capturer.cc
index 95c0f29f9e..71aa972e31 100644
--- a/src/video_engine/vie_capturer.cc
+++ b/src/video_engine/vie_capturer.cc
@@ -19,7 +19,7 @@
 #include "system_wrappers/interface/event_wrapper.h"
 #include "system_wrappers/interface/thread_wrapper.h"
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_image_process.h"
+#include "video_engine/include/vie_image_process.h"
 #include "video_engine/vie_defines.h"
 #include "video_engine/vie_encoder.h"
 
diff --git a/src/video_engine/vie_capturer.h b/src/video_engine/vie_capturer.h
index eaae0aa5a6..a4ac36cac8 100644
--- a/src/video_engine/vie_capturer.h
+++ b/src/video_engine/vie_capturer.h
@@ -18,7 +18,7 @@
 #include "modules/video_coding/main/interface/video_coding.h"
 #include "modules/video_processing/main/interface/video_processing.h"
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_capture.h"
+#include "video_engine/include/vie_capture.h"
 #include "video_engine/vie_defines.h"
 #include "video_engine/vie_frame_provider_base.h"
 
diff --git a/src/video_engine/vie_channel.cc b/src/video_engine/vie_channel.cc
index 6668c2b8fb..54637c9eef 100644
--- a/src/video_engine/vie_channel.cc
+++ b/src/video_engine/vie_channel.cc
@@ -21,10 +21,10 @@
 #include "system_wrappers/interface/critical_section_wrapper.h"
 #include "system_wrappers/interface/thread_wrapper.h"
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_codec.h"
-#include "video_engine/main/interface/vie_errors.h"
-#include "video_engine/main/interface/vie_image_process.h"
-#include "video_engine/main/interface/vie_rtp_rtcp.h"
+#include "video_engine/include/vie_codec.h"
+#include "video_engine/include/vie_errors.h"
+#include "video_engine/include/vie_image_process.h"
+#include "video_engine/include/vie_rtp_rtcp.h"
 #include "video_engine/vie_defines.h"
 #include "video_engine/vie_receiver.h"
 #include "video_engine/vie_sender.h"
diff --git a/src/video_engine/vie_channel.h b/src/video_engine/vie_channel.h
index a29ccd6bc2..ac168203f0 100644
--- a/src/video_engine/vie_channel.h
+++ b/src/video_engine/vie_channel.h
@@ -20,8 +20,8 @@
 #include "modules/video_coding/main/interface/video_coding_defines.h"
 #include "system_wrappers/interface/tick_util.h"
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_network.h"
-#include "video_engine/main/interface/vie_rtp_rtcp.h"
+#include "video_engine/include/vie_network.h"
+#include "video_engine/include/vie_rtp_rtcp.h"
 #include "video_engine/vie_defines.h"
 #include "video_engine/vie_file_recorder.h"
 #include "video_engine/vie_frame_provider_base.h"
diff --git a/src/video_engine/vie_codec_impl.cc b/src/video_engine/vie_codec_impl.cc
index c1f0c3c241..72b6f155f4 100644
--- a/src/video_engine/vie_codec_impl.cc
+++ b/src/video_engine/vie_codec_impl.cc
@@ -13,7 +13,7 @@
 #include "engine_configurations.h"
 #include "modules/video_coding/main/interface/video_coding.h"
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_errors.h"
+#include "video_engine/include/vie_errors.h"
 #include "video_engine/vie_capturer.h"
 #include "video_engine/vie_channel.h"
 #include "video_engine/vie_channel_manager.h"
diff --git a/src/video_engine/vie_codec_impl.h b/src/video_engine/vie_codec_impl.h
index ec029f5c1e..a2fa8b2e80 100644
--- a/src/video_engine/vie_codec_impl.h
+++ b/src/video_engine/vie_codec_impl.h
@@ -12,7 +12,7 @@
 #define WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_
 
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_codec.h"
+#include "video_engine/include/vie_codec.h"
 #include "video_engine/vie_defines.h"
 #include "video_engine/vie_ref_count.h"
 #include "video_engine/vie_shared_data.h"
diff --git a/src/video_engine/vie_encryption_impl.cc b/src/video_engine/vie_encryption_impl.cc
index f5c908e10d..022322c773 100644
--- a/src/video_engine/vie_encryption_impl.cc
+++ b/src/video_engine/vie_encryption_impl.cc
@@ -11,7 +11,7 @@
 #include "video_engine/vie_encryption_impl.h"
 
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_errors.h"
+#include "video_engine/include/vie_errors.h"
 #include "video_engine/vie_channel.h"
 #include "video_engine/vie_channel_manager.h"
 #include "video_engine/vie_defines.h"
diff --git a/src/video_engine/vie_encryption_impl.h b/src/video_engine/vie_encryption_impl.h
index ef05050d08..258476caf9 100644
--- a/src/video_engine/vie_encryption_impl.h
+++ b/src/video_engine/vie_encryption_impl.h
@@ -12,7 +12,7 @@
 #define WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_
 
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_encryption.h"
+#include "video_engine/include/vie_encryption.h"
 #include "video_engine/vie_ref_count.h"
 #include "video_engine/vie_shared_data.h"
 
diff --git a/src/video_engine/vie_external_codec_impl.cc b/src/video_engine/vie_external_codec_impl.cc
index f3a11d800a..0bd304b7de 100644
--- a/src/video_engine/vie_external_codec_impl.cc
+++ b/src/video_engine/vie_external_codec_impl.cc
@@ -12,7 +12,7 @@
 
 #include "engine_configurations.h"
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_errors.h"
+#include "video_engine/include/vie_errors.h"
 #include "video_engine/vie_channel.h"
 #include "video_engine/vie_channel_manager.h"
 #include "video_engine/vie_encoder.h"
diff --git a/src/video_engine/vie_external_codec_impl.h b/src/video_engine/vie_external_codec_impl.h
index a0aba4900a..e229077728 100644
--- a/src/video_engine/vie_external_codec_impl.h
+++ b/src/video_engine/vie_external_codec_impl.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_
 #define WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_
 
-#include "video_engine/main/interface/vie_external_codec.h"
+#include "video_engine/include/vie_external_codec.h"
 #include "video_engine/vie_ref_count.h"
 #include "video_engine/vie_shared_data.h"
 
diff --git a/src/video_engine/vie_file_image.h b/src/video_engine/vie_file_image.h
index 18aa80909c..e79b11515c 100644
--- a/src/video_engine/vie_file_image.h
+++ b/src/video_engine/vie_file_image.h
@@ -13,7 +13,7 @@
 
 #include "modules/interface/module_common_types.h"
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_file.h"
+#include "video_engine/include/vie_file.h"
 
 namespace webrtc {
 
diff --git a/src/video_engine/vie_file_impl.cc b/src/video_engine/vie_file_impl.cc
index 68f0c8668b..d160375f82 100644
--- a/src/video_engine/vie_file_impl.cc
+++ b/src/video_engine/vie_file_impl.cc
@@ -17,7 +17,7 @@
 #include "system_wrappers/interface/condition_variable_wrapper.h"
 #include "system_wrappers/interface/critical_section_wrapper.h"
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_errors.h"
+#include "video_engine/include/vie_errors.h"
 #include "video_engine/vie_capturer.h"
 #include "video_engine/vie_channel.h"
 #include "video_engine/vie_channel_manager.h"
diff --git a/src/video_engine/vie_file_impl.h b/src/video_engine/vie_file_impl.h
index 470832f3c4..dd41ee06e2 100644
--- a/src/video_engine/vie_file_impl.h
+++ b/src/video_engine/vie_file_impl.h
@@ -12,7 +12,7 @@
 #define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_
 
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_file.h"
+#include "video_engine/include/vie_file.h"
 #include "video_engine/vie_defines.h"
 #include "video_engine/vie_frame_provider_base.h"
 #include "video_engine/vie_ref_count.h"
diff --git a/src/video_engine/vie_file_player.cc b/src/video_engine/vie_file_player.cc
index ce6791fec0..dd12369ec4 100644
--- a/src/video_engine/vie_file_player.cc
+++ b/src/video_engine/vie_file_player.cc
@@ -16,7 +16,7 @@
 #include "system_wrappers/interface/thread_wrapper.h"
 #include "system_wrappers/interface/tick_util.h"
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_file.h"
+#include "video_engine/include/vie_file.h"
 #include "video_engine/vie_input_manager.h"
 #include "voice_engine/main/interface/voe_base.h"
 #include "voice_engine/main/interface/voe_file.h"
diff --git a/src/video_engine/vie_file_recorder.h b/src/video_engine/vie_file_recorder.h
index 988d492447..99f3d23457 100644
--- a/src/video_engine/vie_file_recorder.h
+++ b/src/video_engine/vie_file_recorder.h
@@ -13,7 +13,7 @@
 
 #include "modules/utility/interface/file_recorder.h"
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_file.h"
+#include "video_engine/include/vie_file.h"
 #include "voice_engine/main/interface/voe_file.h"
 
 namespace webrtc {
diff --git a/src/video_engine/vie_image_process_impl.cc b/src/video_engine/vie_image_process_impl.cc
index 05e7e8893f..e4c146d596 100644
--- a/src/video_engine/vie_image_process_impl.cc
+++ b/src/video_engine/vie_image_process_impl.cc
@@ -11,7 +11,7 @@
 #include "video_engine/vie_image_process_impl.h"
 
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_errors.h"
+#include "video_engine/include/vie_errors.h"
 #include "video_engine/vie_capturer.h"
 #include "video_engine/vie_channel.h"
 #include "video_engine/vie_channel_manager.h"
diff --git a/src/video_engine/vie_image_process_impl.h b/src/video_engine/vie_image_process_impl.h
index 6666625b79..d16621e10c 100644
--- a/src/video_engine/vie_image_process_impl.h
+++ b/src/video_engine/vie_image_process_impl.h
@@ -12,7 +12,7 @@
 #define WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_
 
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_image_process.h"
+#include "video_engine/include/vie_image_process.h"
 #include "video_engine/vie_ref_count.h"
 #include "video_engine/vie_shared_data.h"
 
diff --git a/src/video_engine/vie_input_manager.cc b/src/video_engine/vie_input_manager.cc
index 23834eee2e..413e4b501f 100644
--- a/src/video_engine/vie_input_manager.cc
+++ b/src/video_engine/vie_input_manager.cc
@@ -19,7 +19,7 @@
 #include "system_wrappers/interface/critical_section_wrapper.h"
 #include "system_wrappers/interface/rw_lock_wrapper.h"
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_errors.h"
+#include "video_engine/include/vie_errors.h"
 #include "video_engine/vie_capturer.h"
 #include "video_engine/vie_defines.h"
 #include "video_engine/vie_file_player.h"
diff --git a/src/video_engine/vie_input_manager.h b/src/video_engine/vie_input_manager.h
index ba4d087932..a97238faf4 100644
--- a/src/video_engine/vie_input_manager.h
+++ b/src/video_engine/vie_input_manager.h
@@ -14,7 +14,7 @@
 #include "modules/video_capture/main/interface/video_capture.h"
 #include "system_wrappers/interface/map_wrapper.h"
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_capture.h"
+#include "video_engine/include/vie_capture.h"
 #include "video_engine/vie_defines.h"
 #include "video_engine/vie_frame_provider_base.h"
 #include "video_engine/vie_manager_base.h"
diff --git a/src/video_engine/vie_network_impl.cc b/src/video_engine/vie_network_impl.cc
index b3d0a489bd..dc4c4140bd 100644
--- a/src/video_engine/vie_network_impl.cc
+++ b/src/video_engine/vie_network_impl.cc
@@ -17,7 +17,7 @@
 
 #include "engine_configurations.h"
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_errors.h"
+#include "video_engine/include/vie_errors.h"
 #include "video_engine/vie_channel.h"
 #include "video_engine/vie_channel_manager.h"
 #include "video_engine/vie_defines.h"
diff --git a/src/video_engine/vie_network_impl.h b/src/video_engine/vie_network_impl.h
index 396e29df4d..691f6db793 100644
--- a/src/video_engine/vie_network_impl.h
+++ b/src/video_engine/vie_network_impl.h
@@ -12,7 +12,7 @@
 #define WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_
 
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_network.h"
+#include "video_engine/include/vie_network.h"
 #include "video_engine/vie_ref_count.h"
 #include "video_engine/vie_shared_data.h"
 
diff --git a/src/video_engine/vie_render_impl.cc b/src/video_engine/vie_render_impl.cc
index 57399c5158..4675ba9f2d 100644
--- a/src/video_engine/vie_render_impl.cc
+++ b/src/video_engine/vie_render_impl.cc
@@ -14,7 +14,7 @@
 #include "modules/video_render/main/interface/video_render.h"
 #include "modules/video_render/main/interface/video_render_defines.h"
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_errors.h"
+#include "video_engine/include/vie_errors.h"
 #include "video_engine/vie_capturer.h"
 #include "video_engine/vie_channel.h"
 #include "video_engine/vie_channel_manager.h"
diff --git a/src/video_engine/vie_render_impl.h b/src/video_engine/vie_render_impl.h
index 43dac1bb5b..fc8b6eac2a 100644
--- a/src/video_engine/vie_render_impl.h
+++ b/src/video_engine/vie_render_impl.h
@@ -13,7 +13,7 @@
 
 #include "modules/video_render/main/interface/video_render_defines.h"
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_render.h"
+#include "video_engine/include/vie_render.h"
 #include "video_engine/vie_ref_count.h"
 #include "video_engine/vie_shared_data.h"
 
diff --git a/src/video_engine/vie_renderer.h b/src/video_engine/vie_renderer.h
index 116d890922..899a82abb3 100644
--- a/src/video_engine/vie_renderer.h
+++ b/src/video_engine/vie_renderer.h
@@ -13,7 +13,7 @@
 
 #include "modules/video_render/main/interface/video_render_defines.h"
 #include "system_wrappers/interface/map_wrapper.h"
-#include "video_engine/main/interface/vie_render.h"
+#include "video_engine/include/vie_render.h"
 #include "video_engine/vie_frame_provider_base.h"
 
 namespace webrtc {
diff --git a/src/video_engine/vie_rtp_rtcp_impl.cc b/src/video_engine/vie_rtp_rtcp_impl.cc
index 78ffaa05fd..bf14646ad0 100644
--- a/src/video_engine/vie_rtp_rtcp_impl.cc
+++ b/src/video_engine/vie_rtp_rtcp_impl.cc
@@ -13,7 +13,7 @@
 #include "engine_configurations.h"
 #include "system_wrappers/interface/file_wrapper.h"
 #include "system_wrappers/interface/trace.h"
-#include "video_engine/main/interface/vie_errors.h"
+#include "video_engine/include/vie_errors.h"
 #include "video_engine/vie_channel.h"
 #include "video_engine/vie_channel_manager.h"
 #include "video_engine/vie_defines.h"
diff --git a/src/video_engine/vie_rtp_rtcp_impl.h b/src/video_engine/vie_rtp_rtcp_impl.h
index 2bd6e45e00..ef17b1c633 100644
--- a/src/video_engine/vie_rtp_rtcp_impl.h
+++ b/src/video_engine/vie_rtp_rtcp_impl.h
@@ -13,7 +13,7 @@
 
 #include "modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
 #include "typedefs.h"
-#include "video_engine/main/interface/vie_rtp_rtcp.h"
+#include "video_engine/include/vie_rtp_rtcp.h"
 #include "video_engine/vie_ref_count.h"
 #include "video_engine/vie_shared_data.h"