13 files changed, 9 insertions, 74 deletions
diff --git a/src/stream/arc4/arc4.cpp b/src/stream/arc4/arc4.cpp
index 5d0c67d3e..705b77062 100644
--- a/src/stream/arc4/arc4.cpp
+++ b/src/stream/arc4/arc4.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/arc4.h>
-#include <botan/xor_buf.h>
+#include <botan/internal/xor_buf.h>
 #include <botan/parsing.h>
 
 namespace Botan {
diff --git a/src/stream/arc4/info.txt b/src/stream/arc4/info.txt
index bb373dbc5..e3022925c 100644
--- a/src/stream/arc4/info.txt
+++ b/src/stream/arc4/info.txt
@@ -1,12 +1 @@
 define ARC4
-
-load_on auto
-
-<requires>
-stream
-</requires>
-
-<add>
-arc4.cpp
-arc4.h
-</add>
diff --git a/src/stream/ctr/ctr.cpp b/src/stream/ctr/ctr.cpp
index 723b94f28..0b0f72da2 100644
--- a/src/stream/ctr/ctr.cpp
+++ b/src/stream/ctr/ctr.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/ctr.h>
-#include <botan/xor_buf.h>
+#include <botan/internal/xor_buf.h>
 
 namespace Botan {
 
diff --git a/src/stream/ctr/info.txt b/src/stream/ctr/info.txt
index ac4f3f710..2fa2272fd 100644
--- a/src/stream/ctr/info.txt
+++ b/src/stream/ctr/info.txt
@@ -1,12 +1,5 @@
 define CTR_BE
 
-load_on auto
-
-<add>
-ctr.cpp
-ctr.h
-</add>
-
 <requires>
 block
 stream
diff --git a/src/stream/info.txt b/src/stream/info.txt
index 213c42137..68d6c46d6 100644
--- a/src/stream/info.txt
+++ b/src/stream/info.txt
@@ -1,11 +1,5 @@
-load_on auto
-
 define STREAM_CIPHER
 
-<add>
-stream_cipher.h
-</add>
-
 <requires>
 sym_algo
 </requires>
diff --git a/src/stream/ofb/info.txt b/src/stream/ofb/info.txt
index a01e9e1a6..702fea666 100644
--- a/src/stream/ofb/info.txt
+++ b/src/stream/ofb/info.txt
@@ -1,12 +1,5 @@
 define OFB
 
-load_on auto
-
-<add>
-ofb.cpp
-ofb.h
-</add>
-
 <requires>
 block
 stream
diff --git a/src/stream/ofb/ofb.cpp b/src/stream/ofb/ofb.cpp
index b52617789..cfa035a4f 100644
--- a/src/stream/ofb/ofb.cpp
+++ b/src/stream/ofb/ofb.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/ofb.h>
-#include <botan/xor_buf.h>
+#include <botan/internal/xor_buf.h>
 #include <algorithm>
 
 namespace Botan {
diff --git a/src/stream/salsa20/info.txt b/src/stream/salsa20/info.txt
index 8171708b0..1ce648d9f 100644
--- a/src/stream/salsa20/info.txt
+++ b/src/stream/salsa20/info.txt
@@ -1,12 +1 @@
 define SALSA20
-
-load_on auto
-
-<requires>
-stream
-</requires>
-
-<add>
-salsa20.cpp
-salsa20.h
-</add>
diff --git a/src/stream/salsa20/salsa20.cpp b/src/stream/salsa20/salsa20.cpp
index 3aae64eae..cc5d3a712 100644
--- a/src/stream/salsa20/salsa20.cpp
+++ b/src/stream/salsa20/salsa20.cpp
@@ -6,8 +6,8 @@
 */
 
 #include <botan/salsa20.h>
-#include <botan/xor_buf.h>
-#include <botan/loadstor.h>
+#include <botan/internal/xor_buf.h>
+#include <botan/internal/loadstor.h>
 
 namespace Botan {
 
diff --git a/src/stream/turing/info.txt b/src/stream/turing/info.txt
index dede0dd39..feb00a92d 100644
--- a/src/stream/turing/info.txt
+++ b/src/stream/turing/info.txt
@@ -1,13 +1 @@
 define TURING
-
-load_on auto
-
-<requires>
-stream
-</requires>
-
-<add>
-tur_tab.cpp
-turing.cpp
-turing.h
-</add>
diff --git a/src/stream/turing/turing.cpp b/src/stream/turing/turing.cpp
index 6769784c7..dec9190ab 100644
--- a/src/stream/turing/turing.cpp
+++ b/src/stream/turing/turing.cpp
@@ -6,8 +6,8 @@
 */
 
 #include <botan/turing.h>
-#include <botan/loadstor.h>
-#include <botan/xor_buf.h>
+#include <botan/internal/loadstor.h>
+#include <botan/internal/xor_buf.h>
 
 namespace Botan {
 
diff --git a/src/stream/wid_wake/info.txt b/src/stream/wid_wake/info.txt
index 6289e0369..f7333dede 100644
--- a/src/stream/wid_wake/info.txt
+++ b/src/stream/wid_wake/info.txt
@@ -1,12 +1 @@
 define WID_WAKE
-
-load_on auto
-
-<requires>
-stream
-</requires>
-
-<add>
-wid_wake.cpp
-wid_wake.h
-</add>
diff --git a/src/stream/wid_wake/wid_wake.cpp b/src/stream/wid_wake/wid_wake.cpp
index 2a8946649..d52851aee 100644
--- a/src/stream/wid_wake/wid_wake.cpp
+++ b/src/stream/wid_wake/wid_wake.cpp
@@ -6,8 +6,8 @@
 */
 
 #include <botan/wid_wake.h>
-#include <botan/loadstor.h>
-#include <botan/xor_buf.h>
+#include <botan/internal/loadstor.h>
+#include <botan/internal/xor_buf.h>
 
 namespace Botan {