13 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/http/gensec/basic.c b/libcli/http/gensec/basic.c
index c7a1bbbb6c8..c7a1bbbb6c8 100644
--- a/source4/lib/http/gensec/basic.c
+++ b/libcli/http/gensec/basic.c
diff --git a/source4/lib/http/gensec/generic.c b/libcli/http/gensec/generic.c
index 5bafb839d65..5bafb839d65 100644
--- a/source4/lib/http/gensec/generic.c
+++ b/libcli/http/gensec/generic.c
diff --git a/source4/lib/http/http.c b/libcli/http/http.c
index 6be053136c8..6be053136c8 100644
--- a/source4/lib/http/http.c
+++ b/libcli/http/http.c
diff --git a/source4/lib/http/http.h b/libcli/http/http.h
index f2196031f03..f2196031f03 100644
--- a/source4/lib/http/http.h
+++ b/libcli/http/http.h
diff --git a/source4/lib/http/http_auth.c b/libcli/http/http_auth.c
index ece660584f6..ece660584f6 100644
--- a/source4/lib/http/http_auth.c
+++ b/libcli/http/http_auth.c
diff --git a/source4/lib/http/http_conn.c b/libcli/http/http_conn.c
index de1be3f2d8e..de1be3f2d8e 100644
--- a/source4/lib/http/http_conn.c
+++ b/libcli/http/http_conn.c
diff --git a/source4/lib/http/http_internal.h b/libcli/http/http_internal.h
index ec17f7e2850..ec17f7e2850 100644
--- a/source4/lib/http/http_internal.h
+++ b/libcli/http/http_internal.h
diff --git a/source4/lib/http/wscript_build b/libcli/http/wscript_build
index 4ef1574bc67..4ef1574bc67 100644
--- a/source4/lib/http/wscript_build
+++ b/libcli/http/wscript_build
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index f7656e5d7cd..4c0ed15396f 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -35,7 +35,7 @@
 #include "auth/credentials/credentials.h"
 #include "param/param.h"
 #include "libcli/resolve/resolve.h"
-#include "lib/http/http.h"
+#include "libcli/http/http.h"
 #include "lib/util/util_net.h"
 
 struct dcerpc_pipe_connect {
diff --git a/source4/librpc/rpc/dcerpc_roh.c b/source4/librpc/rpc/dcerpc_roh.c
index 9280c84f79a..a5320c5144d 100644
--- a/source4/librpc/rpc/dcerpc_roh.c
+++ b/source4/librpc/rpc/dcerpc_roh.c
@@ -32,7 +32,7 @@
 #include "librpc/rpc/dcerpc_roh.h"
 #include "librpc/rpc/dcerpc_proto.h"
 #include "lib/param/param.h"
-#include "lib/http/http.h"
+#include "libcli/http/http.h"
 
 static ssize_t tstream_roh_pending_bytes(struct tstream_context *stream);
 static struct tevent_req * tstream_roh_readv_send(
diff --git a/source4/librpc/rpc/dcerpc_roh_channel_in.c b/source4/librpc/rpc/dcerpc_roh_channel_in.c
index cc53c2a7f41..bc630f77e42 100644
--- a/source4/librpc/rpc/dcerpc_roh_channel_in.c
+++ b/source4/librpc/rpc/dcerpc_roh_channel_in.c
@@ -37,7 +37,7 @@
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_roh.h"
 #include "librpc/rpc/dcerpc_proto.h"
-#include "lib/http/http.h"
+#include "libcli/http/http.h"
 
 struct roh_connect_channel_state {
 	struct tevent_context		*ev;
diff --git a/source4/librpc/rpc/dcerpc_roh_channel_out.c b/source4/librpc/rpc/dcerpc_roh_channel_out.c
index 491bbadfa69..4a227823f4a 100644
--- a/source4/librpc/rpc/dcerpc_roh_channel_out.c
+++ b/source4/librpc/rpc/dcerpc_roh_channel_out.c
@@ -37,7 +37,7 @@
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_roh.h"
 #include "librpc/rpc/dcerpc_proto.h"
-#include "lib/http/http.h"
+#include "libcli/http/http.h"
 
 struct roh_connect_channel_state {
 	struct tevent_context		*ev;
diff --git a/wscript_build b/wscript_build
index ac6c044a605..f9e033c0dab 100644
--- a/wscript_build
+++ b/wscript_build
@@ -71,7 +71,6 @@ bld.RECURSE('source4/lib/registry')
 bld.RECURSE('source4/lib/messaging')
 bld.RECURSE('source4/lib/events')
 bld.RECURSE('source4/lib/cmdline')
-bld.RECURSE('source4/lib/http')
 if bld.CHECK_FOR_THIRD_PARTY():
     bld.RECURSE('third_party')
 bld.RECURSE('source4/lib/stream')
@@ -117,6 +116,7 @@ bld.RECURSE('libcli/echo')
 bld.RECURSE('libcli/dns')
 bld.RECURSE('libcli/samsync')
 bld.RECURSE('libcli/registry')
+bld.RECURSE('libcli/http')
 bld.RECURSE('lib/mscat')
 bld.RECURSE('source4/lib/policy')
 bld.RECURSE('libcli/named_pipe_auth')