Remove Opus extra includes

Remove the extra directories to include that were needed by the Opus
library. Now the lib includes more specific paths to avoid those.

59 files changed, 278 insertions, 278 deletions

diff --git a/drivers/opus/celt/_kiss_fft_guts.h b/drivers/opus/celt/_kiss_fft_guts.h
index 21bea8a9b0..2a4ee744ef 100644
--- a/drivers/opus/celt/_kiss_fft_guts.h
+++ b/drivers/opus/celt/_kiss_fft_guts.h
@@ -33,7 +33,7 @@
    defines kiss_fft_scalar as either short or a float type
    and defines
    typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
-#include "kiss_fft.h"
+#include "opus/celt/kiss_fft.h"
 
 /*
   Explanation of macros dealing with complex math:
@@ -45,7 +45,7 @@
    C_ADDTO( res , a)    : res += a
  * */
 #ifdef OPUS_FIXED_POINT
-#include "arch.h"
+#include "opus/celt/arch.h"
 
 
 #define SAMP_MAX 2147483647
diff --git a/drivers/opus/celt/arch.h b/drivers/opus/celt/arch.h
index 83e3705000..d964f8d90c 100644
--- a/drivers/opus/celt/arch.h
+++ b/drivers/opus/celt/arch.h
@@ -34,8 +34,8 @@
 #ifndef ARCH_H
 #define ARCH_H
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "opus/opus_types.h"
+#include "opus/opus_defines.h"
 
 # if !defined(__GNUC_PREREQ)
 #  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
@@ -109,10 +109,10 @@ typedef opus_val32 celt_ener;
 #define SCALEOUT(a)     (a)
 
 #ifdef FIXED_DEBUG
-#include "fixed_debug.h"
+#include "opus/celt/fixed_debug.h"
 #else
 
-#include "fixed_generic.h"
+#include "opus/celt/fixed_generic.h"
 
 #ifdef OPUS_ARM_INLINE_EDSP
 #include "arm/fixed_armv5e.h"
diff --git a/drivers/opus/celt/arm/arm_celt_map.c b/drivers/opus/celt/arm/arm_celt_map.c
index b187345154..7c8b62f5c9 100644
--- a/drivers/opus/celt/arm/arm_celt_map.c
+++ b/drivers/opus/celt/arm/arm_celt_map.c
@@ -26,10 +26,10 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
-#include "pitch.h"
+#include "opus/celt/pitch.h"
 
 #if defined(OPUS_HAVE_RTCD)
 
diff --git a/drivers/opus/celt/arm/armcpu.c b/drivers/opus/celt/arm/armcpu.c
index 7f0af631b9..a464820658 100644
--- a/drivers/opus/celt/arm/armcpu.c
+++ b/drivers/opus/celt/arm/armcpu.c
@@ -28,15 +28,15 @@
 /* Original code from libtheora modified to suit to Opus */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #ifdef OPUS_HAVE_RTCD
 
-#include "armcpu.h"
-#include "cpu_support.h"
-#include "os_support.h"
-#include "opus_types.h"
+#include "opus/celt/arm/armcpu.h"
+#include "opus/celt/cpu_support.h"
+#include "opus/celt/os_support.h"
+#include "opus/opus_types.h"
 
 #define OPUS_CPU_ARM_V4    (1)
 #define OPUS_CPU_ARM_EDSP  (1<<1)
diff --git a/drivers/opus/celt/arm/fixed_armv5e.h b/drivers/opus/celt/arm/fixed_armv5e.h
index 1194a7d3ec..cb6e4c1da9 100644
--- a/drivers/opus/celt/arm/fixed_armv5e.h
+++ b/drivers/opus/celt/arm/fixed_armv5e.h
@@ -30,7 +30,7 @@
 #ifndef FIXED_ARMv5E_H
 #define FIXED_ARMv5E_H
 
-#include "fixed_armv4.h"
+#include "opus/celt/arm/fixed_armv4.h"
 
 /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
 #undef MULT16_32_Q16
diff --git a/drivers/opus/celt/arm/pitch_arm.h b/drivers/opus/celt/arm/pitch_arm.h
index df5e82ef0b..18d1f2e75e 100644
--- a/drivers/opus/celt/arm/pitch_arm.h
+++ b/drivers/opus/celt/arm/pitch_arm.h
@@ -28,7 +28,7 @@
 #if !defined(PITCH_ARM_H)
 # define PITCH_ARM_H
 
-# include "armcpu.h"
+# include "opus/celt/arm/armcpu.h"
 
 # if defined(OPUS_FIXED_POINT)
 
