Fix headers in svcinstall.c.

diff --git a/source/svcinstall.c b/source/svcinstall.c
index 6df864d31a426edee664814369139ebf49b71d7d..cd3d1c65c299326768d7a18ae43ccc00bf32d04e 100644 (file)
--- a/source/svcinstall.c
+++ b/source/svcinstall.c
@@ -6,38 +6,17 @@
 
 #include "build/winexe_build.h"
 
-#ifdef USE_SAMBA_TREE_HEADERS
-#include "includes.h"
-#include "system/filesys.h"
-#include "param/param.h"
-#include "libcli/resolve/resolve.h"
-#include "lib/events/events.h"
-#include "lib/util/samba_util.h"
-#include "libcli/libcli.h"
-#include "librpc/rpc/dcerpc.h"
-#include "librpc/gen_ndr/ndr_svcctl_c.h"
-#include "libcli/smb_composite/smb_composite.h"
-#else
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <tevent.h>
-#include <samba-4.0/core/ntstatus.h>
-#include <samba-4.0/param.h>
-#include <samba-4.0/gen_ndr/ndr_svcctl_c.h>
-#include <samba-4.0/smb_cliraw.h>
-#include <samba-4.0/dcerpc.h>
-#include <samba-4.0/util.h>
-// #includes still available only from Samba tree
-#include "param/param_proto.h"
-#include "lib/socket/socket.h"
-#include "libcli/resolve/lp_proto.h"
-#include "libcli/libcli.h"
-#include "libcli/smb_composite/smb_composite.h"
-#define DEBUG(x,y)
-#define DEBUGLVL(x) 0
-#endif
+#include <core/ntstatus.h>
+#include <param.h>
+#include <gen_ndr/ndr_svcctl_c.h>
+#include <smb_cliraw.h>
+#include <dcerpc.h>
+#include <util.h>
 
 #include "svcinstall.h"