diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index 288ed55e3c9ee9c986e8bab8457fdaf58d53f6e8..61bf1da0262e004f5f976ac4ae07dedbffb3b6df 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -264,7 +264,7 @@ void compute_inv_mdcts(const CELTMode *mode, int shortBlocks, celt_sig *X,
    int B;
    int N;
    int shift;
-   const int overlap = OVERLAP(mode);
+   const int overlap = mode->overlap;
 
    if (shortBlocks)
    {
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 8a1c7483e052d429262d76a79acc5b872602e73a..ba07a3c38c05d17c8da693319a6609915a825e53 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -416,7 +416,7 @@ int patch_transient_decision(opus_val16 *newE, opus_val16 *oldE, int nbEBands,
 static void compute_mdcts(const CELTMode *mode, int shortBlocks, celt_sig * OPUS_RESTRICT in,
                           celt_sig * OPUS_RESTRICT out, int C, int CC, int LM, int upsample)
 {
-   const int overlap = OVERLAP(mode);
+   const int overlap = mode->overlap;
    int N;
    int B;
    int shift;
diff --git a/celt/modes.h b/celt/modes.h
index c8340f9875c2f590e084c99a9370c9747afea905..be813ccc8b4d89d9ee5f42623e137dd8692fe53e 100644
--- a/celt/modes.h
+++ b/celt/modes.h
@@ -39,14 +39,6 @@
 
 #define MAX_PERIOD 1024
 
-#ifndef OVERLAP
-#define OVERLAP(mode) ((mode)->overlap)
-#endif
-
-#ifndef FRAMESIZE
-#define FRAMESIZE(mode) ((mode)->mdctSize)
-#endif
-
 typedef struct {
    int size;
    const opus_int16 *index;