7 files changed, 38 insertions, 6 deletions
diff --git a/source4/libcli/auth/libcli_auth.h b/source4/libcli/auth/libcli_auth.h
new file mode 100644
index 00000000000..f8f07e83375
--- /dev/null
+++ b/source4/libcli/auth/libcli_auth.h
@@ -0,0 +1,25 @@
+/* 
+   samba -- Unix SMB/CIFS implementation.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef __LIBCLI_AUTH_H__
+#define __LIBCLI_AUTH_H__
+
+#include "librpc/gen_ndr/netlogon.h"
+#include "auth/credentials/credentials.h"
+#include "libcli/auth/proto.h"
+
+#endif /* __LIBCLI_AUTH_H__ */
diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c
index 587fb98920b..24fdeff33fb 100644
--- a/source4/libcli/auth/smbencrypt.c
+++ b/source4/libcli/auth/smbencrypt.c
@@ -28,8 +28,7 @@
 #include "auth/ntlmssp/ntlmssp.h"
 #include "auth/ntlmssp/msrpc_parse.h"
 #include "lib/crypto/crypto.h"
-#include "auth/credentials/credentials.h"
-#include "libcli/auth/proto.h"
+#include "libcli/auth/libcli_auth.h"
 #include "pstring.h"
 
 /*
diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index a718f43d96e..d89d6a15681 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -24,8 +24,7 @@
 #include "includes.h"
 #include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
-#include "auth/credentials/credentials.h"
-#include "libcli/auth/proto.h"
+#include "libcli/auth/libcli_auth.h"
 #include "libcli/smb_composite/smb_composite.h"
 
 /*
diff --git a/source4/libcli/composite/composite.h b/source4/libcli/composite/composite.h
index d1299d77c1f..6210b2b2271 100644
--- a/source4/libcli/composite/composite.h
+++ b/source4/libcli/composite/composite.h
@@ -61,4 +61,7 @@ struct composite_context {
 	BOOL used_wait;
 };
 
+struct irpc_request;
+struct smbcli_request;
+
 #include "libcli/composite/proto.h"
diff --git a/source4/libcli/libcli.h b/source4/libcli/libcli.h
index 76fa13525e1..c358ac57524 100644
--- a/source4/libcli/libcli.h
+++ b/source4/libcli/libcli.h
@@ -19,6 +19,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __LIBCLI_H__
+#define __LIBCLI_H__
+
 #include "smb.h"
 
 /* 
@@ -47,3 +50,5 @@ struct nbt_dc_name {
 };
 
 #include "libcli/libcli_proto.h"
+
+#endif /* __LIBCLI_H__ */
diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c
index a62386b6721..318fc9fbed7 100644
--- a/source4/libcli/smb_composite/sesssetup.c
+++ b/source4/libcli/smb_composite/sesssetup.c
@@ -25,8 +25,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
-#include "auth/credentials/credentials.h"
-#include "libcli/auth/proto.h"
+#include "libcli/auth/libcli_auth.h"
 #include "auth/auth.h"
 #include "version.h"
 
diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h
index ac34ad40ac7..a7a82965e6b 100644
--- a/source4/libcli/smb_composite/smb_composite.h
+++ b/source4/libcli/smb_composite/smb_composite.h
@@ -171,4 +171,6 @@ struct smb_composite_connectmulti {
 	} out;
 };
 
+struct smbcli_session;
+
 #include "libcli/smb_composite/proto.h"