diff --git a/libs/celt/kiss_fft.h b/libs/celt/cc6_kiss_fft.h
similarity index 100%
rename from libs/celt/kiss_fft.h
rename to libs/celt/cc6_kiss_fft.h
diff --git a/libs/celt/kiss_fftr.h b/libs/celt/cc6_kiss_fftr.h
similarity index 100%
rename from libs/celt/kiss_fftr.h
rename to libs/celt/cc6_kiss_fftr.h
diff --git a/libs/celt/laplace.c b/libs/celt/cc6_laplace.c
similarity index 100%
rename from libs/celt/laplace.c
rename to libs/celt/cc6_laplace.c
diff --git a/libs/celt/laplace.h b/libs/celt/cc6_laplace.h
similarity index 100%
rename from libs/celt/laplace.h
rename to libs/celt/cc6_laplace.h
diff --git a/libs/celt/mathops.h b/libs/celt/cc6_mathops.h
similarity index 100%
rename from libs/celt/mathops.h
rename to libs/celt/cc6_mathops.h
diff --git a/libs/celt/mdct.c b/libs/celt/cc6_mdct.c
similarity index 100%
rename from libs/celt/mdct.c
rename to libs/celt/cc6_mdct.c
diff --git a/libs/celt/mdct.h b/libs/celt/cc6_mdct.h
similarity index 100%
rename from libs/celt/mdct.h
rename to libs/celt/cc6_mdct.h
diff --git a/libs/celt/mfrngcod.h b/libs/celt/cc6_mfrngcod.h
similarity index 100%
rename from libs/celt/mfrngcod.h
rename to libs/celt/cc6_mfrngcod.h
diff --git a/libs/celt/modes.c b/libs/celt/cc6_modes.c
similarity index 100%
rename from libs/celt/modes.c
rename to libs/celt/cc6_modes.c
diff --git a/libs/celt/modes.h b/libs/celt/cc6_modes.h
similarity index 100%
rename from libs/celt/modes.h
rename to libs/celt/cc6_modes.h
diff --git a/libs/celt/os_support.h b/libs/celt/cc6_os_support.h
similarity index 100%
rename from libs/celt/os_support.h
rename to libs/celt/cc6_os_support.h
diff --git a/libs/celt/pitch.c b/libs/celt/cc6_pitch.c
similarity index 100%
rename from libs/celt/pitch.c
rename to libs/celt/cc6_pitch.c
diff --git a/libs/celt/pitch.h b/libs/celt/cc6_pitch.h
similarity index 100%
rename from libs/celt/pitch.h
rename to libs/celt/cc6_pitch.h
diff --git a/libs/celt/psy.c b/libs/celt/cc6_psy.c
similarity index 100%
rename from libs/celt/psy.c
rename to libs/celt/cc6_psy.c
diff --git a/libs/celt/psy.h b/libs/celt/cc6_psy.h
similarity index 100%
rename from libs/celt/psy.h
rename to libs/celt/cc6_psy.h
diff --git a/libs/celt/quant_bands.c b/libs/celt/cc6_quant_bands.c
similarity index 100%
rename from libs/celt/quant_bands.c
rename to libs/celt/cc6_quant_bands.c
diff --git a/libs/celt/quant_bands.h b/libs/celt/cc6_quant_bands.h
similarity index 100%
rename from libs/celt/quant_bands.h
rename to libs/celt/cc6_quant_bands.h
diff --git a/libs/celt/rangedec.c b/libs/celt/cc6_rangedec.c
similarity index 100%
rename from libs/celt/rangedec.c
rename to libs/celt/cc6_rangedec.c
diff --git a/libs/celt/rangeenc.c b/libs/celt/cc6_rangeenc.c
similarity index 100%
rename from libs/celt/rangeenc.c
rename to libs/celt/cc6_rangeenc.c
diff --git a/libs/celt/rate.c b/libs/celt/cc6_rate.c
similarity index 100%
rename from libs/celt/rate.c
rename to libs/celt/cc6_rate.c
diff --git a/libs/celt/rate.h b/libs/celt/cc6_rate.h
similarity index 100%
rename from libs/celt/rate.h
rename to libs/celt/cc6_rate.h
diff --git a/libs/celt/stack_alloc.h b/libs/celt/cc6_stack_alloc.h
similarity index 100%
rename from libs/celt/stack_alloc.h
rename to libs/celt/cc6_stack_alloc.h
diff --git a/libs/celt/vq.c b/libs/celt/cc6_vq.c
similarity index 100%
rename from libs/celt/vq.c
rename to libs/celt/cc6_vq.c
diff --git a/libs/celt/vq.h b/libs/celt/cc6_vq.h
similarity index 100%
rename from libs/celt/vq.h
rename to libs/celt/cc6_vq.h
diff --git a/libs/celt/fixed_c5x.h b/libs/celt/fixed_c5x.h
deleted file mode 100755
index 443dce23..00000000
--- a/libs/celt/fixed_c5x.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright (C) 2003 Jean-Marc Valin */
-/**
-   @file fixed_c5x.h
-   @brief Fixed-point operations for the TI C5x DSP family
-*/
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-   
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-   
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef FIXED_C5X_H
-#define FIXED_C5X_H
-
-#include "dsplib.h"
-
-#undef IMUL32
-static inline long IMUL32(long i, long j)
-{
-   long ac0, ac1;
-   ac0 = _lmpy(i>>16,j);
-   ac1 = ac0 + _lmpy(i,j>>16);
-   return _lmpyu(i,j) + (ac1<<16);
-}
-
-#undef MAX16
-#define MAX16(a,b) _max(a,b)
-
-#undef MIN16
-#define MIN16(a,b) _min(a,b)
-
-#undef MAX32
-#define MAX32(a,b) _lmax(a,b)
-
-#undef MIN32
-#define MIN32(a,b) _lmin(a,b)
-
-#undef VSHR32
-#define VSHR32(a, shift) _lshl(a,-(shift))
-
-#undef MULT16_16_Q15
-#define MULT16_16_Q15(a,b) (_smpy(a,b))
-
-#undef MULT16_16SU 
-#define MULT16_16SU(a,b) _lmpysu(a,b)
-
-#undef MULT_16_16
-#define MULT_16_16(a,b) _lmpy(a,b)
-
-/* FIXME: This is technically incorrect and is bound to cause problems. Is there any cleaner solution? */
-#undef MULT16_32_Q15
-#define MULT16_32_Q15(a,b) ADD32(SHL(MULT16_16((a),SHR((b),16)),1), SHR(MULT16_16SU((a),(b)),15))
-
-
-#define celt_ilog2(x) (30 - _lnorm(x))
-#define OVERRIDE_CELT_ILOG2
-
-#define celt_maxabs16(x, len) MAX16(maxval((DATA *)x, len),-minval((DATA *)x, len))
-#define OVERRIDE_CELT_MAXABS16
-
-#define OVERRIDE_FIND_MAX16
-static inline int find_max16(celt_word16_t *x, int len)
-{
-   DATA max_corr16 = -VERY_LARGE16;
-   DATA pitch16 = 0;
-   maxvec((DATA *)x, len, &max_corr16, &pitch16);
-   return pitch16;
-}
-
-#endif /* FIXED_C5X_H */