Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4

Conflicts:
	source3/include/includes.h

5 files changed, 6 insertions, 4 deletions

diff --git a/lib/crypto/hmacmd5.h b/lib/crypto/hmacmd5.h
index d649906bb4..91b8ca586c 100644
--- a/lib/crypto/hmacmd5.h
+++ b/lib/crypto/hmacmd5.h
@@ -21,6 +21,8 @@
 #ifndef _HMAC_MD5_H
 #define _HMAC_MD5_H
 
+#include "../lib/crypto/md5.h"
+
 typedef struct 
 {
         struct MD5Context ctx;
diff --git a/lib/crypto/hmacmd5test.c b/lib/crypto/hmacmd5test.c
index 07ed54c98d..0a98404eda 100644
--- a/lib/crypto/hmacmd5test.c
+++ b/lib/crypto/hmacmd5test.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "includes.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 
 struct torture_context;
 
diff --git a/lib/crypto/hmacsha256.c b/lib/crypto/hmacsha256.c
index 6b0af9ee83..53d4fe3883 100644
--- a/lib/crypto/hmacsha256.c
+++ b/lib/crypto/hmacsha256.c
@@ -27,7 +27,7 @@
  */
 
 #include "includes.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 
 /***********************************************************************
  the rfc 2104/2202 version of hmac_sha256 initialisation.
diff --git a/lib/crypto/md4test.c b/lib/crypto/md4test.c
index 5e0451973c..dddf9e61a0 100644
--- a/lib/crypto/md4test.c
+++ b/lib/crypto/md4test.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 
 struct torture_context;
 
diff --git a/lib/crypto/md5test.c b/lib/crypto/md5test.c
index 702e0fcf41..1244dca753 100644
--- a/lib/crypto/md5test.c
+++ b/lib/crypto/md5test.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 
 struct torture_context;