diff --git a/src/aegis/libaegis.c b/src/aegis/libaegis.c
index a7c9bb9..5fac098 100644
--- a/src/aegis/libaegis.c
+++ b/src/aegis/libaegis.c
@@ -23,8 +23,8 @@
 #include "common/cpu.c"
 #include "common/softaes.c"
 
-#if 1
 /* AEGIS 128 L */
+#include "aegis128l/implementations.h"
 #include "aegis128l/aegis128l_aesni.c"
 #include "aegis128l/aegis128l_altivec.c"
 #include "aegis128l/aegis128l_armcrypto.c"
@@ -32,6 +32,7 @@
 #include "aegis128l/aegis128l.c"
 
 /* AEGIS 128 x2 */
+#include "aegis128x2/implementations.h"
 #include "aegis128x2/aegis128x2_aesni.c"
 #include "aegis128x2/aegis128x2_altivec.c"
 #include "aegis128x2/aegis128x2_armcrypto.c"
@@ -40,6 +41,7 @@
 #include "aegis128x2/aegis128x2.c"
 
 /* AEGIS 128 x4 */
+#include "aegis128x4/implementations.h"
 #include "aegis128x4/aegis128x4_aesni.c"
 #include "aegis128x4/aegis128x4_altivec.c"
 #include "aegis128x4/aegis128x4_armcrypto.c"
@@ -47,29 +49,26 @@
 #include "aegis128x4/aegis128x4_avx512.c"
 #include "aegis128x4/aegis128x4_soft.c"
 #include "aegis128x4/aegis128x4.c"
-#endif
 
-#if 1
 /* AEGIS 256 */
+#include "aegis256/implementations.h"
 #include "aegis256/aegis256_aesni.c"
 #include "aegis256/aegis256_altivec.c"
 #include "aegis256/aegis256_armcrypto.c"
 #include "aegis256/aegis256_soft.c"
 #include "aegis256/aegis256.c"
-#endif
 
-#if 1
 /* AEGIS 256 x2 */
+#include "aegis256x2/implementations.h"
 #include "aegis256x2/aegis256x2_aesni.c"
 #include "aegis256x2/aegis256x2_altivec.c"
 #include "aegis256x2/aegis256x2_armcrypto.c"
 #include "aegis256x2/aegis256x2_avx2.c"
 #include "aegis256x2/aegis256x2_soft.c"
 #include "aegis256x2/aegis256x2.c"
-#endif
 
-#if 1
 /* AEGIS 256 x4 */
+#include "aegis256x4/implementations.h"
 #include "aegis256x4/aegis256x4_aesni.c"
 #include "aegis256x4/aegis256x4_altivec.c"
 #include "aegis256x4/aegis256x4_armcrypto.c"
@@ -77,4 +76,3 @@
 #include "aegis256x4/aegis256x4_avx512.c"
 #include "aegis256x4/aegis256x4_soft.c"
 #include "aegis256x4/aegis256x4.c"
-#endif
diff --git a/src/argon2/libargon2.c b/src/argon2/libargon2.c
index 327f5d5..5f7cc96 100644
--- a/src/argon2/libargon2.c
+++ b/src/argon2/libargon2.c
@@ -22,8 +22,5 @@
 #include "src/argon2.c"
 #include "src/core.c"
 #include "src/encoding.c"
-#if 0
-#include "src/opt.c"
-#endif
 #include "src/ref.c"
 #include "src/thread.c"
diff --git a/src/argon2/src/blake2/blake2.h b/src/argon2/src/blake2/blake2.h
index 501c6a3..f4a80d4 100644
--- a/src/argon2/src/blake2/blake2.h
+++ b/src/argon2/src/blake2/blake2.h
@@ -18,7 +18,7 @@
 #ifndef PORTABLE_BLAKE2_H
 #define PORTABLE_BLAKE2_H
 
-#include <argon2.h>
+#include "argon2.h"
 
 #if defined(__cplusplus)
 extern "C" {