diff --git a/webrtc/modules/audio_coding/codecs/opus/opus.gypi b/webrtc/modules/audio_coding/codecs/opus/opus.gypi
index 4b61220cf8..48c7bdff29 100644
--- a/webrtc/modules/audio_coding/codecs/opus/opus.gypi
+++ b/webrtc/modules/audio_coding/codecs/opus/opus.gypi
@@ -21,6 +21,15 @@
           'dependencies': [
             '<(opus_dir)/opus.gyp:opus'
           ],
+          'export_dependent_settings': [
+            '<(opus_dir)/opus.gyp:opus',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [  # need by Neteq audio classifier.
+              '<(opus_dir)/src/src',
+              '<(opus_dir)/src/celt',
+            ],
+          },
         }],
       ],
       'dependencies': [
diff --git a/webrtc/modules/audio_coding/neteq/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi
index ccf30ee043..e7897d5759 100644
--- a/webrtc/modules/audio_coding/neteq/neteq.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq.gypi
@@ -26,7 +26,6 @@
     ],
     'neteq_dependencies': [
       '<@(codecs)',
-      '<(opus_dir)/opus.gyp:opus',
       '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
       '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       'audio_decoder_interface',
@@ -43,21 +42,6 @@
       'defines': [
         '<@(neteq_defines)',
       ],
-      'include_dirs': [
-        # Need Opus header files for the audio classifier.
-        '<(DEPTH)/third_party/opus/src/celt',
-        '<(DEPTH)/third_party/opus/src/src',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          # Need Opus header files for the audio classifier.
-          '<(DEPTH)/third_party/opus/src/celt',
-          '<(DEPTH)/third_party/opus/src/src',
-        ],
-      },
-      'export_dependent_settings': [
-        '<(opus_dir)/opus.gyp:opus',
-      ],
       'sources': [
         'interface/neteq.h',
         'accelerate.cc',
diff --git a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
index e053eb456b..5b915df888 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
@@ -147,6 +147,7 @@
       'type': 'executable',
       'dependencies': [
         'neteq',
+        'webrtc_opus',
       ],
       'sources': [
         'test/audio_classifier_test.cc',