diff --git a/libcelt/dump_modes.c b/libcelt/dump_modes.c
index 5f6a4608..be1afbc5 100644
--- a/libcelt/dump_modes.c
+++ b/libcelt/dump_modes.c
@@ -289,6 +289,12 @@ void dump_header(FILE *file, CELTMode **modes, int nb_modes)
    }
 }
 
+#ifdef FIXED_POINT
+#define BASENAME "static_modes_fixed"
+#else
+#define BASENAME "static_modes_float"
+#endif
+
 int main(int argc, char **argv)
 {
    int i, nb;
@@ -308,10 +314,10 @@ int main(int argc, char **argv)
       frame   = atoi(argv[2*i+2]);
       m[i] = celt_mode_create(Fs, frame, NULL);
    }
-   file = fopen("static_modes.c", "w");
+   file = fopen(BASENAME ".c", "w");
    dump_modes(file, m, nb);
    fclose(file);
-   file = fopen("static_modes.h", "w");
+   file = fopen(BASENAME ".h", "w");
    dump_header(file, m, nb);
    fclose(file);
    for (i=0;i<nb;i++)
diff --git a/libcelt/modes.c b/libcelt/modes.c
index f6bfde2d..1846284d 100644
--- a/libcelt/modes.c
+++ b/libcelt/modes.c
@@ -112,7 +112,11 @@ static const unsigned char band_allocation[] = {
 #endif
 
 #ifdef STATIC_MODES
-#include "static_modes.c"
+#ifdef FIXED_POINT
+#include "static_modes_fixed.c"
+#else
+#include "static_modes_float.c"
+#endif
 #endif
 
 #ifndef M_PI