aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/opus/SCsub2
-rw-r--r--drivers/opus/analysis.c2
-rw-r--r--drivers/opus/celt/arm/arm_celt_map.c2
-rw-r--r--drivers/opus/celt/arm/armcpu.c2
-rw-r--r--drivers/opus/celt/bands.c2
-rw-r--r--drivers/opus/celt/celt.c2
-rw-r--r--drivers/opus/celt/celt_decoder.c2
-rw-r--r--drivers/opus/celt/celt_encoder.c2
-rw-r--r--drivers/opus/celt/celt_lpc.c2
-rw-r--r--drivers/opus/celt/cwrs.c2
-rw-r--r--drivers/opus/celt/entcode.c2
-rw-r--r--drivers/opus/celt/entdec.c2
-rw-r--r--drivers/opus/celt/entenc.c2
-rw-r--r--drivers/opus/celt/kiss_fft.c2
-rw-r--r--drivers/opus/celt/laplace.c2
-rw-r--r--drivers/opus/celt/mathops.c2
-rw-r--r--drivers/opus/celt/mdct.c2
-rw-r--r--drivers/opus/celt/modes.c2
-rw-r--r--drivers/opus/celt/opus_custom_demo.c2
-rw-r--r--drivers/opus/celt/pitch.c2
-rw-r--r--drivers/opus/celt/quant_bands.c2
-rw-r--r--drivers/opus/celt/rate.c2
-rw-r--r--drivers/opus/celt/tests/test_unit_cwrs32.c2
-rw-r--r--drivers/opus/celt/tests/test_unit_dft.c2
-rw-r--r--drivers/opus/celt/tests/test_unit_entropy.c2
-rw-r--r--drivers/opus/celt/tests/test_unit_laplace.c2
-rw-r--r--drivers/opus/celt/tests/test_unit_mathops.c2
-rw-r--r--drivers/opus/celt/tests/test_unit_mdct.c2
-rw-r--r--drivers/opus/celt/tests/test_unit_rotation.c2
-rw-r--r--drivers/opus/celt/tests/test_unit_types.c2
-rw-r--r--drivers/opus/celt/vq.c2
-rw-r--r--drivers/opus/http.c2
-rw-r--r--drivers/opus/info.c2
-rw-r--r--drivers/opus/internal.c2
-rw-r--r--drivers/opus/mlp.c2
-rw-r--r--drivers/opus/opus.c2
-rw-r--r--drivers/opus/opus_decoder.c2
-rw-r--r--drivers/opus/opus_demo.c2
-rw-r--r--drivers/opus/opus_encoder.c2
-rw-r--r--drivers/opus/opus_multistream.c2
-rw-r--r--drivers/opus/opus_multistream_decoder.c2
-rw-r--r--drivers/opus/opus_multistream_encoder.c2
-rw-r--r--drivers/opus/opusfile.c2
-rw-r--r--drivers/opus/repacketizer.c2
-rw-r--r--drivers/opus/repacketizer_demo.c2
-rw-r--r--drivers/opus/silk/A2NLSF.c2
-rw-r--r--drivers/opus/silk/CNG.c2
-rw-r--r--drivers/opus/silk/HP_variable_cutoff.c2
-rw-r--r--drivers/opus/silk/LPC_analysis_filter.c2
-rw-r--r--drivers/opus/silk/LPC_inv_pred_gain.c2
-rw-r--r--drivers/opus/silk/LP_variable_cutoff.c2
-rw-r--r--drivers/opus/silk/NLSF2A.c2
-rw-r--r--drivers/opus/silk/NLSF_VQ.c2
-rw-r--r--drivers/opus/silk/NLSF_VQ_weights_laroia.c2
-rw-r--r--drivers/opus/silk/NLSF_decode.c2
-rw-r--r--drivers/opus/silk/NLSF_del_dec_quant.c2
-rw-r--r--drivers/opus/silk/NLSF_encode.c2
-rw-r--r--drivers/opus/silk/NLSF_stabilize.c2
-rw-r--r--drivers/opus/silk/NLSF_unpack.c2
-rw-r--r--drivers/opus/silk/NSQ.c2
-rw-r--r--drivers/opus/silk/NSQ_del_dec.c2
-rw-r--r--drivers/opus/silk/PLC.c2
-rw-r--r--drivers/opus/silk/VAD.c2
-rw-r--r--drivers/opus/silk/VQ_WMat_EC.c2
-rw-r--r--drivers/opus/silk/ana_filt_bank_1.c2
-rw-r--r--drivers/opus/silk/biquad_alt.c2
-rw-r--r--drivers/opus/silk/bwexpander.c2
-rw-r--r--drivers/opus/silk/bwexpander_32.c2
-rw-r--r--drivers/opus/silk/check_control_input.c2
-rw-r--r--drivers/opus/silk/code_signs.c2
-rw-r--r--drivers/opus/silk/control_SNR.c2
-rw-r--r--drivers/opus/silk/control_audio_bandwidth.c2
-rw-r--r--drivers/opus/silk/control_codec.c2
-rw-r--r--drivers/opus/silk/debug.c2
-rw-r--r--drivers/opus/silk/dec_API.c2
-rw-r--r--drivers/opus/silk/decode_core.c2
-rw-r--r--drivers/opus/silk/decode_frame.c2
-rw-r--r--drivers/opus/silk/decode_indices.c2
-rw-r--r--drivers/opus/silk/decode_parameters.c2
-rw-r--r--drivers/opus/silk/decode_pitch.c2
-rw-r--r--drivers/opus/silk/decode_pulses.c2
-rw-r--r--drivers/opus/silk/decoder_set_fs.c2
-rw-r--r--drivers/opus/silk/enc_API.c2
-rw-r--r--drivers/opus/silk/encode_indices.c2
-rw-r--r--drivers/opus/silk/encode_pulses.c2
-rw-r--r--drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/apply_sine_window_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/autocorr_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/burg_modified_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/corrMatrix_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/encode_frame_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/find_LPC_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/find_LTP_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/find_pitch_lags_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/find_pred_coefs_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/k2a_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/k2a_Q16_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/noise_shape_analysis_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/pitch_analysis_core_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/prefilter_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/process_gains_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/regularize_correlations_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/residual_energy16_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/residual_energy_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/schur64_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/schur_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/solve_LS_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/vector_ops_FIX.c2
-rw-r--r--drivers/opus/silk/fixed/warped_autocorrelation_FIX.c2
-rw-r--r--drivers/opus/silk/float/LPC_analysis_filter_FLP.c2
-rw-r--r--drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c2
-rw-r--r--drivers/opus/silk/float/LTP_analysis_filter_FLP.c2
-rw-r--r--drivers/opus/silk/float/LTP_scale_ctrl_FLP.c2
-rw-r--r--drivers/opus/silk/float/apply_sine_window_FLP.c2
-rw-r--r--drivers/opus/silk/float/autocorrelation_FLP.c2
-rw-r--r--drivers/opus/silk/float/burg_modified_FLP.c2
-rw-r--r--drivers/opus/silk/float/bwexpander_FLP.c2
-rw-r--r--drivers/opus/silk/float/corrMatrix_FLP.c2
-rw-r--r--drivers/opus/silk/float/encode_frame_FLP.c2
-rw-r--r--drivers/opus/silk/float/energy_FLP.c2
-rw-r--r--drivers/opus/silk/float/find_LPC_FLP.c2
-rw-r--r--drivers/opus/silk/float/find_LTP_FLP.c2
-rw-r--r--drivers/opus/silk/float/find_pitch_lags_FLP.c2
-rw-r--r--drivers/opus/silk/float/find_pred_coefs_FLP.c2
-rw-r--r--drivers/opus/silk/float/inner_product_FLP.c2
-rw-r--r--drivers/opus/silk/float/k2a_FLP.c2
-rw-r--r--drivers/opus/silk/float/levinsondurbin_FLP.c2
-rw-r--r--drivers/opus/silk/float/noise_shape_analysis_FLP.c2
-rw-r--r--drivers/opus/silk/float/pitch_analysis_core_FLP.c2
-rw-r--r--drivers/opus/silk/float/prefilter_FLP.c2
-rw-r--r--drivers/opus/silk/float/process_gains_FLP.c2
-rw-r--r--drivers/opus/silk/float/regularize_correlations_FLP.c2
-rw-r--r--drivers/opus/silk/float/residual_energy_FLP.c2
-rw-r--r--drivers/opus/silk/float/scale_copy_vector_FLP.c2
-rw-r--r--drivers/opus/silk/float/scale_vector_FLP.c2
-rw-r--r--drivers/opus/silk/float/schur_FLP.c2
-rw-r--r--drivers/opus/silk/float/solve_LS_FLP.c2
-rw-r--r--drivers/opus/silk/float/sort_FLP.c2
-rw-r--r--drivers/opus/silk/float/warped_autocorrelation_FLP.c2
-rw-r--r--drivers/opus/silk/float/wrappers_FLP.c2
-rw-r--r--drivers/opus/silk/gain_quant.c2
-rw-r--r--drivers/opus/silk/init_decoder.c2
-rw-r--r--drivers/opus/silk/init_encoder.c2
-rw-r--r--drivers/opus/silk/inner_prod_aligned.c2
-rw-r--r--drivers/opus/silk/interpolate.c2
-rw-r--r--drivers/opus/silk/lin2log.c2
-rw-r--r--drivers/opus/silk/log2lin.c2
-rw-r--r--drivers/opus/silk/pitch_est_tables.c2
-rw-r--r--drivers/opus/silk/process_NLSFs.c2
-rw-r--r--drivers/opus/silk/quant_LTP_gains.c2
-rw-r--r--drivers/opus/silk/resampler.c2
-rw-r--r--drivers/opus/silk/resampler_down2.c2
-rw-r--r--drivers/opus/silk/resampler_down2_3.c2
-rw-r--r--drivers/opus/silk/resampler_private_AR2.c2
-rw-r--r--drivers/opus/silk/resampler_private_IIR_FIR.c2
-rw-r--r--drivers/opus/silk/resampler_private_down_FIR.c2
-rw-r--r--drivers/opus/silk/resampler_private_up2_HQ.c2
-rw-r--r--drivers/opus/silk/resampler_rom.c2
-rw-r--r--drivers/opus/silk/shell_coder.c2
-rw-r--r--drivers/opus/silk/sigm_Q15.c2
-rw-r--r--drivers/opus/silk/sort.c2
-rw-r--r--drivers/opus/silk/stereo_LR_to_MS.c2
-rw-r--r--drivers/opus/silk/stereo_MS_to_LR.c2
-rw-r--r--drivers/opus/silk/stereo_decode_pred.c2
-rw-r--r--drivers/opus/silk/stereo_encode_pred.c2
-rw-r--r--drivers/opus/silk/stereo_find_predictor.c2
-rw-r--r--drivers/opus/silk/stereo_quant_pred.c2
-rw-r--r--drivers/opus/silk/sum_sqr_shift.c2
-rw-r--r--drivers/opus/silk/table_LSF_cos.c2
-rw-r--r--drivers/opus/silk/tables_LTP.c2
-rw-r--r--drivers/opus/silk/tables_NLSF_CB_NB_MB.c2
-rw-r--r--drivers/opus/silk/tables_NLSF_CB_WB.c2
-rw-r--r--drivers/opus/silk/tables_gain.c2
-rw-r--r--drivers/opus/silk/tables_other.c2
-rw-r--r--drivers/opus/silk/tables_pitch_lag.c2
-rw-r--r--drivers/opus/silk/tables_pulses_per_block.c2
-rw-r--r--drivers/opus/stream.c2
-rw-r--r--drivers/opus/wincerts.c2
179 files changed, 178 insertions, 180 deletions
diff --git a/drivers/opus/SCsub b/drivers/opus/SCsub
index beef97d62..59c746209 100644
--- a/drivers/opus/SCsub
+++ b/drivers/opus/SCsub
@@ -192,6 +192,4 @@ opus_sources_lib+=opus_sources_silk
env.drivers_sources+=opus_sources_lib
env.drivers_sources+=opus_sources
-env.Append(CFLAGS=["-DOPUS_HAVE_CONFIG_H"])
-
Export('env')
diff --git a/drivers/opus/analysis.c b/drivers/opus/analysis.c
index 187c71739..e27e94817 100644
--- a/drivers/opus/analysis.c
+++ b/drivers/opus/analysis.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/arm/arm_celt_map.c b/drivers/opus/celt/arm/arm_celt_map.c
index 7c8b62f5c..31e7d5b31 100644
--- a/drivers/opus/celt/arm/arm_celt_map.c
+++ b/drivers/opus/celt/arm/arm_celt_map.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/arm/armcpu.c b/drivers/opus/celt/arm/armcpu.c
index a46482065..fb7f2421f 100644
--- a/drivers/opus/celt/arm/armcpu.c
+++ b/drivers/opus/celt/arm/armcpu.c
@@ -27,7 +27,7 @@
/* Original code from libtheora modified to suit to Opus */
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/bands.c b/drivers/opus/celt/bands.c
index 49120f16d..5a6b23d87 100644
--- a/drivers/opus/celt/bands.c
+++ b/drivers/opus/celt/bands.c
@@ -27,7 +27,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/celt.c b/drivers/opus/celt/celt.c
index 8ff923984..d99a91ba2 100644
--- a/drivers/opus/celt/celt.c
+++ b/drivers/opus/celt/celt.c
@@ -27,7 +27,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/celt_decoder.c b/drivers/opus/celt/celt_decoder.c
index 5c00179c0..67c378943 100644
--- a/drivers/opus/celt/celt_decoder.c
+++ b/drivers/opus/celt/celt_decoder.c
@@ -27,7 +27,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/celt_encoder.c b/drivers/opus/celt/celt_encoder.c
index 508a35321..810ee5d74 100644
--- a/drivers/opus/celt/celt_encoder.c
+++ b/drivers/opus/celt/celt_encoder.c
@@ -27,7 +27,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/celt_lpc.c b/drivers/opus/celt/celt_lpc.c
index 32735230a..ad0a6dfd4 100644
--- a/drivers/opus/celt/celt_lpc.c
+++ b/drivers/opus/celt/celt_lpc.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/cwrs.c b/drivers/opus/celt/cwrs.c
index 2b7987a8e..bae9d21b9 100644
--- a/drivers/opus/celt/cwrs.c
+++ b/drivers/opus/celt/cwrs.c
@@ -27,7 +27,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/entcode.c b/drivers/opus/celt/entcode.c
index e8e30f32c..5c9874908 100644
--- a/drivers/opus/celt/entcode.c
+++ b/drivers/opus/celt/entcode.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/entdec.c b/drivers/opus/celt/entdec.c
index cea754aab..0ec4d460d 100644
--- a/drivers/opus/celt/entdec.c
+++ b/drivers/opus/celt/entdec.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/entenc.c b/drivers/opus/celt/entenc.c
index 87634ee62..085b2b281 100644
--- a/drivers/opus/celt/entenc.c
+++ b/drivers/opus/celt/entenc.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(OPUS_HAVE_CONFIG_H)
+#if defined(OPUS_ENABLED)
# include "opus/opus_config.h"
#endif
#include "opus/celt/os_support.h"
diff --git a/drivers/opus/celt/kiss_fft.c b/drivers/opus/celt/kiss_fft.c
index 8fc2db19c..89a1790b2 100644
--- a/drivers/opus/celt/kiss_fft.c
+++ b/drivers/opus/celt/kiss_fft.c
@@ -30,7 +30,7 @@
heavily modified to better suit Opus */
#ifndef SKIP_CONFIG_H
-# ifdef OPUS_HAVE_CONFIG_H
+# ifdef OPUS_ENABLED
#include "opus/opus_config.h"
# endif
#endif
diff --git a/drivers/opus/celt/laplace.c b/drivers/opus/celt/laplace.c
index 91ae921b8..9dc4d94d2 100644
--- a/drivers/opus/celt/laplace.c
+++ b/drivers/opus/celt/laplace.c
@@ -26,7 +26,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/mathops.c b/drivers/opus/celt/mathops.c
index c72a093ed..88e5aea12 100644
--- a/drivers/opus/celt/mathops.c
+++ b/drivers/opus/celt/mathops.c
@@ -31,7 +31,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/mdct.c b/drivers/opus/celt/mdct.c
index b4371aef9..ae34538d6 100644
--- a/drivers/opus/celt/mdct.c
+++ b/drivers/opus/celt/mdct.c
@@ -40,7 +40,7 @@
*/
#ifndef SKIP_CONFIG_H
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
#endif
diff --git a/drivers/opus/celt/modes.c b/drivers/opus/celt/modes.c
index 3e085ad06..aef268144 100644
--- a/drivers/opus/celt/modes.c
+++ b/drivers/opus/celt/modes.c
@@ -27,7 +27,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/opus_custom_demo.c b/drivers/opus/celt/opus_custom_demo.c
index 2431fd581..b3129de77 100644
--- a/drivers/opus/celt/opus_custom_demo.c
+++ b/drivers/opus/celt/opus_custom_demo.c
@@ -26,7 +26,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/pitch.c b/drivers/opus/celt/pitch.c
index 011297f65..c7c2b98c0 100644
--- a/drivers/opus/celt/pitch.c
+++ b/drivers/opus/celt/pitch.c
@@ -31,7 +31,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/quant_bands.c b/drivers/opus/celt/quant_bands.c
index bc059848b..e64ed28f2 100644
--- a/drivers/opus/celt/quant_bands.c
+++ b/drivers/opus/celt/quant_bands.c
@@ -26,7 +26,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/rate.c b/drivers/opus/celt/rate.c
index c314d63f6..ecc0ab2a4 100644
--- a/drivers/opus/celt/rate.c
+++ b/drivers/opus/celt/rate.c
@@ -26,7 +26,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/tests/test_unit_cwrs32.c b/drivers/opus/celt/tests/test_unit_cwrs32.c
index 6b41b5811..db43e3392 100644
--- a/drivers/opus/celt/tests/test_unit_cwrs32.c
+++ b/drivers/opus/celt/tests/test_unit_cwrs32.c
@@ -26,7 +26,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/tests/test_unit_dft.c b/drivers/opus/celt/tests/test_unit_dft.c
index eb0b7f228..9c0db3e9a 100644
--- a/drivers/opus/celt/tests/test_unit_dft.c
+++ b/drivers/opus/celt/tests/test_unit_dft.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/tests/test_unit_entropy.c b/drivers/opus/celt/tests/test_unit_entropy.c
index 157eba7f7..8c2defa8b 100644
--- a/drivers/opus/celt/tests/test_unit_entropy.c
+++ b/drivers/opus/celt/tests/test_unit_entropy.c
@@ -26,7 +26,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/tests/test_unit_laplace.c b/drivers/opus/celt/tests/test_unit_laplace.c
index 7dc38b608..e4fe83c4d 100644
--- a/drivers/opus/celt/tests/test_unit_laplace.c
+++ b/drivers/opus/celt/tests/test_unit_laplace.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/tests/test_unit_mathops.c b/drivers/opus/celt/tests/test_unit_mathops.c
index fcf46321a..0e3f300d4 100644
--- a/drivers/opus/celt/tests/test_unit_mathops.c
+++ b/drivers/opus/celt/tests/test_unit_mathops.c
@@ -26,7 +26,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/tests/test_unit_mdct.c b/drivers/opus/celt/tests/test_unit_mdct.c
index 0d5f0068c..0be03db2e 100644
--- a/drivers/opus/celt/tests/test_unit_mdct.c
+++ b/drivers/opus/celt/tests/test_unit_mdct.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/tests/test_unit_rotation.c b/drivers/opus/celt/tests/test_unit_rotation.c
index 2ab3f5f32..a57bf11e7 100644
--- a/drivers/opus/celt/tests/test_unit_rotation.c
+++ b/drivers/opus/celt/tests/test_unit_rotation.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/tests/test_unit_types.c b/drivers/opus/celt/tests/test_unit_types.c
index bda7fe71f..12d5ca72f 100644
--- a/drivers/opus/celt/tests/test_unit_types.c
+++ b/drivers/opus/celt/tests/test_unit_types.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/celt/vq.c b/drivers/opus/celt/vq.c
index b07217515..29a98a3a6 100644
--- a/drivers/opus/celt/vq.c
+++ b/drivers/opus/celt/vq.c
@@ -26,7 +26,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/http.c b/drivers/opus/http.c
index 9d3982544..24991b040 100644
--- a/drivers/opus/http.c
+++ b/drivers/opus/http.c
@@ -9,7 +9,7 @@
* by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
* *
********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/info.c b/drivers/opus/info.c
index 77e16bc54..8175a013a 100644
--- a/drivers/opus/info.c
+++ b/drivers/opus/info.c
@@ -9,7 +9,7 @@
* by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
* *
********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/internal.c b/drivers/opus/internal.c
index 493a8c4dd..d73628ec5 100644
--- a/drivers/opus/internal.c
+++ b/drivers/opus/internal.c
@@ -9,7 +9,7 @@
* by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
* *
********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/mlp.c b/drivers/opus/mlp.c
index 16ee7199d..d4d497179 100644
--- a/drivers/opus/mlp.c
+++ b/drivers/opus/mlp.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/opus.c b/drivers/opus/opus.c
index 8c4a1dc6d..5af71b478 100644
--- a/drivers/opus/opus.c
+++ b/drivers/opus/opus.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/opus_decoder.c b/drivers/opus/opus_decoder.c
index 5237b5b78..dea56015c 100644
--- a/drivers/opus/opus_decoder.c
+++ b/drivers/opus/opus_decoder.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
# include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/opus_demo.c b/drivers/opus/opus_demo.c
index 316330733..a0c5a5f86 100644
--- a/drivers/opus/opus_demo.c
+++ b/drivers/opus/opus_demo.c
@@ -26,7 +26,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/opus_encoder.c b/drivers/opus/opus_encoder.c
index f34648f4d..890a2514d 100644
--- a/drivers/opus/opus_encoder.c
+++ b/drivers/opus/opus_encoder.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/opus_multistream.c b/drivers/opus/opus_multistream.c
index a4a656bc7..10c42dd56 100644
--- a/drivers/opus/opus_multistream.c
+++ b/drivers/opus/opus_multistream.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/opus_multistream_decoder.c b/drivers/opus/opus_multistream_decoder.c
index 5a2809f32..43c695d81 100644
--- a/drivers/opus/opus_multistream_decoder.c
+++ b/drivers/opus/opus_multistream_decoder.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/opus_multistream_encoder.c b/drivers/opus/opus_multistream_encoder.c
index f0c5f1f9c..685d2de27 100644
--- a/drivers/opus/opus_multistream_encoder.c
+++ b/drivers/opus/opus_multistream_encoder.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/opusfile.c b/drivers/opus/opusfile.c
index 7b97a6009..a38e8cd5a 100644
--- a/drivers/opus/opusfile.c
+++ b/drivers/opus/opusfile.c
@@ -14,7 +14,7 @@
last mod: $Id: vorbisfile.c 17573 2010-10-27 14:53:59Z xiphmont $
********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/repacketizer.c b/drivers/opus/repacketizer.c
index 175d4d691..eb0c0c737 100644
--- a/drivers/opus/repacketizer.c
+++ b/drivers/opus/repacketizer.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/repacketizer_demo.c b/drivers/opus/repacketizer_demo.c
index 83467b100..5df4f2695 100644
--- a/drivers/opus/repacketizer_demo.c
+++ b/drivers/opus/repacketizer_demo.c
@@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/A2NLSF.c b/drivers/opus/silk/A2NLSF.c
index bc7d7f4f1..18b0e3092 100644
--- a/drivers/opus/silk/A2NLSF.c
+++ b/drivers/opus/silk/A2NLSF.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
/* Therefore the result is not accurate NLSFs, but the two */
/* functions are accurate inverses of each other */
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/CNG.c b/drivers/opus/silk/CNG.c
index 6f566d467..253ae7db4 100644
--- a/drivers/opus/silk/CNG.c
+++ b/drivers/opus/silk/CNG.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/HP_variable_cutoff.c b/drivers/opus/silk/HP_variable_cutoff.c
index 36e4cb959..9da203286 100644
--- a/drivers/opus/silk/HP_variable_cutoff.c
+++ b/drivers/opus/silk/HP_variable_cutoff.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
#ifdef OPUS_FIXED_POINT
diff --git a/drivers/opus/silk/LPC_analysis_filter.c b/drivers/opus/silk/LPC_analysis_filter.c
index 3140f76b6..4976d9d3c 100644
--- a/drivers/opus/silk/LPC_analysis_filter.c
+++ b/drivers/opus/silk/LPC_analysis_filter.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/LPC_inv_pred_gain.c b/drivers/opus/silk/LPC_inv_pred_gain.c
index ec3486f3e..aa6787575 100644
--- a/drivers/opus/silk/LPC_inv_pred_gain.c
+++ b/drivers/opus/silk/LPC_inv_pred_gain.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/LP_variable_cutoff.c b/drivers/opus/silk/LP_variable_cutoff.c
index 59a14ad06..65c4a6b06 100644
--- a/drivers/opus/silk/LP_variable_cutoff.c
+++ b/drivers/opus/silk/LP_variable_cutoff.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/NLSF2A.c b/drivers/opus/silk/NLSF2A.c
index 0a780cdbc..c3b8568a0 100644
--- a/drivers/opus/silk/NLSF2A.c
+++ b/drivers/opus/silk/NLSF2A.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/NLSF_VQ.c b/drivers/opus/silk/NLSF_VQ.c
index fcec6897b..9420f5bfb 100644
--- a/drivers/opus/silk/NLSF_VQ.c
+++ b/drivers/opus/silk/NLSF_VQ.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/NLSF_VQ_weights_laroia.c b/drivers/opus/silk/NLSF_VQ_weights_laroia.c
index 6ef457e99..d3b4fd640 100644
--- a/drivers/opus/silk/NLSF_VQ_weights_laroia.c
+++ b/drivers/opus/silk/NLSF_VQ_weights_laroia.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/NLSF_decode.c b/drivers/opus/silk/NLSF_decode.c
index 46472df8a..6868a9385 100644
--- a/drivers/opus/silk/NLSF_decode.c
+++ b/drivers/opus/silk/NLSF_decode.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/NLSF_del_dec_quant.c b/drivers/opus/silk/NLSF_del_dec_quant.c
index 26c4b2ae0..9caeb0a23 100644
--- a/drivers/opus/silk/NLSF_del_dec_quant.c
+++ b/drivers/opus/silk/NLSF_del_dec_quant.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/NLSF_encode.c b/drivers/opus/silk/NLSF_encode.c
index 4c89760a8..157c0c8ff 100644
--- a/drivers/opus/silk/NLSF_encode.c
+++ b/drivers/opus/silk/NLSF_encode.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/NLSF_stabilize.c b/drivers/opus/silk/NLSF_stabilize.c
index e985ac464..caeeed975 100644
--- a/drivers/opus/silk/NLSF_stabilize.c
+++ b/drivers/opus/silk/NLSF_stabilize.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/NLSF_unpack.c b/drivers/opus/silk/NLSF_unpack.c
index 089618cad..20d3020f9 100644
--- a/drivers/opus/silk/NLSF_unpack.c
+++ b/drivers/opus/silk/NLSF_unpack.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/NSQ.c b/drivers/opus/silk/NSQ.c
index c1c9f17ef..6092498a1 100644
--- a/drivers/opus/silk/NSQ.c
+++ b/drivers/opus/silk/NSQ.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/NSQ_del_dec.c b/drivers/opus/silk/NSQ_del_dec.c
index 5e5369011..4aa730ed6 100644
--- a/drivers/opus/silk/NSQ_del_dec.c
+++ b/drivers/opus/silk/NSQ_del_dec.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/PLC.c b/drivers/opus/silk/PLC.c
index c07d95eb8..1f5ce0992 100644
--- a/drivers/opus/silk/PLC.c
+++ b/drivers/opus/silk/PLC.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/VAD.c b/drivers/opus/silk/VAD.c
index c4f524e3a..a789a13d3 100644
--- a/drivers/opus/silk/VAD.c
+++ b/drivers/opus/silk/VAD.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/VQ_WMat_EC.c b/drivers/opus/silk/VQ_WMat_EC.c
index 7e2175ccb..a35b84ef1 100644
--- a/drivers/opus/silk/VQ_WMat_EC.c
+++ b/drivers/opus/silk/VQ_WMat_EC.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/ana_filt_bank_1.c b/drivers/opus/silk/ana_filt_bank_1.c
index 6e2de0b5b..a2fa720bd 100644
--- a/drivers/opus/silk/ana_filt_bank_1.c
+++ b/drivers/opus/silk/ana_filt_bank_1.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/biquad_alt.c b/drivers/opus/silk/biquad_alt.c
index 9cc1e6c4f..85708167d 100644
--- a/drivers/opus/silk/biquad_alt.c
+++ b/drivers/opus/silk/biquad_alt.c
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
* Can handle slowly varying filter coefficients *
* */
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/bwexpander.c b/drivers/opus/silk/bwexpander.c
index f7256dd04..7f81a2af9 100644
--- a/drivers/opus/silk/bwexpander.c
+++ b/drivers/opus/silk/bwexpander.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/bwexpander_32.c b/drivers/opus/silk/bwexpander_32.c
index 940821990..58dfe1f8d 100644
--- a/drivers/opus/silk/bwexpander_32.c
+++ b/drivers/opus/silk/bwexpander_32.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/check_control_input.c b/drivers/opus/silk/check_control_input.c
index eb6742efd..9c882334c 100644
--- a/drivers/opus/silk/check_control_input.c
+++ b/drivers/opus/silk/check_control_input.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/code_signs.c b/drivers/opus/silk/code_signs.c
index 5151efdc4..e2f671d7c 100644
--- a/drivers/opus/silk/code_signs.c
+++ b/drivers/opus/silk/code_signs.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/control_SNR.c b/drivers/opus/silk/control_SNR.c
index e584e43ee..e3983d503 100644
--- a/drivers/opus/silk/control_SNR.c
+++ b/drivers/opus/silk/control_SNR.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/control_audio_bandwidth.c b/drivers/opus/silk/control_audio_bandwidth.c
index f1da038c6..846a7baa5 100644
--- a/drivers/opus/silk/control_audio_bandwidth.c
+++ b/drivers/opus/silk/control_audio_bandwidth.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/control_codec.c b/drivers/opus/silk/control_codec.c
index 7746a6512..beb6dfe6c 100644
--- a/drivers/opus/silk/control_codec.c
+++ b/drivers/opus/silk/control_codec.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
#ifdef OPUS_FIXED_POINT
diff --git a/drivers/opus/silk/debug.c b/drivers/opus/silk/debug.c
index ecfcb39ae..9f31b68f7 100644
--- a/drivers/opus/silk/debug.c
+++ b/drivers/opus/silk/debug.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/dec_API.c b/drivers/opus/silk/dec_API.c
index c87741785..43aeb4faf 100644
--- a/drivers/opus/silk/dec_API.c
+++ b/drivers/opus/silk/dec_API.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
#include "opus/silk/API.h"
diff --git a/drivers/opus/silk/decode_core.c b/drivers/opus/silk/decode_core.c
index 18e655ceb..f7cd8db7c 100644
--- a/drivers/opus/silk/decode_core.c
+++ b/drivers/opus/silk/decode_core.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/decode_frame.c b/drivers/opus/silk/decode_frame.c
index 21461f92a..f16601945 100644
--- a/drivers/opus/silk/decode_frame.c
+++ b/drivers/opus/silk/decode_frame.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/decode_indices.c b/drivers/opus/silk/decode_indices.c
index ec3fec248..3e09fb416 100644
--- a/drivers/opus/silk/decode_indices.c
+++ b/drivers/opus/silk/decode_indices.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/decode_parameters.c b/drivers/opus/silk/decode_parameters.c
index 458d319de..7f4cbeec2 100644
--- a/drivers/opus/silk/decode_parameters.c
+++ b/drivers/opus/silk/decode_parameters.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/decode_pitch.c b/drivers/opus/silk/decode_pitch.c
index d84b0721e..73e94b4ee 100644
--- a/drivers/opus/silk/decode_pitch.c
+++ b/drivers/opus/silk/decode_pitch.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/decode_pulses.c b/drivers/opus/silk/decode_pulses.c
index bd016e93c..24f841881 100644
--- a/drivers/opus/silk/decode_pulses.c
+++ b/drivers/opus/silk/decode_pulses.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/decoder_set_fs.c b/drivers/opus/silk/decoder_set_fs.c
index dec74a205..97ecd8afd 100644
--- a/drivers/opus/silk/decoder_set_fs.c
+++ b/drivers/opus/silk/decoder_set_fs.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/enc_API.c b/drivers/opus/silk/enc_API.c
index 024633409..ac1a7854f 100644
--- a/drivers/opus/silk/enc_API.c
+++ b/drivers/opus/silk/enc_API.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
#include "opus/silk/define.h"
diff --git a/drivers/opus/silk/encode_indices.c b/drivers/opus/silk/encode_indices.c
index 190c6c475..7150325d4 100644
--- a/drivers/opus/silk/encode_indices.c
+++ b/drivers/opus/silk/encode_indices.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/encode_pulses.c b/drivers/opus/silk/encode_pulses.c
index 7bc965fb3..f9fe39eeb 100644
--- a/drivers/opus/silk/encode_pulses.c
+++ b/drivers/opus/silk/encode_pulses.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c b/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c
index 58887acd9..19d5defc7 100644
--- a/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c
+++ b/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c b/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c
index 15286bc1d..0887fd03f 100644
--- a/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c
+++ b/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/apply_sine_window_FIX.c b/drivers/opus/silk/fixed/apply_sine_window_FIX.c
index e5b844fd1..5b4d8ebfd 100644
--- a/drivers/opus/silk/fixed/apply_sine_window_FIX.c
+++ b/drivers/opus/silk/fixed/apply_sine_window_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/autocorr_FIX.c b/drivers/opus/silk/fixed/autocorr_FIX.c
index b57990faf..88a849e12 100644
--- a/drivers/opus/silk/fixed/autocorr_FIX.c
+++ b/drivers/opus/silk/fixed/autocorr_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/burg_modified_FIX.c b/drivers/opus/silk/fixed/burg_modified_FIX.c
index b621e2303..5ef3ad2c3 100644
--- a/drivers/opus/silk/fixed/burg_modified_FIX.c
+++ b/drivers/opus/silk/fixed/burg_modified_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/corrMatrix_FIX.c b/drivers/opus/silk/fixed/corrMatrix_FIX.c
index 90edf9229..9f50153dc 100644
--- a/drivers/opus/silk/fixed/corrMatrix_FIX.c
+++ b/drivers/opus/silk/fixed/corrMatrix_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/encode_frame_FIX.c b/drivers/opus/silk/fixed/encode_frame_FIX.c
index e49367c21..27944729f 100644
--- a/drivers/opus/silk/fixed/encode_frame_FIX.c
+++ b/drivers/opus/silk/fixed/encode_frame_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/find_LPC_FIX.c b/drivers/opus/silk/fixed/find_LPC_FIX.c
index 812cfbaca..df76e17ca 100644
--- a/drivers/opus/silk/fixed/find_LPC_FIX.c
+++ b/drivers/opus/silk/fixed/find_LPC_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/find_LTP_FIX.c b/drivers/opus/silk/fixed/find_LTP_FIX.c
index a2b877aff..d556371ff 100644
--- a/drivers/opus/silk/fixed/find_LTP_FIX.c
+++ b/drivers/opus/silk/fixed/find_LTP_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/find_pitch_lags_FIX.c b/drivers/opus/silk/fixed/find_pitch_lags_FIX.c
index a4cf60d5e..0d00b3edf 100644
--- a/drivers/opus/silk/fixed/find_pitch_lags_FIX.c
+++ b/drivers/opus/silk/fixed/find_pitch_lags_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/find_pred_coefs_FIX.c b/drivers/opus/silk/fixed/find_pred_coefs_FIX.c
index 9950b1648..93b506b52 100644
--- a/drivers/opus/silk/fixed/find_pred_coefs_FIX.c
+++ b/drivers/opus/silk/fixed/find_pred_coefs_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/k2a_FIX.c b/drivers/opus/silk/fixed/k2a_FIX.c
index 3a8ada81a..7d5808f19 100644
--- a/drivers/opus/silk/fixed/k2a_FIX.c
+++ b/drivers/opus/silk/fixed/k2a_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/k2a_Q16_FIX.c b/drivers/opus/silk/fixed/k2a_Q16_FIX.c
index 2ee9a9eb8..8df61dc3f 100644
--- a/drivers/opus/silk/fixed/k2a_Q16_FIX.c
+++ b/drivers/opus/silk/fixed/k2a_Q16_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c b/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c
index 6cd797f6b..862640d2c 100644
--- a/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c
+++ b/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c b/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c
index cdad2a9db..2acd51db6 100644
--- a/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c
+++ b/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/prefilter_FIX.c b/drivers/opus/silk/fixed/prefilter_FIX.c
index c190ea9bd..195df3da7 100644
--- a/drivers/opus/silk/fixed/prefilter_FIX.c
+++ b/drivers/opus/silk/fixed/prefilter_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/process_gains_FIX.c b/drivers/opus/silk/fixed/process_gains_FIX.c
index ecb068453..2c501a201 100644
--- a/drivers/opus/silk/fixed/process_gains_FIX.c
+++ b/drivers/opus/silk/fixed/process_gains_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/regularize_correlations_FIX.c b/drivers/opus/silk/fixed/regularize_correlations_FIX.c
index e7ddd7445..af34da68f 100644
--- a/drivers/opus/silk/fixed/regularize_correlations_FIX.c
+++ b/drivers/opus/silk/fixed/regularize_correlations_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/residual_energy16_FIX.c b/drivers/opus/silk/fixed/residual_energy16_FIX.c
index f65e068ee..9b6e103a5 100644
--- a/drivers/opus/silk/fixed/residual_energy16_FIX.c
+++ b/drivers/opus/silk/fixed/residual_energy16_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/residual_energy_FIX.c b/drivers/opus/silk/fixed/residual_energy_FIX.c
index fb0adb185..468bfbab4 100644
--- a/drivers/opus/silk/fixed/residual_energy_FIX.c
+++ b/drivers/opus/silk/fixed/residual_energy_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/schur64_FIX.c b/drivers/opus/silk/fixed/schur64_FIX.c
index 8176ea790..fe1278e06 100644
--- a/drivers/opus/silk/fixed/schur64_FIX.c
+++ b/drivers/opus/silk/fixed/schur64_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/schur_FIX.c b/drivers/opus/silk/fixed/schur_FIX.c
index 8e9f8aaac..b0a36e5ad 100644
--- a/drivers/opus/silk/fixed/schur_FIX.c
+++ b/drivers/opus/silk/fixed/schur_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/solve_LS_FIX.c b/drivers/opus/silk/fixed/solve_LS_FIX.c
index 79f1f0639..6e8afaaa8 100644
--- a/drivers/opus/silk/fixed/solve_LS_FIX.c
+++ b/drivers/opus/silk/fixed/solve_LS_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/vector_ops_FIX.c b/drivers/opus/silk/fixed/vector_ops_FIX.c
index 884c3d74b..c2725194e 100644
--- a/drivers/opus/silk/fixed/vector_ops_FIX.c
+++ b/drivers/opus/silk/fixed/vector_ops_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c b/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c
index 6b32171a8..4e5a7fee5 100644
--- a/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c
+++ b/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/LPC_analysis_filter_FLP.c b/drivers/opus/silk/float/LPC_analysis_filter_FLP.c
index d0a7237e8..438b704fe 100644
--- a/drivers/opus/silk/float/LPC_analysis_filter_FLP.c
+++ b/drivers/opus/silk/float/LPC_analysis_filter_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c b/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c
index 094529ec0..2e86e269e 100644
--- a/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c
+++ b/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/LTP_analysis_filter_FLP.c b/drivers/opus/silk/float/LTP_analysis_filter_FLP.c
index 8610541c3..5919ceb92 100644
--- a/drivers/opus/silk/float/LTP_analysis_filter_FLP.c
+++ b/drivers/opus/silk/float/LTP_analysis_filter_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c b/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c
index 199ba91ef..c952d810a 100644
--- a/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c
+++ b/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/apply_sine_window_FLP.c b/drivers/opus/silk/float/apply_sine_window_FLP.c
index 83866fd30..e8aa197bb 100644
--- a/drivers/opus/silk/float/apply_sine_window_FLP.c
+++ b/drivers/opus/silk/float/apply_sine_window_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/autocorrelation_FLP.c b/drivers/opus/silk/float/autocorrelation_FLP.c
index 4e91a1a39..f4b90ff32 100644
--- a/drivers/opus/silk/float/autocorrelation_FLP.c
+++ b/drivers/opus/silk/float/autocorrelation_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/burg_modified_FLP.c b/drivers/opus/silk/float/burg_modified_FLP.c
index 712b5c821..5a1633424 100644
--- a/drivers/opus/silk/float/burg_modified_FLP.c
+++ b/drivers/opus/silk/float/burg_modified_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/bwexpander_FLP.c b/drivers/opus/silk/float/bwexpander_FLP.c
index e11f14c87..b3de4f645 100644
--- a/drivers/opus/silk/float/bwexpander_FLP.c
+++ b/drivers/opus/silk/float/bwexpander_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/corrMatrix_FLP.c b/drivers/opus/silk/float/corrMatrix_FLP.c
index cdf4ee3bd..551f8578d 100644
--- a/drivers/opus/silk/float/corrMatrix_FLP.c
+++ b/drivers/opus/silk/float/corrMatrix_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/encode_frame_FLP.c b/drivers/opus/silk/float/encode_frame_FLP.c
index 3c474c3b7..c5973b892 100644
--- a/drivers/opus/silk/float/encode_frame_FLP.c
+++ b/drivers/opus/silk/float/encode_frame_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/energy_FLP.c b/drivers/opus/silk/float/energy_FLP.c
index 2ea3e1785..9c6fad48d 100644
--- a/drivers/opus/silk/float/energy_FLP.c
+++ b/drivers/opus/silk/float/energy_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/find_LPC_FLP.c b/drivers/opus/silk/float/find_LPC_FLP.c
index b39b0eb20..2b8c54388 100644
--- a/drivers/opus/silk/float/find_LPC_FLP.c
+++ b/drivers/opus/silk/float/find_LPC_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/find_LTP_FLP.c b/drivers/opus/silk/float/find_LTP_FLP.c
index 4ddab9dac..2f66de468 100644
--- a/drivers/opus/silk/float/find_LTP_FLP.c
+++ b/drivers/opus/silk/float/find_LTP_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/find_pitch_lags_FLP.c b/drivers/opus/silk/float/find_pitch_lags_FLP.c
index 0aaf94b52..a2d582c73 100644
--- a/drivers/opus/silk/float/find_pitch_lags_FLP.c
+++ b/drivers/opus/silk/float/find_pitch_lags_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/find_pred_coefs_FLP.c b/drivers/opus/silk/float/find_pred_coefs_FLP.c
index d13d3ed0a..61eead757 100644
--- a/drivers/opus/silk/float/find_pred_coefs_FLP.c
+++ b/drivers/opus/silk/float/find_pred_coefs_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/inner_product_FLP.c b/drivers/opus/silk/float/inner_product_FLP.c
index 01b750ec4..e5f030844 100644
--- a/drivers/opus/silk/float/inner_product_FLP.c
+++ b/drivers/opus/silk/float/inner_product_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/k2a_FLP.c b/drivers/opus/silk/float/k2a_FLP.c
index 624fe55bc..71dc4c3c4 100644
--- a/drivers/opus/silk/float/k2a_FLP.c
+++ b/drivers/opus/silk/float/k2a_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/levinsondurbin_FLP.c b/drivers/opus/silk/float/levinsondurbin_FLP.c
index 3f9790f6d..8fbca230a 100644
--- a/drivers/opus/silk/float/levinsondurbin_FLP.c
+++ b/drivers/opus/silk/float/levinsondurbin_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/noise_shape_analysis_FLP.c b/drivers/opus/silk/float/noise_shape_analysis_FLP.c
index b0839ac98..5d8bc6332 100644
--- a/drivers/opus/silk/float/noise_shape_analysis_FLP.c
+++ b/drivers/opus/silk/float/noise_shape_analysis_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/pitch_analysis_core_FLP.c b/drivers/opus/silk/float/pitch_analysis_core_FLP.c
index b7b90480f..2689c5008 100644
--- a/drivers/opus/silk/float/pitch_analysis_core_FLP.c
+++ b/drivers/opus/silk/float/pitch_analysis_core_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/prefilter_FLP.c b/drivers/opus/silk/float/prefilter_FLP.c
index 60fd220f6..0298ef2f8 100644
--- a/drivers/opus/silk/float/prefilter_FLP.c
+++ b/drivers/opus/silk/float/prefilter_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/process_gains_FLP.c b/drivers/opus/silk/float/process_gains_FLP.c
index d181952ac..bd5e7ee7a 100644
--- a/drivers/opus/silk/float/process_gains_FLP.c
+++ b/drivers/opus/silk/float/process_gains_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/regularize_correlations_FLP.c b/drivers/opus/silk/float/regularize_correlations_FLP.c
index 147df0faf..397e45b10 100644
--- a/drivers/opus/silk/float/regularize_correlations_FLP.c
+++ b/drivers/opus/silk/float/regularize_correlations_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/residual_energy_FLP.c b/drivers/opus/silk/float/residual_energy_FLP.c
index 2c7dcf3b0..50bc728b7 100644
--- a/drivers/opus/silk/float/residual_energy_FLP.c
+++ b/drivers/opus/silk/float/residual_energy_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/scale_copy_vector_FLP.c b/drivers/opus/silk/float/scale_copy_vector_FLP.c
index a44ad74f3..8c5bfadb3 100644
--- a/drivers/opus/silk/float/scale_copy_vector_FLP.c
+++ b/drivers/opus/silk/float/scale_copy_vector_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/scale_vector_FLP.c b/drivers/opus/silk/float/scale_vector_FLP.c
index bee577794..191b3d604 100644
--- a/drivers/opus/silk/float/scale_vector_FLP.c
+++ b/drivers/opus/silk/float/scale_vector_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/schur_FLP.c b/drivers/opus/silk/float/schur_FLP.c
index 9a6482d00..631dbe093 100644
--- a/drivers/opus/silk/float/schur_FLP.c
+++ b/drivers/opus/silk/float/schur_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/solve_LS_FLP.c b/drivers/opus/silk/float/solve_LS_FLP.c
index 0ce3ba8cf..b3757ce03 100644
--- a/drivers/opus/silk/float/solve_LS_FLP.c
+++ b/drivers/opus/silk/float/solve_LS_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/sort_FLP.c b/drivers/opus/silk/float/sort_FLP.c
index c95d82bbf..f2570503a 100644
--- a/drivers/opus/silk/float/sort_FLP.c
+++ b/drivers/opus/silk/float/sort_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/warped_autocorrelation_FLP.c b/drivers/opus/silk/float/warped_autocorrelation_FLP.c
index aad6bf57d..092b998d9 100644
--- a/drivers/opus/silk/float/warped_autocorrelation_FLP.c
+++ b/drivers/opus/silk/float/warped_autocorrelation_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/float/wrappers_FLP.c b/drivers/opus/silk/float/wrappers_FLP.c
index f903e6363..31586cf2a 100644
--- a/drivers/opus/silk/float/wrappers_FLP.c
+++ b/drivers/opus/silk/float/wrappers_FLP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/gain_quant.c b/drivers/opus/silk/gain_quant.c
index 9ff513423..e1d9b9112 100644
--- a/drivers/opus/silk/gain_quant.c
+++ b/drivers/opus/silk/gain_quant.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/init_decoder.c b/drivers/opus/silk/init_decoder.c
index 5a8620027..43fa1f1c3 100644
--- a/drivers/opus/silk/init_decoder.c
+++ b/drivers/opus/silk/init_decoder.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/init_encoder.c b/drivers/opus/silk/init_encoder.c
index 31a237444..9ba4524b7 100644
--- a/drivers/opus/silk/init_encoder.c
+++ b/drivers/opus/silk/init_encoder.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
#ifdef OPUS_FIXED_POINT
diff --git a/drivers/opus/silk/inner_prod_aligned.c b/drivers/opus/silk/inner_prod_aligned.c
index 50c43f815..86ecf463a 100644
--- a/drivers/opus/silk/inner_prod_aligned.c
+++ b/drivers/opus/silk/inner_prod_aligned.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/interpolate.c b/drivers/opus/silk/interpolate.c
index f1abd723b..26c44de49 100644
--- a/drivers/opus/silk/interpolate.c
+++ b/drivers/opus/silk/interpolate.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/lin2log.c b/drivers/opus/silk/lin2log.c
index 301859301..ea11f33dd 100644
--- a/drivers/opus/silk/lin2log.c
+++ b/drivers/opus/silk/lin2log.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/log2lin.c b/drivers/opus/silk/log2lin.c
index a55f3c53f..0a33ca48f 100644
--- a/drivers/opus/silk/log2lin.c
+++ b/drivers/opus/silk/log2lin.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/pitch_est_tables.c b/drivers/opus/silk/pitch_est_tables.c
index 0625439af..7555f5b04 100644
--- a/drivers/opus/silk/pitch_est_tables.c
+++ b/drivers/opus/silk/pitch_est_tables.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/process_NLSFs.c b/drivers/opus/silk/process_NLSFs.c
index 5a1d057cb..9e6ebf827 100644
--- a/drivers/opus/silk/process_NLSFs.c
+++ b/drivers/opus/silk/process_NLSFs.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/quant_LTP_gains.c b/drivers/opus/silk/quant_LTP_gains.c
index be12d4a6b..f6fff470f 100644
--- a/drivers/opus/silk/quant_LTP_gains.c
+++ b/drivers/opus/silk/quant_LTP_gains.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/resampler.c b/drivers/opus/silk/resampler.c
index f01518af5..dde8fcddb 100644
--- a/drivers/opus/silk/resampler.c
+++ b/drivers/opus/silk/resampler.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/resampler_down2.c b/drivers/opus/silk/resampler_down2.c
index 2b14698cf..dbc962c5e 100644
--- a/drivers/opus/silk/resampler_down2.c
+++ b/drivers/opus/silk/resampler_down2.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/resampler_down2_3.c b/drivers/opus/silk/resampler_down2_3.c
index 2a29a6d6b..6ff32ff33 100644
--- a/drivers/opus/silk/resampler_down2_3.c
+++ b/drivers/opus/silk/resampler_down2_3.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/resampler_private_AR2.c b/drivers/opus/silk/resampler_private_AR2.c
index 9372b4ac5..e04319da4 100644
--- a/drivers/opus/silk/resampler_private_AR2.c
+++ b/drivers/opus/silk/resampler_private_AR2.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/resampler_private_IIR_FIR.c b/drivers/opus/silk/resampler_private_IIR_FIR.c
index 6d90314e5..1d71ebd89 100644
--- a/drivers/opus/silk/resampler_private_IIR_FIR.c
+++ b/drivers/opus/silk/resampler_private_IIR_FIR.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/resampler_private_down_FIR.c b/drivers/opus/silk/resampler_private_down_FIR.c
index a6012e8f4..739c91db2 100644
--- a/drivers/opus/silk/resampler_private_down_FIR.c
+++ b/drivers/opus/silk/resampler_private_down_FIR.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/resampler_private_up2_HQ.c b/drivers/opus/silk/resampler_private_up2_HQ.c
index c1c65a0e5..a2b6ad432 100644
--- a/drivers/opus/silk/resampler_private_up2_HQ.c
+++ b/drivers/opus/silk/resampler_private_up2_HQ.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/resampler_rom.c b/drivers/opus/silk/resampler_rom.c
index f46264f8b..d56408705 100644
--- a/drivers/opus/silk/resampler_rom.c
+++ b/drivers/opus/silk/resampler_rom.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/shell_coder.c b/drivers/opus/silk/shell_coder.c
index d4c954440..cd18ed638 100644
--- a/drivers/opus/silk/shell_coder.c
+++ b/drivers/opus/silk/shell_coder.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/sigm_Q15.c b/drivers/opus/silk/sigm_Q15.c
index deff37544..4c7825047 100644
--- a/drivers/opus/silk/sigm_Q15.c
+++ b/drivers/opus/silk/sigm_Q15.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/sort.c b/drivers/opus/silk/sort.c
index 1b2cac428..495292ad5 100644
--- a/drivers/opus/silk/sort.c
+++ b/drivers/opus/silk/sort.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/stereo_LR_to_MS.c b/drivers/opus/silk/stereo_LR_to_MS.c
index 4bd6460b4..e17a36046 100644
--- a/drivers/opus/silk/stereo_LR_to_MS.c
+++ b/drivers/opus/silk/stereo_LR_to_MS.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/stereo_MS_to_LR.c b/drivers/opus/silk/stereo_MS_to_LR.c
index beec3850f..dddb62c78 100644
--- a/drivers/opus/silk/stereo_MS_to_LR.c
+++ b/drivers/opus/silk/stereo_MS_to_LR.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/stereo_decode_pred.c b/drivers/opus/silk/stereo_decode_pred.c
index 876044ed8..d54faf137 100644
--- a/drivers/opus/silk/stereo_decode_pred.c
+++ b/drivers/opus/silk/stereo_decode_pred.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/stereo_encode_pred.c b/drivers/opus/silk/stereo_encode_pred.c
index 8b13fab2a..d68922cf0 100644
--- a/drivers/opus/silk/stereo_encode_pred.c
+++ b/drivers/opus/silk/stereo_encode_pred.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/stereo_find_predictor.c b/drivers/opus/silk/stereo_find_predictor.c
index 3758e31b8..1f529b28d 100644
--- a/drivers/opus/silk/stereo_find_predictor.c
+++ b/drivers/opus/silk/stereo_find_predictor.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/stereo_quant_pred.c b/drivers/opus/silk/stereo_quant_pred.c
index 77ac9b174..3a4d9b31d 100644
--- a/drivers/opus/silk/stereo_quant_pred.c
+++ b/drivers/opus/silk/stereo_quant_pred.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/sum_sqr_shift.c b/drivers/opus/silk/sum_sqr_shift.c
index 0d3404715..7e2a97b53 100644
--- a/drivers/opus/silk/sum_sqr_shift.c
+++ b/drivers/opus/silk/sum_sqr_shift.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/table_LSF_cos.c b/drivers/opus/silk/table_LSF_cos.c
index 7c4c85e4c..818a532c2 100644
--- a/drivers/opus/silk/table_LSF_cos.c
+++ b/drivers/opus/silk/table_LSF_cos.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/tables_LTP.c b/drivers/opus/silk/tables_LTP.c
index d03e70d7e..6a0569825 100644
--- a/drivers/opus/silk/tables_LTP.c
+++ b/drivers/opus/silk/tables_LTP.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/tables_NLSF_CB_NB_MB.c b/drivers/opus/silk/tables_NLSF_CB_NB_MB.c
index db551cc20..66c2fd403 100644
--- a/drivers/opus/silk/tables_NLSF_CB_NB_MB.c
+++ b/drivers/opus/silk/tables_NLSF_CB_NB_MB.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/tables_NLSF_CB_WB.c b/drivers/opus/silk/tables_NLSF_CB_WB.c
index 4988f83c7..366f1bc88 100644
--- a/drivers/opus/silk/tables_NLSF_CB_WB.c
+++ b/drivers/opus/silk/tables_NLSF_CB_WB.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/tables_gain.c b/drivers/opus/silk/tables_gain.c
index c063cf0b6..efb5b899b 100644
--- a/drivers/opus/silk/tables_gain.c
+++ b/drivers/opus/silk/tables_gain.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/tables_other.c b/drivers/opus/silk/tables_other.c
index a896d6f88..5e588fbf0 100644
--- a/drivers/opus/silk/tables_other.c
+++ b/drivers/opus/silk/tables_other.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/tables_pitch_lag.c b/drivers/opus/silk/tables_pitch_lag.c
index 64ef06069..e1c4617d0 100644
--- a/drivers/opus/silk/tables_pitch_lag.c
+++ b/drivers/opus/silk/tables_pitch_lag.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/silk/tables_pulses_per_block.c b/drivers/opus/silk/tables_pulses_per_block.c
index 949fd3f23..a1e2fb03d 100644
--- a/drivers/opus/silk/tables_pulses_per_block.c
+++ b/drivers/opus/silk/tables_pulses_per_block.c
@@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/stream.c b/drivers/opus/stream.c
index 6ad9a7a66..8dd23e88e 100644
--- a/drivers/opus/stream.c
+++ b/drivers/opus/stream.c
@@ -14,7 +14,7 @@
last mod: $Id: vorbisfile.c 17573 2010-10-27 14:53:59Z xiphmont $
********************************************************************/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif
diff --git a/drivers/opus/wincerts.c b/drivers/opus/wincerts.c
index ee344957b..2a04eab6d 100644
--- a/drivers/opus/wincerts.c
+++ b/drivers/opus/wincerts.c
@@ -16,7 +16,7 @@
[1] <http://rt.openssl.org/Ticket/Display.html?id=2158>*/
-#ifdef OPUS_HAVE_CONFIG_H
+#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
#endif