diff --git a/drivers/opus/celt/bands.c b/drivers/opus/celt/bands.c
index 87280c8333..49120f16da 100644
--- a/drivers/opus/celt/bands.c
+++ b/drivers/opus/celt/bands.c
@@ -28,20 +28,20 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #include <math.h>
-#include "bands.h"
-#include "opus_modes.h"
-#include "vq.h"
-#include "cwrs.h"
-#include "stack_alloc.h"
-#include "os_support.h"
-#include "mathops.h"
-#include "rate.h"
-#include "quant_bands.h"
-#include "pitch.h"
+#include "opus/celt/bands.h"
+#include "opus/celt/opus_modes.h"
+#include "opus/celt/vq.h"
+#include "opus/celt/cwrs.h"
+#include "opus/celt/stack_alloc.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/mathops.h"
+#include "opus/celt/rate.h"
+#include "opus/celt/quant_bands.h"
+#include "opus/celt/pitch.h"
 
 int hysteresis_decision(opus_val16 val, const opus_val16 *thresholds, const opus_val16 *hysteresis, int N, int prev)
 {
diff --git a/drivers/opus/celt/bands.h b/drivers/opus/celt/bands.h
index fe1e47097a..1ef7cbc8ee 100644
--- a/drivers/opus/celt/bands.h
+++ b/drivers/opus/celt/bands.h
@@ -30,11 +30,11 @@
 #ifndef BANDS_H
 #define BANDS_H
 
-#include "arch.h"
-#include "opus_modes.h"
-#include "entenc.h"
-#include "entdec.h"
-#include "rate.h"
+#include "opus/celt/arch.h"
+#include "opus/celt/opus_modes.h"
+#include "opus/celt/entenc.h"
+#include "opus/celt/entdec.h"
+#include "opus/celt/rate.h"
 
 /** Compute the amplitude (sqrt energy) in each of the bands
  * @param m Mode data
diff --git a/drivers/opus/celt/celt.c b/drivers/opus/celt/celt.c
index b894e1e13f..8ff9239844 100644
--- a/drivers/opus/celt/celt.c
+++ b/drivers/opus/celt/celt.c
@@ -28,27 +28,27 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #define CELT_C
 
-#include "os_support.h"
-#include "mdct.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/mdct.h"
 #include <math.h>
-#include "celt.h"
-#include "pitch.h"
-#include "bands.h"
-#include "opus_modes.h"
-#include "entcode.h"
-#include "quant_bands.h"
-#include "rate.h"
-#include "stack_alloc.h"
-#include "mathops.h"
-#include "float_cast.h"
+#include "opus/celt/celt.h"
+#include "opus/celt/pitch.h"
+#include "opus/celt/bands.h"
+#include "opus/celt/opus_modes.h"
+#include "opus/celt/entcode.h"
+#include "opus/celt/quant_bands.h"
+#include "opus/celt/rate.h"
+#include "opus/celt/stack_alloc.h"
+#include "opus/celt/mathops.h"
+#include "opus/celt/float_cast.h"
 #include <stdarg.h>
-#include "celt_lpc.h"
-#include "vq.h"
+#include "opus/celt/celt_lpc.h"
+#include "opus/celt/vq.h"
 
 #ifndef PACKAGE_VERSION
 #define PACKAGE_VERSION "unknown"
diff --git a/drivers/opus/celt/celt.h b/drivers/opus/celt/celt.h
index 5deea1f0aa..2b7dc3fa72 100644
--- a/drivers/opus/celt/celt.h
+++ b/drivers/opus/celt/celt.h
@@ -35,12 +35,12 @@
 #ifndef CELT_H
 #define CELT_H
 
-#include "opus_types.h"
-#include "opus_defines.h"
-#include "opus_custom.h"
-#include "entenc.h"
-#include "entdec.h"
-#include "arch.h"
+#include "opus/opus_types.h"
+#include "opus/opus_defines.h"
+#include "opus/opus_custom.h"
+#include "opus/celt/entenc.h"
+#include "opus/celt/entdec.h"
+#include "opus/celt/arch.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/opus/celt/celt_decoder.c b/drivers/opus/celt/celt_decoder.c
index 93791feab4..5c00179c00 100644
--- a/drivers/opus/celt/celt_decoder.c
+++ b/drivers/opus/celt/celt_decoder.c
@@ -28,28 +28,28 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #define CELT_DECODER_C
 
-#include "cpu_support.h"
-#include "os_support.h"
-#include "mdct.h"
+#include "opus/celt/cpu_support.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/mdct.h"
 #include <math.h>
-#include "celt.h"
-#include "pitch.h"
-#include "bands.h"
-#include "opus_modes.h"
-#include "entcode.h"
-#include "quant_bands.h"
-#include "rate.h"
-#include "stack_alloc.h"
-#include "mathops.h"
-#include "float_cast.h"
+#include "opus/celt/celt.h"
+#include "opus/celt/pitch.h"
+#include "opus/celt/bands.h"
+#include "opus/celt/opus_modes.h"
+#include "opus/celt/entcode.h"
+#include "opus/celt/quant_bands.h"
+#include "opus/celt/rate.h"
+#include "opus/celt/stack_alloc.h"
+#include "opus/celt/mathops.h"
+#include "opus/celt/float_cast.h"
 #include <stdarg.h>
-#include "celt_lpc.h"
-#include "vq.h"
+#include "opus/celt/celt_lpc.h"
+#include "opus/celt/vq.h"
 
 /**********************************************************************/
 /*                                                                    */
diff --git a/drivers/opus/celt/celt_encoder.c b/drivers/opus/celt/celt_encoder.c
index a61e41f42d..508a35321a 100644
--- a/drivers/opus/celt/celt_encoder.c
+++ b/drivers/opus/celt/celt_encoder.c
@@ -28,28 +28,28 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #define CELT_ENCODER_C
 
-#include "cpu_support.h"
-#include "os_support.h"
-#include "mdct.h"
+#include "opus/celt/cpu_support.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/mdct.h"
 #include <math.h>
-#include "celt.h"
-#include "pitch.h"
-#include "bands.h"
-#include "opus_modes.h"
-#include "entcode.h"
-#include "quant_bands.h"
-#include "rate.h"
-#include "stack_alloc.h"
-#include "mathops.h"
-#include "float_cast.h"
+#include "opus/celt/celt.h"
+#include "opus/celt/pitch.h"
+#include "opus/celt/bands.h"
+#include "opus/celt/opus_modes.h"
+#include "opus/celt/entcode.h"
+#include "opus/celt/quant_bands.h"
+#include "opus/celt/rate.h"
+#include "opus/celt/stack_alloc.h"
+#include "opus/celt/mathops.h"
+#include "opus/celt/float_cast.h"
 #include <stdarg.h>
-#include "celt_lpc.h"
-#include "vq.h"
+#include "opus/celt/celt_lpc.h"
+#include "opus/celt/vq.h"
 
 
 /** Encoder state
diff --git a/drivers/opus/celt/celt_lpc.c b/drivers/opus/celt/celt_lpc.c
index 1fa4406bc9..32735230a2 100644
--- a/drivers/opus/celt/celt_lpc.c
+++ b/drivers/opus/celt/celt_lpc.c
@@ -26,13 +26,13 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
-#include "celt_lpc.h"
-#include "stack_alloc.h"
-#include "mathops.h"
-#include "pitch.h"
+#include "opus/celt/celt_lpc.h"
+#include "opus/celt/stack_alloc.h"
+#include "opus/celt/mathops.h"
+#include "opus/celt/pitch.h"
 
 void _celt_lpc(
       opus_val16       *_lpc, /* out: [0...p-1] LPC coefficients      */
diff --git a/drivers/opus/celt/celt_lpc.h b/drivers/opus/celt/celt_lpc.h
index dc2a0a3d26..12bb78a6fd 100644
--- a/drivers/opus/celt/celt_lpc.h
+++ b/drivers/opus/celt/celt_lpc.h
@@ -28,7 +28,7 @@
 #ifndef PLC_H
 #define PLC_H
 
-#include "arch.h"
+#include "opus/celt/arch.h"
 
 #define LPC_ORDER 24
 
diff --git a/drivers/opus/celt/cpu_support.h b/drivers/opus/celt/cpu_support.h
index d68dbe62c5..f682a1d19e 100644
--- a/drivers/opus/celt/cpu_support.h
+++ b/drivers/opus/celt/cpu_support.h
@@ -28,8 +28,8 @@
 #ifndef CPU_SUPPORT_H
 #define CPU_SUPPORT_H
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "opus/opus_types.h"
+#include "opus/opus_defines.h"
 
 #if defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_ASM)
 #include "arm/armcpu.h"
diff --git a/drivers/opus/celt/cwrs.c b/drivers/opus/celt/cwrs.c
index b866aa9210..2b7987a8e9 100644
--- a/drivers/opus/celt/cwrs.c
+++ b/drivers/opus/celt/cwrs.c
@@ -28,13 +28,13 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
-#include "os_support.h"
-#include "cwrs.h"
-#include "mathops.h"
-#include "arch.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/cwrs.h"
+#include "opus/celt/mathops.h"
+#include "opus/celt/arch.h"
 
 #ifdef CUSTOM_MODES
 
diff --git a/drivers/opus/celt/cwrs.h b/drivers/opus/celt/cwrs.h
index 7dfbd076d1..5400afa6a4 100644
--- a/drivers/opus/celt/cwrs.h
+++ b/drivers/opus/celt/cwrs.h
@@ -30,10 +30,10 @@
 #ifndef CWRS_H
 #define CWRS_H
 
-#include "arch.h"
-#include "stack_alloc.h"
-#include "entenc.h"
-#include "entdec.h"
+#include "opus/celt/arch.h"
+#include "opus/celt/stack_alloc.h"
+#include "opus/celt/entenc.h"
+#include "opus/celt/entdec.h"
 
 #ifdef CUSTOM_MODES
 int log2_frac(opus_uint32 val, int frac);
diff --git a/drivers/opus/celt/ecintrin.h b/drivers/opus/celt/ecintrin.h
index 2263cff6bd..6ed8fb280e 100644
--- a/drivers/opus/celt/ecintrin.h
+++ b/drivers/opus/celt/ecintrin.h
@@ -26,10 +26,10 @@
 */
 
 /*Some common macros for potential platform-specific optimization.*/
-#include "opus_types.h"
+#include "opus/opus_types.h"
 #include <math.h>
 #include <limits.h>
-#include "arch.h"
+#include "opus/celt/arch.h"
 #if !defined(_ecintrin_H)
 # define _ecintrin_H (1)
 
diff --git a/drivers/opus/celt/entcode.c b/drivers/opus/celt/entcode.c
index fd817a9db5..e8e30f32c8 100644
--- a/drivers/opus/celt/entcode.c
+++ b/drivers/opus/celt/entcode.c
@@ -26,11 +26,11 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
-#include "entcode.h"
-#include "arch.h"
+#include "opus/celt/entcode.h"
+#include "opus/celt/arch.h"
 
 #if !defined(EC_CLZ)
 /*This is a fallback for systems where we don't know how to access
diff --git a/drivers/opus/celt/entcode.h b/drivers/opus/celt/entcode.h
index dd13e49e50..c129f9b7d9 100644
--- a/drivers/opus/celt/entcode.h
+++ b/drivers/opus/celt/entcode.h
@@ -25,14 +25,14 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "opus/opus_types.h"
+#include "opus/opus_defines.h"
 
 #if !defined(_entcode_H)
 # define _entcode_H (1)
 # include <limits.h>
 # include <stddef.h>
-# include "ecintrin.h"
+# include "opus/celt/ecintrin.h"
 
 /*OPT: ec_window must be at least 32 bits, but if you have fast arithmetic on a
    larger type, you can speed up the decoder by using it here.*/
diff --git a/drivers/opus/celt/entdec.c b/drivers/opus/celt/entdec.c
index 383da571c9..cea754aab9 100644
--- a/drivers/opus/celt/entdec.c
+++ b/drivers/opus/celt/entdec.c
@@ -26,14 +26,14 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #include <stddef.h>
-#include "os_support.h"
-#include "arch.h"
-#include "entdec.h"
-#include "mfrngcod.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/arch.h"
+#include "opus/celt/entdec.h"
+#include "opus/celt/mfrngcod.h"
 
 /*A range decoder.
   This is an entropy decoder based upon \cite{Mar79}, which is itself a
diff --git a/drivers/opus/celt/entdec.h b/drivers/opus/celt/entdec.h
index d8ab318730..fda60ab326 100644
--- a/drivers/opus/celt/entdec.h
+++ b/drivers/opus/celt/entdec.h
@@ -28,7 +28,7 @@
 #if !defined(_entdec_H)
 # define _entdec_H (1)
 # include <limits.h>
-# include "entcode.h"
+# include "opus/celt/entcode.h"
 
 /*Initializes the decoder.
   _buf: The input buffer to use.
diff --git a/drivers/opus/celt/entenc.c b/drivers/opus/celt/entenc.c
index 299329c63f..87634ee62e 100644
--- a/drivers/opus/celt/entenc.c
+++ b/drivers/opus/celt/entenc.c
@@ -26,12 +26,12 @@
 */
 
 #if defined(OPUS_HAVE_CONFIG_H)
-# include "opus_config.h"
+# include "opus/opus_config.h"
 #endif
-#include "os_support.h"
-#include "arch.h"
-#include "entenc.h"
-#include "mfrngcod.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/arch.h"
+#include "opus/celt/entenc.h"
+#include "opus/celt/mfrngcod.h"
 
 /*A range encoder.
   See entdec.c and the references for implementation details \cite{Mar79,MNW98}.
diff --git a/drivers/opus/celt/entenc.h b/drivers/opus/celt/entenc.h
index 796bc4d572..3f4a3acc93 100644
--- a/drivers/opus/celt/entenc.h
+++ b/drivers/opus/celt/entenc.h
@@ -28,7 +28,7 @@
 #if !defined(_entenc_H)
 # define _entenc_H (1)
 # include <stddef.h>
-# include "entcode.h"
+# include "opus/celt/entcode.h"
 
 /*Initializes the encoder.
   _buf:  The buffer to store output bytes in.
diff --git a/drivers/opus/celt/fixed_debug.h b/drivers/opus/celt/fixed_debug.h
index 80bc94910f..0ed16baa17 100644
--- a/drivers/opus/celt/fixed_debug.h
+++ b/drivers/opus/celt/fixed_debug.h
@@ -33,7 +33,7 @@
 #define FIXED_DEBUG_H
 
 #include <stdio.h>
-#include "opus_defines.h"
+#include "opus/opus_defines.h"
 
 #ifdef CELT_C
 OPUS_EXPORT opus_int64 celt_mips=0;
diff --git a/drivers/opus/celt/float_cast.h b/drivers/opus/celt/float_cast.h
index ede6574860..86e80a93ff 100644
--- a/drivers/opus/celt/float_cast.h
+++ b/drivers/opus/celt/float_cast.h
@@ -30,7 +30,7 @@
 #define FLOAT_CAST_H
 
 
-#include "arch.h"
+#include "opus/celt/arch.h"
 
 /*============================================================================
 **      On Intel Pentium processors (especially PIII and probably P4), converting
diff --git a/drivers/opus/celt/kiss_fft.c b/drivers/opus/celt/kiss_fft.c
index 333be975d1..8fc2db19c6 100644
--- a/drivers/opus/celt/kiss_fft.c
+++ b/drivers/opus/celt/kiss_fft.c
@@ -31,15 +31,15 @@
 
 #ifndef SKIP_CONFIG_H
 #  ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #  endif
 #endif
 
-#include "_kiss_fft_guts.h"
-#include "arch.h"
-#include "os_support.h"
-#include "mathops.h"
-#include "stack_alloc.h"
+#include "opus/celt/_kiss_fft_guts.h"
+#include "opus/celt/arch.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/mathops.h"
+#include "opus/celt/stack_alloc.h"
 
 /* The guts header contains all the multiplication and addition macros that are defined for
    complex numbers.  It also delares the kf_ internal functions.
diff --git a/drivers/opus/celt/kiss_fft.h b/drivers/opus/celt/kiss_fft.h
index aa22b3a419..db2532c692 100644
--- a/drivers/opus/celt/kiss_fft.h
+++ b/drivers/opus/celt/kiss_fft.h
@@ -31,7 +31,7 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include "arch.h"
+#include "opus/celt/arch.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,7 +46,7 @@ extern "C" {
 #endif
 
 #ifdef OPUS_FIXED_POINT
-#include "arch.h"
+#include "opus/celt/arch.h"
 
 #  define kiss_fft_scalar opus_int32
 #  define kiss_twiddle_scalar opus_int16
diff --git a/drivers/opus/celt/laplace.c b/drivers/opus/celt/laplace.c
index c6d293f298..91ae921b82 100644
--- a/drivers/opus/celt/laplace.c
+++ b/drivers/opus/celt/laplace.c
@@ -27,11 +27,11 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
-#include "laplace.h"
-#include "mathops.h"
+#include "opus/celt/laplace.h"
+#include "opus/celt/mathops.h"
 
 /* The minimum probability of an energy delta (out of 32768). */
 #define LAPLACE_LOG_MINP (0)
diff --git a/drivers/opus/celt/laplace.h b/drivers/opus/celt/laplace.h
index 46c14b5da5..9efcc73aa2 100644
--- a/drivers/opus/celt/laplace.h
+++ b/drivers/opus/celt/laplace.h
@@ -26,8 +26,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "entenc.h"
-#include "entdec.h"
+#include "opus/celt/entenc.h"
+#include "opus/celt/entdec.h"
 
 /** Encode a value that is assumed to be the realisation of a
     Laplace-distributed random process
diff --git a/drivers/opus/celt/mathops.c b/drivers/opus/celt/mathops.c
index 49be746d8c..c72a093ed5 100644
--- a/drivers/opus/celt/mathops.c
+++ b/drivers/opus/celt/mathops.c
@@ -32,10 +32,10 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
-#include "mathops.h"
+#include "opus/celt/mathops.h"
 
 /*Compute floor(sqrt(_val)) with exact arithmetic.
   This has been tested on all possible 32-bit inputs.*/
diff --git a/drivers/opus/celt/mathops.h b/drivers/opus/celt/mathops.h
index 4a6bc539bc..759f58d1b7 100644
--- a/drivers/opus/celt/mathops.h
+++ b/drivers/opus/celt/mathops.h
@@ -34,9 +34,9 @@
 #ifndef MATHOPS_H
 #define MATHOPS_H
 
-#include "arch.h"
-#include "entcode.h"
-#include "os_support.h"
+#include "opus/celt/arch.h"
+#include "opus/celt/entcode.h"
+#include "opus/celt/os_support.h"
 
 /* Multiplies two 16-bit fractional values. Bit-exactness of this macro is important */
 #define FRAC_MUL16(a,b) ((16384+((opus_int32)(opus_int16)(a)*(opus_int16)(b)))>>15)
@@ -141,7 +141,7 @@ static OPUS_INLINE float celt_exp2(float x)
 
 #ifdef OPUS_FIXED_POINT
 
-#include "os_support.h"
+#include "opus/celt/os_support.h"
 
 #ifndef OVERRIDE_CELT_ILOG2
 /** Integer log in base2. Undefined for zero and negative numbers */
diff --git a/drivers/opus/celt/mdct.c b/drivers/opus/celt/mdct.c
index d08d026fac..b4371aef94 100644
--- a/drivers/opus/celt/mdct.c
+++ b/drivers/opus/celt/mdct.c
@@ -41,17 +41,17 @@
 
 #ifndef SKIP_CONFIG_H
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 #endif
 
-#include "mdct.h"
-#include "kiss_fft.h"
-#include "_kiss_fft_guts.h"
+#include "opus/celt/mdct.h"
+#include "opus/celt/kiss_fft.h"
+#include "opus/celt/_kiss_fft_guts.h"
 #include <math.h>
-#include "os_support.h"
-#include "mathops.h"
-#include "stack_alloc.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/mathops.h"
+#include "opus/celt/stack_alloc.h"
 
 #ifdef CUSTOM_MODES
 
diff --git a/drivers/opus/celt/mdct.h b/drivers/opus/celt/mdct.h
index 4e7a199246..492afeae1e 100644
--- a/drivers/opus/celt/mdct.h
+++ b/drivers/opus/celt/mdct.h
@@ -42,9 +42,9 @@
 #ifndef MDCT_H
 #define MDCT_H
 
-#include "opus_defines.h"
-#include "kiss_fft.h"
-#include "arch.h"
+#include "opus/opus_defines.h"
+#include "opus/celt/kiss_fft.h"
+#include "opus/celt/arch.h"
 
 typedef struct {
    int n;
diff --git a/drivers/opus/celt/mfrngcod.h b/drivers/opus/celt/mfrngcod.h
index 809152a59a..c24d98cde2 100644
--- a/drivers/opus/celt/mfrngcod.h
+++ b/drivers/opus/celt/mfrngcod.h
@@ -27,7 +27,7 @@
 
 #if !defined(_mfrngcode_H)
 # define _mfrngcode_H (1)
-# include "entcode.h"
+# include "opus/celt/entcode.h"
 
 /*Constants used by the entropy encoder/decoder.*/
 
diff --git a/drivers/opus/celt/modes.c b/drivers/opus/celt/modes.c
index 3794074aaa..3e085ad06b 100644
--- a/drivers/opus/celt/modes.c
+++ b/drivers/opus/celt/modes.c
@@ -28,15 +28,15 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
-#include "celt.h"
-#include "opus_modes.h"
-#include "rate.h"
-#include "os_support.h"
-#include "stack_alloc.h"
-#include "quant_bands.h"
+#include "opus/celt/celt.h"
+#include "opus/celt/opus_modes.h"
+#include "opus/celt/rate.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/stack_alloc.h"
+#include "opus/celt/quant_bands.h"
 
 static const opus_int16 eband5ms[] = {
 /*0  200 400 600 800  1k 1.2 1.4 1.6  2k 2.4 2.8 3.2  4k 4.8 5.6 6.8  8k 9.6 12k 15.6 */
@@ -63,9 +63,9 @@ static const unsigned char band_allocation[] = {
 
 #ifndef CUSTOM_MODES_ONLY
  #ifdef OPUS_FIXED_POINT
-  #include "static_modes_fixed.h"
+  #include "opus/celt/static_modes_fixed.h"
  #else
-  #include "static_modes_float.h"
+  #include "opus/celt/static_modes_float.h"
  #endif
 #endif /* CUSTOM_MODES_ONLY */
 
diff --git a/drivers/opus/celt/opus_custom_demo.c b/drivers/opus/celt/opus_custom_demo.c
index 8c7f58b6e6..2431fd5819 100644
--- a/drivers/opus/celt/opus_custom_demo.c
+++ b/drivers/opus/celt/opus_custom_demo.c
@@ -27,11 +27,11 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
-#include "opus_custom.h"
-#include "arch.h"
+#include "opus/opus_custom.h"
+#include "opus/celt/arch.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/drivers/opus/celt/opus_modes.h b/drivers/opus/celt/opus_modes.h
index a1df46265e..38e5844535 100644
--- a/drivers/opus/celt/opus_modes.h
+++ b/drivers/opus/celt/opus_modes.h
@@ -30,12 +30,12 @@
 #ifndef OPUS_MODES_H
 #define OPUS_MODES_H
 
-#include "opus_types.h"
-#include "celt.h"
-#include "arch.h"
-#include "mdct.h"
-#include "entenc.h"
-#include "entdec.h"
+#include "opus/opus_types.h"
+#include "opus/celt/celt.h"
+#include "opus/celt/arch.h"
+#include "opus/celt/mdct.h"
+#include "opus/celt/entenc.h"
+#include "opus/celt/entdec.h"
 
 #define MAX_PERIOD 1024
 
diff --git a/drivers/opus/celt/os_support.h b/drivers/opus/celt/os_support.h
index 5e47e3cff9..e1cf884467 100644
--- a/drivers/opus/celt/os_support.h
+++ b/drivers/opus/celt/os_support.h
@@ -35,8 +35,8 @@
 #  include "custom_support.h"
 #endif
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "opus/opus_types.h"
+#include "opus/opus_defines.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/drivers/opus/celt/pitch.c b/drivers/opus/celt/pitch.c
index 48cd02fb2b..011297f651 100644
--- a/drivers/opus/celt/pitch.c
+++ b/drivers/opus/celt/pitch.c
@@ -32,15 +32,15 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
-#include "pitch.h"
-#include "os_support.h"
-#include "opus_modes.h"
-#include "stack_alloc.h"
-#include "mathops.h"
-#include "celt_lpc.h"
+#include "opus/celt/pitch.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/opus_modes.h"
+#include "opus/celt/stack_alloc.h"
+#include "opus/celt/mathops.h"
+#include "opus/celt/celt_lpc.h"
 
 static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
                             int max_pitch, int *best_pitch
diff --git a/drivers/opus/celt/pitch.h b/drivers/opus/celt/pitch.h
index 3a7d305425..f599f5fc76 100644
--- a/drivers/opus/celt/pitch.h
+++ b/drivers/opus/celt/pitch.h
@@ -34,8 +34,8 @@
 #ifndef PITCH_H
 #define PITCH_H
 
-#include "opus_modes.h"
-#include "cpu_support.h"
+#include "opus/celt/opus_modes.h"
+#include "opus/celt/cpu_support.h"
 
 #if defined(__SSE__) && !defined(OPUS_FIXED_POINT)
 #include "x86/pitch_sse.h"
diff --git a/drivers/opus/celt/quant_bands.c b/drivers/opus/celt/quant_bands.c
index 0a170e850d..bc059848b4 100644
--- a/drivers/opus/celt/quant_bands.c
+++ b/drivers/opus/celt/quant_bands.c
@@ -27,17 +27,17 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
-#include "quant_bands.h"
-#include "laplace.h"
+#include "opus/celt/quant_bands.h"
+#include "opus/celt/laplace.h"
 #include <math.h>
-#include "os_support.h"
-#include "arch.h"
-#include "mathops.h"
-#include "stack_alloc.h"
-#include "rate.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/arch.h"
+#include "opus/celt/mathops.h"
+#include "opus/celt/stack_alloc.h"
+#include "opus/celt/rate.h"
 
 #ifdef OPUS_FIXED_POINT
 /* Mean energy in each band quantized in Q4 */
diff --git a/drivers/opus/celt/quant_bands.h b/drivers/opus/celt/quant_bands.h
index 840df8723f..85d011e6e0 100644
--- a/drivers/opus/celt/quant_bands.h
+++ b/drivers/opus/celt/quant_bands.h
@@ -29,11 +29,11 @@
 #ifndef QUANT_BANDS
 #define QUANT_BANDS
 
-#include "arch.h"
-#include "opus_modes.h"
-#include "entenc.h"
-#include "entdec.h"
-#include "mathops.h"
+#include "opus/celt/arch.h"
+#include "opus/celt/opus_modes.h"
+#include "opus/celt/entenc.h"
+#include "opus/celt/entdec.h"
+#include "opus/celt/mathops.h"
 
 #ifdef OPUS_FIXED_POINT
 extern const signed char eMeans[25];
diff --git a/drivers/opus/celt/rate.c b/drivers/opus/celt/rate.c
index cca585ad95..c314d63f6c 100644
--- a/drivers/opus/celt/rate.c
+++ b/drivers/opus/celt/rate.c
@@ -27,17 +27,17 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #include <math.h>
-#include "opus_modes.h"
-#include "cwrs.h"
-#include "arch.h"
-#include "os_support.h"
+#include "opus/celt/opus_modes.h"
+#include "opus/celt/cwrs.h"
+#include "opus/celt/arch.h"
+#include "opus/celt/os_support.h"
 
-#include "entcode.h"
-#include "rate.h"
+#include "opus/celt/entcode.h"
+#include "opus/celt/rate.h"
 
 static const unsigned char LOG2_FRAC_TABLE[24]={
    0,
diff --git a/drivers/opus/celt/rate.h b/drivers/opus/celt/rate.h
index 7ced23ea09..e12dd29db8 100644
--- a/drivers/opus/celt/rate.h
+++ b/drivers/opus/celt/rate.h
@@ -40,8 +40,8 @@
 #define QTHETA_OFFSET 4
 #define QTHETA_OFFSET_TWOPHASE 16
 
-#include "cwrs.h"
-#include "opus_modes.h"
+#include "opus/celt/cwrs.h"
+#include "opus/celt/opus_modes.h"
 
 void compute_pulse_cache(CELTMode *m, int LM);
 
diff --git a/drivers/opus/celt/stack_alloc.h b/drivers/opus/celt/stack_alloc.h
index d500c4dab9..464a6d0b7f 100644
--- a/drivers/opus/celt/stack_alloc.h
+++ b/drivers/opus/celt/stack_alloc.h
@@ -32,8 +32,8 @@
 #ifndef STACK_ALLOC_H
 #define STACK_ALLOC_H
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "opus/opus_types.h"
+#include "opus/opus_defines.h"
 
 #if (!defined (VAR_ARRAYS) && !defined (USE_ALLOCA) && !defined (NONTHREADSAFE_PSEUDOSTACK))
 #define VAR_ARRAYS
@@ -149,7 +149,7 @@ extern char *global_stack_top;
 
 #endif /* ENABLE_VALGRIND */
 
-#include "os_support.h"
+#include "opus/celt/os_support.h"
 #define VARDECL(type, var) type *var
 #define ALLOC(var, size, type) var = PUSH(global_stack, size, type)
 #define SAVE_STACK char *_saved_stack = global_stack;
diff --git a/drivers/opus/celt/static_modes_fixed.h b/drivers/opus/celt/static_modes_fixed.h
index d23e2a66f5..1d92fc4b27 100644
--- a/drivers/opus/celt/static_modes_fixed.h
+++ b/drivers/opus/celt/static_modes_fixed.h
@@ -1,8 +1,8 @@
 /* The contents of this file was automatically generated by dump_modes.c
    with arguments: 48000 960
    It contains static definitions for some pre-defined modes. */
-#include "opus_modes.h"
-#include "rate.h"
+#include "opus/celt/opus_modes.h"
+#include "opus/celt/rate.h"
 
 #ifndef DEF_WINDOW120
 #define DEF_WINDOW120
diff --git a/drivers/opus/celt/static_modes_float.h b/drivers/opus/celt/static_modes_float.h
index fe6bb4c8a3..362be6cca8 100644
--- a/drivers/opus/celt/static_modes_float.h
+++ b/drivers/opus/celt/static_modes_float.h
@@ -1,8 +1,8 @@
 /* The contents of this file was automatically generated by dump_modes.c
    with arguments: 48000 960
    It contains static definitions for some pre-defined modes. */
-#include "opus_modes.h"
-#include "rate.h"
+#include "opus/celt/opus_modes.h"
+#include "opus/celt/rate.h"
 
 #ifndef DEF_WINDOW120
 #define DEF_WINDOW120
diff --git a/drivers/opus/celt/tests/test_unit_cwrs32.c b/drivers/opus/celt/tests/test_unit_cwrs32.c
index 9cf124336a..6b41b58116 100644
--- a/drivers/opus/celt/tests/test_unit_cwrs32.c
+++ b/drivers/opus/celt/tests/test_unit_cwrs32.c
@@ -27,7 +27,7 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #include <stdio.h>
@@ -40,13 +40,13 @@
 #endif
 
 #define CELT_C
-#include "stack_alloc.h"
-#include "entenc.c"
-#include "entdec.c"
-#include "entcode.c"
-#include "cwrs.c"
-#include "mathops.c"
-#include "rate.h"
+#include "opus/celt/stack_alloc.h"
+#include "opus/celt/entenc.c"
+#include "opus/celt/entdec.c"
+#include "opus/celt/entcode.c"
+#include "opus/celt/cwrs.c"
+#include "opus/celt/mathops.c"
+#include "opus/celt/rate.h"
 
 #define NMAX (240)
 #define KMAX (128)
diff --git a/drivers/opus/celt/tests/test_unit_dft.c b/drivers/opus/celt/tests/test_unit_dft.c
index 4a00013b2a..eb0b7f2282 100644
--- a/drivers/opus/celt/tests/test_unit_dft.c
+++ b/drivers/opus/celt/tests/test_unit_dft.c
@@ -26,7 +26,7 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #define SKIP_CONFIG_H
@@ -38,11 +38,11 @@
 #include <stdio.h>
 
 #define CELT_C
-#include "stack_alloc.h"
-#include "kiss_fft.h"
-#include "kiss_fft.c"
-#include "mathops.c"
-#include "entcode.c"
+#include "opus/celt/stack_alloc.h"
+#include "opus/celt/kiss_fft.h"
+#include "opus/celt/kiss_fft.c"
+#include "opus/celt/mathops.c"
+#include "opus/celt/entcode.c"
 
 
 #ifndef M_PI
diff --git a/drivers/opus/celt/tests/test_unit_entropy.c b/drivers/opus/celt/tests/test_unit_entropy.c
index 62268b1564..157eba7f77 100644
--- a/drivers/opus/celt/tests/test_unit_entropy.c
+++ b/drivers/opus/celt/tests/test_unit_entropy.c
@@ -27,21 +27,21 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
 #include <time.h>
-#include "entcode.h"
-#include "entenc.h"
-#include "entdec.h"
+#include "opus/celt/entcode.h"
+#include "opus/celt/entenc.h"
+#include "opus/celt/entdec.h"
 #include <string.h>
 
-#include "entenc.c"
-#include "entdec.c"
-#include "entcode.c"
+#include "opus/celt/entenc.c"
+#include "opus/celt/entdec.c"
+#include "opus/celt/entcode.c"
 
 #ifndef M_LOG2E
 # define M_LOG2E    1.4426950408889634074
diff --git a/drivers/opus/celt/tests/test_unit_laplace.c b/drivers/opus/celt/tests/test_unit_laplace.c
index af7d471045..7dc38b6080 100644
--- a/drivers/opus/celt/tests/test_unit_laplace.c
+++ b/drivers/opus/celt/tests/test_unit_laplace.c
@@ -26,19 +26,19 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "laplace.h"
+#include "opus/celt/laplace.h"
 #define CELT_C
-#include "stack_alloc.h"
+#include "opus/celt/stack_alloc.h"
 
-#include "entenc.c"
-#include "entdec.c"
-#include "entcode.c"
-#include "laplace.c"
+#include "opus/celt/entenc.c"
+#include "opus/celt/entdec.c"
+#include "opus/celt/entcode.c"
+#include "opus/celt/laplace.c"
 
 #define DATA_SIZE 40000
 
diff --git a/drivers/opus/celt/tests/test_unit_mathops.c b/drivers/opus/celt/tests/test_unit_mathops.c
index 36d6a4bfb4..fcf46321a0 100644
--- a/drivers/opus/celt/tests/test_unit_mathops.c
+++ b/drivers/opus/celt/tests/test_unit_mathops.c
@@ -27,7 +27,7 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #ifndef CUSTOM_MODES
@@ -36,15 +36,15 @@
 
 #define CELT_C
 
-#include "mathops.c"
-#include "entenc.c"
-#include "entdec.c"
-#include "entcode.c"
-#include "bands.c"
-#include "quant_bands.c"
-#include "laplace.c"
-#include "vq.c"
-#include "cwrs.c"
+#include "opus/celt/mathops.c"
+#include "opus/celt/entenc.c"
+#include "opus/celt/entdec.c"
+#include "opus/celt/entcode.c"
+#include "opus/celt/bands.c"
+#include "opus/celt/quant_bands.c"
+#include "opus/celt/laplace.c"
+#include "opus/celt/vq.c"
+#include "opus/celt/cwrs.c"
 #include <stdio.h>
 #include <math.h>
 
diff --git a/drivers/opus/celt/tests/test_unit_mdct.c b/drivers/opus/celt/tests/test_unit_mdct.c
index e3b5eec11c..0d5f0068cf 100644
--- a/drivers/opus/celt/tests/test_unit_mdct.c
+++ b/drivers/opus/celt/tests/test_unit_mdct.c
@@ -26,7 +26,7 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #define SKIP_CONFIG_H
@@ -38,13 +38,13 @@
 #include <stdio.h>
 
 #define CELT_C
-#include "mdct.h"
-#include "stack_alloc.h"
+#include "opus/celt/mdct.h"
+#include "opus/celt/stack_alloc.h"
 
-#include "kiss_fft.c"
-#include "mdct.c"
-#include "mathops.c"
-#include "entcode.c"
+#include "opus/celt/kiss_fft.c"
+#include "opus/celt/mdct.c"
+#include "opus/celt/mathops.c"
+#include "opus/celt/entcode.c"
 
 #ifndef M_PI
 #define M_PI 3.141592653
diff --git a/drivers/opus/celt/tests/test_unit_rotation.c b/drivers/opus/celt/tests/test_unit_rotation.c
index c12cc3f02f..2ab3f5f328 100644
--- a/drivers/opus/celt/tests/test_unit_rotation.c
+++ b/drivers/opus/celt/tests/test_unit_rotation.c
@@ -26,7 +26,7 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
 #ifndef CUSTOM_MODES
@@ -37,13 +37,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "vq.c"
-#include "cwrs.c"
-#include "entcode.c"
-#include "entenc.c"
-#include "entdec.c"
-#include "mathops.c"
-#include "bands.h"
+#include "opus/celt/vq.c"
+#include "opus/celt/cwrs.c"
+#include "opus/celt/entcode.c"
+#include "opus/celt/entenc.c"
+#include "opus/celt/entdec.c"
+#include "opus/celt/mathops.c"
+#include "opus/celt/bands.h"
 #include <math.h>
 #define MAX_SIZE 100
 
diff --git a/drivers/opus/celt/tests/test_unit_types.c b/drivers/opus/celt/tests/test_unit_types.c
index 29e671067f..bda7fe71f2 100644
--- a/drivers/opus/celt/tests/test_unit_types.c
+++ b/drivers/opus/celt/tests/test_unit_types.c
@@ -26,10 +26,10 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
-#include "opus_types.h"
+#include "opus/opus_types.h"
 #include <stdio.h>
 
 int main(void)
diff --git a/drivers/opus/celt/vq.c b/drivers/opus/celt/vq.c
index 20b0b82728..b072175150 100644
--- a/drivers/opus/celt/vq.c
+++ b/drivers/opus/celt/vq.c
@@ -27,16 +27,16 @@
 */
 
 #ifdef OPUS_HAVE_CONFIG_H
-#include "opus_config.h"
+#include "opus/opus_config.h"
 #endif
 
-#include "mathops.h"
-#include "cwrs.h"
-#include "vq.h"
-#include "arch.h"
-#include "os_support.h"
-#include "bands.h"
-#include "rate.h"
+#include "opus/celt/mathops.h"
+#include "opus/celt/cwrs.h"
+#include "opus/celt/vq.h"
+#include "opus/celt/arch.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/bands.h"
+#include "opus/celt/rate.h"
 
 static void exp_rotation1(celt_norm *X, int len, int stride, opus_val16 c, opus_val16 s)
 {
diff --git a/drivers/opus/celt/vq.h b/drivers/opus/celt/vq.h
index 8bab59c5e0..b52b1a0982 100644
--- a/drivers/opus/celt/vq.h
+++ b/drivers/opus/celt/vq.h
@@ -33,9 +33,9 @@
 #ifndef VQ_H
 #define VQ_H
 
-#include "entenc.h"
-#include "entdec.h"
-#include "opus_modes.h"
+#include "opus/celt/entenc.h"
+#include "opus/celt/entdec.h"
+#include "opus/celt/opus_modes.h"
 
 /** Algebraic pulse-vector quantiser. The signal x is replaced by the sum of
   * the pitch and a combination of pulses such that its norm is still equal
diff --git a/drivers/opus/celt/x86/pitch_sse.h b/drivers/opus/celt/x86/pitch_sse.h
index 695122a5ad..1542b87232 100644
--- a/drivers/opus/celt/x86/pitch_sse.h
+++ b/drivers/opus/celt/x86/pitch_sse.h
@@ -33,7 +33,7 @@
 #define PITCH_SSE_H
 
 #include <xmmintrin.h>
-#include "arch.h"
+#include "opus/celt/arch.h"
 
 #define OVERRIDE_XCORR_KERNEL
 static OPUS_INLINE void xcorr_kernel(const opus_val16 *x, const opus_val16 *y, opus_val32 sum[4], int len)