4 files changed, 8 insertions, 4 deletions
diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h
index 2496eb0a54..81eb32be51 100644
--- a/source4/libnet/libnet.h
+++ b/source4/libnet/libnet.h
@@ -39,6 +39,7 @@ struct libnet_context {
 };
 
 
+#include "ldb.h"
 #include "libnet/libnet_passwd.h"
 #include "libnet/libnet_time.h"
 #include "libnet/libnet_rpc.h"
diff --git a/source4/libnet/libnet_join.h b/source4/libnet/libnet_join.h
index 35460b7a0a..3b233950b0 100644
--- a/source4/libnet/libnet_join.h
+++ b/source4/libnet/libnet_join.h
@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __LIBNET_JOIN_H__
+#define __LIBNET_JOIN_H__
+
 #include "librpc/gen_ndr/ndr_netlogon.h"
 
 enum libnet_Join_level {
@@ -76,3 +79,5 @@ struct libnet_Join {
 	} out;
 };
 
+
+#endif /* __LIBNET_JOIN_H__ */
diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index 7d738d8ee0..30012282e0 100644
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -23,8 +23,7 @@
 #include "smb.h"
 #include "libnet/libnet.h"
 #include "lib/crypto/crypto.h"
-#include "auth/credentials/credentials.h"
-#include "libcli/auth/proto.h"
+#include "libcli/auth/libcli_auth.h"
 
 /*
  * do a password change using DCERPC/SAMR calls
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index e92dbc281d..93e752311f 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -23,9 +23,8 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
-#include "auth/credentials/credentials.h"
+#include "libcli/auth/libcli_auth.h"
 #include "auth/gensec/schannel_proto.h"
-#include "libcli/auth/proto.h"
 
 
 /**