diff --git a/celt b/celt
index 2f6c5feae86a1648e20e251f19d6eb5ccb7a47c2..961f723ab756ac0a760a1b858c110720765a9a2c 160000
--- a/celt
+++ b/celt
@@ -1 +1 @@
-Subproject commit 2f6c5feae86a1648e20e251f19d6eb5ccb7a47c2
+Subproject commit 961f723ab756ac0a760a1b858c110720765a9a2c
diff --git a/src/Makefile b/src/Makefile
index 3673a5296f55b6ebc941fa0d1efc971dc9d2f457..d777400e2cfd1711ca8a26aa6879ee6fdbfd930a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,2 +1,2 @@
 all:
-	gcc -O3 -g -I../ -I../celt/libcelt -L../celt/libcelt/.libs/ -o test_hybrid test_hybrid.c hybrid_decoder.c hybrid_encoder.c -lcelt0 -lm
+	gcc -DHAVE_CONFIG_H -I../celt -W -Wextra -Wall -O3 -g -I../ -I../celt/libcelt -L../celt/libcelt/.libs/ -o test_hybrid test_hybrid.c hybrid_decoder.c hybrid_encoder.c -lcelt0 -lm
diff --git a/src/hybrid_decoder.c b/src/hybrid_decoder.c
index 6d0c16a3b0a52837610b5e376ec54bb7578c542e..05928b69d180a972abf0eedd9bf4ff5b3b5fb314 100644
--- a/src/hybrid_decoder.c
+++ b/src/hybrid_decoder.c
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include "hybrid_decoder.h"
 #include "celt/libcelt/entdec.h"
+#include "celt/libcelt/modes.h"
 
 
 HybridDecoder *hybrid_decoder_create()
diff --git a/src/hybrid_encoder.c b/src/hybrid_encoder.c
index 778a2af324f4d85ee41ce3611522e0374cbb3df0..6e19c43dafc6107ec93323764aa0125573ccc14f 100644
--- a/src/hybrid_encoder.c
+++ b/src/hybrid_encoder.c
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include "hybrid_encoder.h"
 #include "celt/libcelt/entenc.h"
-
+#include "celt/libcelt/modes.h"
 
 HybridEncoder *hybrid_encoder_create()
 {