diff --git a/DEPS b/DEPS
index 2c9e2abd3e..780a49aa5f 100644
--- a/DEPS
+++ b/DEPS
@@ -81,12 +81,12 @@ hooks = [
     # by gyp and we use it to set Chromium related variables (inside_chromium_build)
     # to 0 and enable the standalone build.
     "pattern": ".",
-    "action": ["python", "trunk/tools/create_supplement_gypi.py", "trunk/supplement.gypi"],
+    "action": ["python", "trunk/tools/create_supplement_gypi.py", "trunk/src/supplement.gypi"],
   },
   # A change to a .gyp, .gypi, or to GYP itself should run the generator.
   {
     "pattern": ".",
-    "action": ["python", "build/gyp_chromium", "--depth=.", "trunk/webrtc.gyp"],
+    "action": ["python", "trunk/build/gyp_chromium", "--depth=.", "trunk/webrtc.gyp"],
   },
 ]
 
diff --git a/webrtc.gyp b/webrtc.gyp
index 10f32b1102..36d40641b0 100644
--- a/webrtc.gyp
+++ b/webrtc.gyp
@@ -8,22 +8,22 @@
 
 {
   'includes': [
-    'common_settings.gypi', # Common settings
+    'src/common_settings.gypi', # Common settings
   ],
  'targets': [
     {
       'target_name': 'auto_tests',
       'type': 'none',
       'dependencies': [
-        'voice_engine.gyp:voe_auto_test',
-        'video_engine.gyp:vie_auto_test',
+        'src/voice_engine.gyp:voe_auto_test',
+        'src/video_engine.gyp:vie_auto_test',
       ],
     },
     {
       'target_name': 'cmd_test',
       'type': 'none',
       'dependencies': [
-        'voice_engine.gyp:voe_cmd_test',
+        'src/voice_engine.gyp:voe_cmd_test',
       ],
     },    
     {
@@ -56,8 +56,8 @@
             'peerconnection/samples/client/main_wnd.h',
             'peerconnection/samples/client/peer_connection_client.cc',
             'peerconnection/samples/client/peer_connection_client.h',
-            '../third_party/libjingle/source/talk/base/win32socketinit.cc',
-            '../third_party/libjingle/source/talk/base/win32socketserver.cc',
+            'third_party/libjingle/source/talk/base/win32socketinit.cc',
+            'third_party/libjingle/source/talk/base/win32socketserver.cc',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
@@ -65,10 +65,10 @@
             },
           },
           'dependencies': [
-            '../third_party/libjingle/libjingle.gyp:libjingle_app',
+            'third_party/libjingle/libjingle.gyp:libjingle_app',
           ],
           'include_dirs': [
-            '../third_party/libjingle/source',
+            'third_party/libjingle/source',
           ],
         },
       ],  # targets