diff --git a/src/decaf_fast.c b/src/decaf_fast.c
index 1511874..ca1bd30 100644
--- a/src/decaf_fast.c
+++ b/src/decaf_fast.c
@@ -13,7 +13,7 @@
 #include "decaf.h"
 #include <string.h>
 #include "field.h"
-#include "decaf_255_config.h"
+#include "decaf_config.h"
 
 #define WBITS DECAF_WORD_BITS
 
diff --git a/src/decaf_gen_tables.c b/src/decaf_gen_tables.c
index cdd8b36..67c5043 100644
--- a/src/decaf_gen_tables.c
+++ b/src/decaf_gen_tables.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "decaf.h"
-#include "decaf_255_config.h" /* MAGIC */
+#include "decaf_config.h"
 #include "field.h"
 
 #define API_NS(_id) decaf_255_##_id
diff --git a/src/include/decaf_255_config.h b/src/p25519/decaf_config.h
similarity index 92%
rename from src/include/decaf_255_config.h
rename to src/p25519/decaf_config.h
index 01de56a..dbde8c5 100644
--- a/src/include/decaf_255_config.h
+++ b/src/p25519/decaf_config.h
@@ -8,8 +8,8 @@
  *
  * @brief Configuration for decaf_fast.c
  */
-#ifndef __DECAF_255_CONFIG_H__
-#define __DECAF_255_CONFIG_H__ 1
+#ifndef __DECAF_CONFIG_H__
+#define __DECAF_CONFIG_H__ 1
 
 /**
  * Use the Montgomery ladder for direct scalarmul.
@@ -47,4 +47,4 @@
 #define DECAF_WNAF_VAR_TABLE_BITS 3
 
 
-#endif /* __DECAF_255_CONFIG_H__ */
+#endif /* __DECAF_CONFIG_H__ */
diff --git a/src/include/decaf_448_config.h b/src/p448/decaf_config.h
similarity index 92%
rename from src/include/decaf_448_config.h
rename to src/p448/decaf_config.h
index 9079cbf..2028eda 100644
--- a/src/include/decaf_448_config.h
+++ b/src/p448/decaf_config.h
@@ -8,8 +8,8 @@
  *
  * @brief Configuration for decaf_fast.c
  */
-#ifndef __DECAF_448_CONFIG_H__
-#define __DECAF_448_CONFIG_H__ 1
+#ifndef __DECAF_CONFIG_H__
+#define __DECAF_CONFIG_H__ 1
 
 /**
  * Use the Montgomery ladder for direct scalarmul.
@@ -47,4 +47,4 @@
 #define DECAF_WNAF_VAR_TABLE_BITS 3
 
 
-#endif /* __DECAF_448_CONFIG_H__ */
+#endif /* __DECAF_CONFIG_H__ */