diff --git a/src/modules/audio_device/main/interface/audio_device.h b/src/modules/audio_device/main/interface/audio_device.h
index 11490557f7..30b776d020 100644
--- a/src/modules/audio_device/main/interface/audio_device.h
+++ b/src/modules/audio_device/main/interface/audio_device.h
@@ -11,8 +11,8 @@
 #ifndef MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_
 #define MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_
 
-#include "module.h"
-#include "audio_device_defines.h"
+#include "modules/audio_device/main/interface/audio_device_defines.h"
+#include "modules/interface/module.h"
 
 namespace webrtc {
 
diff --git a/src/modules/video_capture/main/interface/video_capture_factory.h b/src/modules/video_capture/main/interface/video_capture_factory.h
index 6645662653..5a8f741418 100644
--- a/src/modules/video_capture/main/interface/video_capture_factory.h
+++ b/src/modules/video_capture/main/interface/video_capture_factory.h
@@ -14,7 +14,7 @@
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_INTERFACE_VIDEO_CAPTURE_FACTORY_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_INTERFACE_VIDEO_CAPTURE_FACTORY_H_
 
-#include "video_capture.h"
+#include "modules/video_capture/main/interface/video_capture.h"
 
 namespace webrtc {
 
diff --git a/src/modules/video_render/main/interface/video_render.h b/src/modules/video_render/main/interface/video_render.h
index a0a5126e20..4fc7f2ca7b 100644
--- a/src/modules/video_render/main/interface/video_render.h
+++ b/src/modules/video_render/main/interface/video_render.h
@@ -20,8 +20,8 @@
  *
  */
 
-#include "module.h"
-#include "video_render_defines.h"
+#include "modules/interface/module.h"
+#include "modules/video_render/main/interface/video_render_defines.h"
 
 namespace webrtc {
 
diff --git a/src/modules/video_render/main/interface/video_render_defines.h b/src/modules/video_render/main/interface/video_render_defines.h
index 2a87f3f0e9..b1034a64a8 100644
--- a/src/modules/video_render/main/interface/video_render_defines.h
+++ b/src/modules/video_render/main/interface/video_render_defines.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -13,7 +13,7 @@
 
 // Includes
 #include "common_types.h"
-#include "module_common_types.h"
+#include "modules/interface/module_common_types.h"
 
 namespace webrtc
 {
diff --git a/src/voice_engine/include/mock/mock_voe_connection_observer.h b/src/voice_engine/include/mock/mock_voe_connection_observer.h
index 9eb92719ee..62e572e767 100644
--- a/src/voice_engine/include/mock/mock_voe_connection_observer.h
+++ b/src/voice_engine/include/mock/mock_voe_connection_observer.h
@@ -11,7 +11,7 @@
 #ifndef MOCK_VOE_CONNECTION_OBSERVER_H_
 #define MOCK_VOE_CONNECTION_OBSERVER_H_
 
-#include "voe_network.h"
+#include "voice_engine/include/voe_network.h"
 
 namespace webrtc {
 
diff --git a/src/voice_engine/include/mock/mock_voe_observer.h b/src/voice_engine/include/mock/mock_voe_observer.h
index 70d1c13838..c01320d6bd 100644
--- a/src/voice_engine/include/mock/mock_voe_observer.h
+++ b/src/voice_engine/include/mock/mock_voe_observer.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_VOICE_ENGINE_MOCK_VOE_OBSERVER_H_
 #define WEBRTC_VOICE_ENGINE_MOCK_VOE_OBSERVER_H_
 
-#include "voe_base.h"
 #include "gmock/gmock.h"
+#include "voice_engine/include/voe_base.h"
 
 namespace webrtc {