--- chromium/src/remoting/remoting.gyp	2010-10-03 15:13:07.746440175 +0200
+++ chromium/src/remoting/remoting.gyp	2010-10-03 15:13:07.746440175 +0200
@@ -1104,9 +1104,9 @@
         '../ui/ui.gyp:ui',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
-        '../third_party/libvpx/libvpx.gyp:libvpx',
+        '../build/linux/system.gyp:libvpx',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-        '../third_party/speex/speex.gyp:libspeex',
+        '../build/linux/system.gyp:speex',
         '../third_party/zlib/zlib.gyp:zlib',
         '../media/media.gyp:yuv_convert',
         'remoting_jingle_glue',
--- chromium/src/remoting/codec/audio_decoder_speex.cc	2010-10-03 15:13:07.746440175 +0200
+++ chromium/src/remoting/codec/audio_decoder_speex.cc	2010-10-03 15:13:07.746440175 +0200
@@ -11,9 +11,9 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "remoting/proto/audio.pb.h"
-#include "third_party/speex/speex.h"
-#include "third_party/speex/include/speex/speex_callbacks.h"
-#include "third_party/speex/include/speex/speex_stereo.h"
+#include <speex/speex.h>
+#include <speex/speex_callbacks.h>
+#include <speex/speex_stereo.h>
 
 namespace remoting {
 
--- chromium/src/remoting/codec/audio_encoder_speex.cc	2010-10-03 15:13:07.746440175 +0200
+++ chromium/src/remoting/codec/audio_encoder_speex.cc	2010-10-03 15:13:07.746440175 +0200
@@ -11,9 +11,9 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "remoting/proto/audio.pb.h"
-#include "third_party/speex/speex.h"
-#include "third_party/speex/include/speex/speex_stereo.h"
+#include <speex/speex.h>
+#include <speex/speex_stereo.h>
 
 namespace {
 // A quality of 8 in wide band mode corresponds to 27,800 bits per second.