Split base.h into block_cipher.h and stream_cipher.h

It turned out many files were including base.h merely to get other
includes (like types.h, secmem.h, and exceptn.h). Those have been changed
to directly include the files containing the declarations that code needs.

24 files changed, 24 insertions, 24 deletions

diff --git a/src/cipher/aes/aes.h b/src/cipher/aes/aes.h
index 5b43735ad..e287a303d 100644
--- a/src/cipher/aes/aes.h
+++ b/src/cipher/aes/aes.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_AES_H__
 #define BOTAN_AES_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/blowfish/blowfish.h b/src/cipher/blowfish/blowfish.h
index 79875ba90..16f5239e3 100644
--- a/src/cipher/blowfish/blowfish.h
+++ b/src/cipher/blowfish/blowfish.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_BLOWFISH_H__
 #define BOTAN_BLOWFISH_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/cast/cast128.h b/src/cipher/cast/cast128.h
index 0a7c53864..b9d02cd7a 100644
--- a/src/cipher/cast/cast128.h
+++ b/src/cipher/cast/cast128.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_CAST128_H__
 #define BOTAN_CAST128_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/cast/cast256.h b/src/cipher/cast/cast256.h
index d4b7c6b18..cf0bcc953 100644
--- a/src/cipher/cast/cast256.h
+++ b/src/cipher/cast/cast256.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_CAST256_H__
 #define BOTAN_CAST256_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/des/des.h b/src/cipher/des/des.h
index eb4689849..8cd490b3c 100644
--- a/src/cipher/des/des.h
+++ b/src/cipher/des/des.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_DES_H__
 #define BOTAN_DES_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/gost/gost.h b/src/cipher/gost/gost.h
index d78e3245f..ef2897fae 100644
--- a/src/cipher/gost/gost.h
+++ b/src/cipher/gost/gost.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_GOST_H__
 #define BOTAN_GOST_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/idea/idea.h b/src/cipher/idea/idea.h
index 4c5e82aca..824a9c6ed 100644
--- a/src/cipher/idea/idea.h
+++ b/src/cipher/idea/idea.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_IDEA_H__
 #define BOTAN_IDEA_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/kasumi/kasumi.h b/src/cipher/kasumi/kasumi.h
index 49050480c..40fa7c36a 100644
--- a/src/cipher/kasumi/kasumi.h
+++ b/src/cipher/kasumi/kasumi.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_KASUMI_H__
 #define BOTAN_KASUMI_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/lion/lion.h b/src/cipher/lion/lion.h
index 9b8133143..d541eb76e 100644
--- a/src/cipher/lion/lion.h
+++ b/src/cipher/lion/lion.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_LION_H__
 #define BOTAN_LION_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 #include <botan/stream_cipher.h>
 #include <botan/hash.h>
 
diff --git a/src/cipher/lubyrack/lubyrack.h b/src/cipher/lubyrack/lubyrack.h
index c22fdde43..ba5a4d052 100644
--- a/src/cipher/lubyrack/lubyrack.h
+++ b/src/cipher/lubyrack/lubyrack.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_LUBY_RACKOFF_H__
 #define BOTAN_LUBY_RACKOFF_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 #include <botan/hash.h>
 
 namespace Botan {
diff --git a/src/cipher/mars/mars.h b/src/cipher/mars/mars.h
index 6e1bc9f34..950c1eb6a 100644
--- a/src/cipher/mars/mars.h
+++ b/src/cipher/mars/mars.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_MARS_H__
 #define BOTAN_MARS_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/misty1/misty1.h b/src/cipher/misty1/misty1.h
index 9e506d536..0bd3ca1e4 100644
--- a/src/cipher/misty1/misty1.h
+++ b/src/cipher/misty1/misty1.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_MISTY1_H__
 #define BOTAN_MISTY1_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/noekeon/noekeon.h b/src/cipher/noekeon/noekeon.h
index 660ab487a..fb06f8c79 100644
--- a/src/cipher/noekeon/noekeon.h
+++ b/src/cipher/noekeon/noekeon.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_NOEKEON_H__
 #define BOTAN_NOEKEON_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/rc2/rc2.h b/src/cipher/rc2/rc2.h
index 8f46821a4..ddf5154b8 100644
--- a/src/cipher/rc2/rc2.h
+++ b/src/cipher/rc2/rc2.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_RC2_H__
 #define BOTAN_RC2_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/rc5/rc5.h b/src/cipher/rc5/rc5.h
index 0827048dc..bb91c3e68 100644
--- a/src/cipher/rc5/rc5.h
+++ b/src/cipher/rc5/rc5.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_RC5_H__
 #define BOTAN_RC5_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/rc6/rc6.h b/src/cipher/rc6/rc6.h
index d629b0995..3517b4671 100644
--- a/src/cipher/rc6/rc6.h
+++ b/src/cipher/rc6/rc6.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_RC6_H__
 #define BOTAN_RC6_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/safer/safer_sk.h b/src/cipher/safer/safer_sk.h
index 1bc65e2f7..121cf545b 100644
--- a/src/cipher/safer/safer_sk.h
+++ b/src/cipher/safer/safer_sk.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_SAFER_SK_H__
 #define BOTAN_SAFER_SK_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/seed/seed.h b/src/cipher/seed/seed.h
index 95ddbe1d5..9e96ec8c2 100644
--- a/src/cipher/seed/seed.h
+++ b/src/cipher/seed/seed.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_SEED_H__
 #define BOTAN_SEED_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/serpent/serpent.h b/src/cipher/serpent/serpent.h
index 76acff487..cac042185 100644
--- a/src/cipher/serpent/serpent.h
+++ b/src/cipher/serpent/serpent.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_SERPENT_H__
 #define BOTAN_SERPENT_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/skipjack/skipjack.h b/src/cipher/skipjack/skipjack.h
index 240148f19..c7c9ec9b9 100644
--- a/src/cipher/skipjack/skipjack.h
+++ b/src/cipher/skipjack/skipjack.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_SKIPJACK_H__
 #define BOTAN_SKIPJACK_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/square/square.h b/src/cipher/square/square.h
index efbc6e730..97326e7ea 100644
--- a/src/cipher/square/square.h
+++ b/src/cipher/square/square.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_SQUARE_H__
 #define BOTAN_SQUARE_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/tea/tea.h b/src/cipher/tea/tea.h
index 2fc9fe838..71d4e02f9 100644
--- a/src/cipher/tea/tea.h
+++ b/src/cipher/tea/tea.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_TEA_H__
 #define BOTAN_TEA_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/twofish/twofish.h b/src/cipher/twofish/twofish.h
index 8519a9aa8..f7788722c 100644
--- a/src/cipher/twofish/twofish.h
+++ b/src/cipher/twofish/twofish.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_TWOFISH_H__
 #define BOTAN_TWOFISH_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {
 
diff --git a/src/cipher/xtea/xtea.h b/src/cipher/xtea/xtea.h
index 193c13bb9..03b41f683 100644
--- a/src/cipher/xtea/xtea.h
+++ b/src/cipher/xtea/xtea.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_XTEA_H__
 #define BOTAN_XTEA_H__
 
-#include <botan/base.h>
+#include <botan/block_cipher.h>
 
 namespace Botan {