diff --git a/source/libcli/auth/clikrb5.c b/source/libcli/auth/clikrb5.c
index 051798c9f18..f2536663f4b 100644
--- a/source/libcli/auth/clikrb5.c
+++ b/source/libcli/auth/clikrb5.c
@@ -23,7 +23,6 @@
 #include "system/network.h"
 #include "system/kerberos.h"
 #include "libcli/auth/kerberos.h"
-#include "system/time.h"
 
 #ifdef HAVE_KRB5
 
diff --git a/source/libcli/auth/credentials.c b/source/libcli/auth/credentials.c
index 18ce6fec1b9..bcb462ae9da 100644
--- a/source/libcli/auth/credentials.c
+++ b/source/libcli/auth/credentials.c
@@ -25,7 +25,6 @@
 #include "system/time.h"
 #include "auth/auth.h"
 #include "lib/crypto/crypto.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
 
 /*
   initialise the credentials state for old-style 64 bit session keys
diff --git a/source/libcli/auth/gensec_gssapi.c b/source/libcli/auth/gensec_gssapi.c
index 41f36b27031..c974b93952d 100644
--- a/source/libcli/auth/gensec_gssapi.c
+++ b/source/libcli/auth/gensec_gssapi.c
@@ -23,8 +23,6 @@
 
 #include "includes.h"
 #include "system/kerberos.h"
-#include "system/time.h"
-#include "libcli/auth/kerberos.h"
 #include "auth/auth.h"
 
 #undef DBGC_CLASS
diff --git a/source/libcli/auth/gensec_krb5.c b/source/libcli/auth/gensec_krb5.c
index a0c2a77f4b2..1fc33d36448 100644
--- a/source/libcli/auth/gensec_krb5.c
+++ b/source/libcli/auth/gensec_krb5.c
@@ -26,7 +26,6 @@
 
 #include "includes.h"
 #include "system/kerberos.h"
-#include "system/time.h"
 #include "libcli/auth/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "auth/auth.h"
diff --git a/source/libcli/auth/gssapi_parse.c b/source/libcli/auth/gssapi_parse.c
index f984f6303f0..89929c8c6df 100644
--- a/source/libcli/auth/gssapi_parse.c
+++ b/source/libcli/auth/gssapi_parse.c
@@ -25,7 +25,6 @@
 #include "includes.h"
 #include "asn_1.h"
 #include "system/kerberos.h"
-#include "libcli/auth/kerberos.h"
 #include "libcli/auth/gensec.h"
 
 /*
diff --git a/source/libcli/auth/kerberos.c b/source/libcli/auth/kerberos.c
index 2e5a53bb00d..186da0fcf4e 100644
--- a/source/libcli/auth/kerberos.c
+++ b/source/libcli/auth/kerberos.c
@@ -24,7 +24,6 @@
 #include "includes.h"
 #include "system/kerberos.h"
 #include "libcli/auth/kerberos.h"
-#include "system/time.h"
 #include "secrets.h"
 #include "pstring.h"
 #include "ads.h"
diff --git a/source/libcli/cliconnect.c b/source/libcli/cliconnect.c
index 263527ffc00..f391b6bc0de 100644
--- a/source/libcli/cliconnect.c
+++ b/source/libcli/cliconnect.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 
diff --git a/source/libcli/composite/fetchfile.c b/source/libcli/composite/fetchfile.c
index 4f63f6328f3..a7d6f2ffd87 100644
--- a/source/libcli/composite/fetchfile.c
+++ b/source/libcli/composite/fetchfile.c
@@ -24,7 +24,6 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 enum fetchfile_stage {FETCHFILE_CONNECT,
 		      FETCHFILE_READ};
diff --git a/source/libcli/ldap/ldap.c b/source/libcli/ldap/ldap.c
index 4b449e5123e..2962f7eef46 100644
--- a/source/libcli/ldap/ldap.c
+++ b/source/libcli/ldap/ldap.c
@@ -25,7 +25,6 @@
 
 #include "includes.h"
 #include "system/iconv.h"
-#include "system/filesys.h"
 #include "asn_1.h"
 #include "libcli/ldap/ldap.h"
 
diff --git a/source/libcli/nbt/namequery.c b/source/libcli/nbt/namequery.c
index 5907c45b875..a9748c7bd25 100644
--- a/source/libcli/nbt/namequery.c
+++ b/source/libcli/nbt/namequery.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "libcli/nbt/libnbt.h"
-#include "system/network.h"
 
 /*
   send a nbt name query
diff --git a/source/libcli/nbt/namerefresh.c b/source/libcli/nbt/namerefresh.c
index 99d79054a62..a344f2c6e80 100644
--- a/source/libcli/nbt/namerefresh.c
+++ b/source/libcli/nbt/namerefresh.c
@@ -24,7 +24,6 @@
 #include "libcli/nbt/libnbt.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
-#include "system/network.h"
 
 /*
   send a nbt name refresh request
diff --git a/source/libcli/nbt/nameregister.c b/source/libcli/nbt/nameregister.c
index b0ed1ae89c3..9c1db385298 100644
--- a/source/libcli/nbt/nameregister.c
+++ b/source/libcli/nbt/nameregister.c
@@ -24,7 +24,6 @@
 #include "libcli/nbt/libnbt.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
-#include "system/network.h"
 
 /*
   send a nbt name registration request
diff --git a/source/libcli/raw/clisession.c b/source/libcli/raw/clisession.c
index 4eba4642742..5f757018713 100644
--- a/source/libcli/raw/clisession.c
+++ b/source/libcli/raw/clisession.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/filesys.h"
-#include "auth/auth.h"
 
 #define SETUP_REQUEST_SESSION(cmd, wct, buflen) do { \
 	req = smbcli_request_setup_session(session, cmd, wct, buflen); \
diff --git a/source/libcli/raw/clitransport.c b/source/libcli/raw/clitransport.c
index ee382da3c2a..05833b2f9ad 100644
--- a/source/libcli/raw/clitransport.c
+++ b/source/libcli/raw/clitransport.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "lib/socket/socket.h"
-#include "system/time.h"
 #include "dlinklist.h"
 #include "lib/events/events.h"
 
diff --git a/source/libcli/raw/rawacl.c b/source/libcli/raw/rawacl.c
index b2dac09f811..82c69ec706e 100644
--- a/source/libcli/raw/rawacl.c
+++ b/source/libcli/raw/rawacl.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/raw/libcliraw.h"
 
 /****************************************************************************
 fetch file ACL (async send)
diff --git a/source/libcli/raw/raweas.c b/source/libcli/raw/raweas.c
index 49be9a43e64..4ab33441359 100644
--- a/source/libcli/raw/raweas.c
+++ b/source/libcli/raw/raweas.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "libcli/raw/libcliraw.h"
 
 /*
   work out how many bytes on the wire a ea list will consume.