lib/crypto: only include what is needed.

Guenther

11 files changed, 15 insertions, 10 deletions

diff --git a/lib/crypto/arcfour.c b/lib/crypto/arcfour.c
index c57e05d0e91..1afd659be69 100644
--- a/lib/crypto/arcfour.c
+++ b/lib/crypto/arcfour.c
@@ -19,7 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "../lib/crypto/arcfour.h"
 
 /* initialise the arcfour sbox with key */
diff --git a/lib/crypto/arcfour.h b/lib/crypto/arcfour.h
index 501b3f2fab6..a9f80c474d5 100644
--- a/lib/crypto/arcfour.h
+++ b/lib/crypto/arcfour.h
@@ -1,6 +1,8 @@
 #ifndef ARCFOUR_HEADER_H
 #define ARCFOUR_HEADER_H
 
+#include "../lib/util/data_blob.h"
+
 struct arcfour_state {
 	uint8_t sbox[256];
 	uint8_t index_i;
diff --git a/lib/crypto/crc32.c b/lib/crypto/crc32.c
index e6cc5297676..cca62a0c046 100644
--- a/lib/crypto/crc32.c
+++ b/lib/crypto/crc32.c
@@ -40,7 +40,7 @@
  * CRC32 code derived from work by Gary S. Brown.
  */
 
-#include "includes.h"
+#include "replace.h"
 #include "../lib/crypto/crc32.h"
 
 static const uint32_t crc32_tab[] = {
diff --git a/lib/crypto/hmacmd5.c b/lib/crypto/hmacmd5.c
index 0c8d1ab5983..cfbd428014b 100644
--- a/lib/crypto/hmacmd5.c
+++ b/lib/crypto/hmacmd5.c
@@ -22,7 +22,7 @@
  * for ntlmv2.
  */
 
-#include "includes.h"
+#include "replace.h"
 #include "../lib/crypto/hmacmd5.h"
 
 /***********************************************************************
diff --git a/lib/crypto/hmacmd5test.c b/lib/crypto/hmacmd5test.c
index 77f305a5d39..a6621a6e135 100644
--- a/lib/crypto/hmacmd5test.c
+++ b/lib/crypto/hmacmd5test.c
@@ -16,7 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "includes.h"
+#include "replace.h"
+#include "../lib/util/util.h"
 #include "../lib/crypto/crypto.h"
 
 struct torture_context;
diff --git a/lib/crypto/hmacsha256.c b/lib/crypto/hmacsha256.c
index 53d4fe38839..1a31441297d 100644
--- a/lib/crypto/hmacsha256.c
+++ b/lib/crypto/hmacsha256.c
@@ -26,7 +26,7 @@
  taken direct from rfc2202 implementation and modified for suitable use
  */
 
-#include "includes.h"
+#include "replace.h"
 #include "../lib/crypto/crypto.h"
 
 /***********************************************************************
diff --git a/lib/crypto/md4.c b/lib/crypto/md4.c
index aea2c821c5e..7eb6070cd44 100644
--- a/lib/crypto/md4.c
+++ b/lib/crypto/md4.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "../lib/crypto/md4.h"
 
 /* NOTE: This code makes no attempt to be fast! 
diff --git a/lib/crypto/md4test.c b/lib/crypto/md4test.c
index a6080cff823..e406c692a12 100644
--- a/lib/crypto/md4test.c
+++ b/lib/crypto/md4test.c
@@ -17,7 +17,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "../lib/util/util.h"
 #include "../lib/crypto/crypto.h"
 
 struct torture_context;
diff --git a/lib/crypto/md5.c b/lib/crypto/md5.c
index 566aacaf280..e6178cc015c 100644
--- a/lib/crypto/md5.c
+++ b/lib/crypto/md5.c
@@ -18,7 +18,7 @@
 /* This code slightly modified to fit into Samba by 
    abartlet@samba.org Jun 2001 */
 
-#include "includes.h"
+#include "replace.h"
 
 #include "md5.h"
 
diff --git a/lib/crypto/md5test.c b/lib/crypto/md5test.c
index 7223af21143..0457d4d4ea4 100644
--- a/lib/crypto/md5test.c
+++ b/lib/crypto/md5test.c
@@ -17,7 +17,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "../lib/util/util.h"
 #include "../lib/crypto/crypto.h"
 
 struct torture_context;
diff --git a/lib/crypto/sha256.c b/lib/crypto/sha256.c
index 233abe23f8d..42ab2363aa7 100644
--- a/lib/crypto/sha256.c
+++ b/lib/crypto/sha256.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include "replace.h"
 #include "sha256.h"
 
 #define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))