4 files changed, 14 insertions, 16 deletions
diff --git a/remoting/codec/audio_decoder_opus.cc b/remoting/codec/audio_decoder_opus.cc
index 888e4bc..abd3456 100644
--- a/remoting/codec/audio_decoder_opus.cc
+++ b/remoting/codec/audio_decoder_opus.cc
@@ -8,7 +8,7 @@
 #include "base/stl_util.h"
 #include "base/time.h"
 #include "remoting/proto/audio.pb.h"
-#include "third_party/opus/opus.h"
+#include "third_party/opus/src/include/opus.h"
 
 namespace remoting {
 
diff --git a/remoting/codec/audio_encoder_opus.cc b/remoting/codec/audio_encoder_opus.cc
index ab19c94..15160df 100644
--- a/remoting/codec/audio_encoder_opus.cc
+++ b/remoting/codec/audio_encoder_opus.cc
@@ -9,7 +9,7 @@
 #include "base/time.h"
 #include "media/base/audio_bus.h"
 #include "media/base/multi_channel_resampler.h"
-#include "third_party/opus/opus.h"
+#include "third_party/opus/src/include/opus.h"
 
 namespace remoting {
 
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp
index 9e2bcf8..d273aab 100644
--- a/third_party/opus/opus.gyp
+++ b/third_party/opus/opus.gyp
@@ -321,10 +321,20 @@
             'cflags': [
               '<!@(pkg-config --cflags opus)',
             ],
-            'defines': [
-              'USE_SYSTEM_OPUS',
+          },
+          'variables': {
+            'headers_root_path': 'src/include',
+            'header_filenames': [
+              'opus_custom.h',
+              'opus_defines.h',
+              'opus_multistream.h',
+              'opus_types.h',
+              'opus.h',
             ],
           },
+          'includes': [
+            '../../build/shim_headers.gypi',
+          ],
           'link_settings': {
             'ldflags': [
               '<!@(pkg-config --libs-only-L --libs-only-other opus)',
diff --git a/third_party/opus/opus.h b/third_party/opus/opus.h
deleted file mode 100644
index 8e7b483..0000000
--- a/third_party/opus/opus.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This is a shim header to include the right opus header.
-// Use this instead of referencing the opus header directly.
-
-#if defined(USE_SYSTEM_OPUS)
-#include <opus/opus.h>
-#else
-#include "third_party/opus/src/include/opus.h"
-#endif