6 files changed, 24 insertions, 11 deletions
diff --git a/src/block/serpent/serpent.cpp b/src/block/serpent/serpent.cpp
index 2fa27308f..e16afc89c 100644
--- a/src/block/serpent/serpent.cpp
+++ b/src/block/serpent/serpent.cpp
@@ -344,6 +344,10 @@ void Serpent::decrypt_n(const byte in[], byte out[], u32bit blocks) const
       }
    }
 
+#undef key_xor
+#undef transform
+#undef i_transform
+
 /*
 * Serpent Key Schedule
 */
diff --git a/src/block/serpent_ia32/serp_ia32_imp.S b/src/block/serpent_ia32/serp_ia32_imp.S
index 8b4a79937..768192061 100644
--- a/src/block/serpent_ia32/serp_ia32_imp.S
+++ b/src/block/serpent_ia32/serp_ia32_imp.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr_ia32.h>
+#include <botan/internal/asm_macr_ia32.h>
 
 START_LISTING(serp_ia32.S)
 
diff --git a/src/block/serpent_simd/info.txt b/src/block/serpent_simd/info.txt
index d65b41235..b3bf34972 100644
--- a/src/block/serpent_simd/info.txt
+++ b/src/block/serpent_simd/info.txt
@@ -5,3 +5,15 @@ serpent
 simd_32
 simd_engine
 </requires>
+
+<source>
+serp_simd.cpp
+</source>
+
+<header:public>
+serp_simd.h
+</header:public>
+
+<header:internal>
+serp_simd_sbox.h
+</header:internal>
diff --git a/src/block/serpent_simd/serp_simd.cpp b/src/block/serpent_simd/serp_simd.cpp
index b394b0c26..0a535c9a0 100644
--- a/src/block/serpent_simd/serp_simd.cpp
+++ b/src/block/serpent_simd/serp_simd.cpp
@@ -6,8 +6,8 @@
 */
 
 #include <botan/serp_simd.h>
-#include <botan/serp_simd_sbox.h>
-#include <botan/simd_32.h>
+#include <botan/internal/serp_simd_sbox.h>
+#include <botan/internal/simd_32.h>
 #include <botan/loadstor.h>
 
 namespace Botan {
@@ -171,6 +171,10 @@ void serpent_decrypt_4(const byte in[64],
 
 }
 
+#undef key_xor
+#undef transform
+#undef i_transform
+
 /*
 * Serpent Encryption
 */
diff --git a/src/block/xtea_simd/info.txt b/src/block/xtea_simd/info.txt
index 98a6e941f..5a8445b35 100644
--- a/src/block/xtea_simd/info.txt
+++ b/src/block/xtea_simd/info.txt
@@ -1,12 +1,5 @@
 define XTEA_SIMD
 
-load_on auto
-
-<add>
-xtea_simd.cpp
-xtea_simd.h
-</add>
-
 <requires>
 xtea
 simd_32
diff --git a/src/block/xtea_simd/xtea_simd.cpp b/src/block/xtea_simd/xtea_simd.cpp
index 6151c355c..264d4f949 100644
--- a/src/block/xtea_simd/xtea_simd.cpp
+++ b/src/block/xtea_simd/xtea_simd.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/xtea_simd.h>
 #include <botan/loadstor.h>
-#include <botan/simd_32.h>
+#include <botan/internal/simd_32.h>
 
 namespace Botan {