4 files changed, 4 insertions, 51 deletions
diff --git a/source3/include/idmap.h b/source3/include/idmap.h
index aab41cd7d3..8a1da81e39 100644
--- a/source3/include/idmap.h
+++ b/source3/include/idmap.h
@@ -30,6 +30,8 @@
 
 #define SMB_IDMAP_INTERFACE_VERSION 5
 
+#include "librpc/gen_ndr/idmap.h"
+
 struct idmap_domain {
 	const char *name;
 	struct idmap_methods *methods;
@@ -60,4 +62,6 @@ struct idmap_methods {
 	NTSTATUS (*close_fn)(struct idmap_domain *dom);
 };
 
+#include "winbindd/idmap_proto.h"
+
 #endif /* _IDMAP_H_ */
diff --git a/source3/include/includes.h b/source3/include/includes.h
index d409a354a1..e65ea437ed 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -653,7 +653,6 @@ struct ntlmssp_state;
 #include "auth.h"
 #include "ntdomain.h"
 #include "librpc/rpc/dcerpc.h"
-#include "idmap.h"
 #include "client.h"
 
 #include "session.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 7728af3ff5..87b2e275ad 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5653,55 +5653,6 @@ NTSTATUS vfs_stat_fsp(files_struct *fsp);
 char *stdin_new_passwd( void);
 char *get_pass( const char *prompt, bool stdin_get);
 
-/* The following definitions come from winbindd/idmap.c  */
-
-bool idmap_is_offline(void);
-bool idmap_is_online(void);
-NTSTATUS smb_register_idmap(int version, const char *name,
-			    struct idmap_methods *methods);
-void idmap_close(void);
-NTSTATUS idmap_init_cache(void);
-NTSTATUS idmap_allocate_uid(struct unixid *id);
-NTSTATUS idmap_allocate_gid(struct unixid *id);
-NTSTATUS idmap_backends_unixid_to_sid(const char *domname,
-				      struct id_map *id);
-NTSTATUS idmap_backends_sid_to_unixid(const char *domname,
-				      struct id_map *id);
-NTSTATUS idmap_new_mapping(const struct dom_sid *psid, enum id_type type,
-			   struct unixid *pxid);
-
-/* The following definitions come from winbindd/idmap_cache.c  */
-
-bool idmap_cache_find_sid2uid(const struct dom_sid *sid, uid_t *puid,
-			      bool *expired);
-bool idmap_cache_find_uid2sid(uid_t uid, struct dom_sid *sid, bool *expired);
-void idmap_cache_set_sid2uid(const struct dom_sid *sid, uid_t uid);
-bool idmap_cache_find_sid2gid(const struct dom_sid *sid, gid_t *pgid,
-			      bool *expired);
-bool idmap_cache_find_gid2sid(gid_t gid, struct dom_sid *sid, bool *expired);
-void idmap_cache_set_sid2gid(const struct dom_sid *sid, gid_t gid);
-
-
-/* The following definitions come from winbindd/idmap_nss.c  */
-
-NTSTATUS idmap_nss_init(void);
-
-/* The following definitions come from winbindd/idmap_passdb.c  */
-
-NTSTATUS idmap_passdb_init(void);
-
-/* The following definitions come from winbindd/idmap_tdb.c  */
-
-NTSTATUS idmap_tdb_init(void);
-
-/* The following definitions come from winbindd/idmap_util.c  */
-
-NTSTATUS idmap_uid_to_sid(const char *domname, struct dom_sid *sid, uid_t uid);
-NTSTATUS idmap_gid_to_sid(const char *domname, struct dom_sid *sid, gid_t gid);
-NTSTATUS idmap_sid_to_uid(const char *dom_name, struct dom_sid *sid, uid_t *uid);
-NTSTATUS idmap_sid_to_gid(const char *domname, struct dom_sid *sid, gid_t *gid);
-bool idmap_unix_id_is_in_range(uint32_t id, struct idmap_domain *dom);
-
 /* The following definitions come from winbindd/nss_info.c  */
 
 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 05a02637bd..74f1eb535a 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -174,7 +174,6 @@ typedef union unid_t {
 					|LOOKUP_NAME_WKN\
 					|LOOKUP_NAME_DOMAIN)
 
-#include "librpc/gen_ndr/idmap.h"
 #include "librpc/gen_ndr/epmapper.h"
 #include "librpc/gen_ndr/dcerpc.h"