5 files changed, 34 insertions, 8 deletions
diff --git a/source3/include/locking.h b/source3/include/locking.h
index 77a04eee2b..b003b55aa4 100644
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -45,7 +45,7 @@ struct lock_context {
 
 struct files_struct;
 
-#include "../librpc/gen_ndr/file_id.h"
+#include "lib/file_id.h"
 
 struct byte_range_lock {
 	struct files_struct *fsp;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 14fe730b40..8392b68797 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -122,11 +122,6 @@ int map_errno_from_nt_status(NTSTATUS status);
 /* The following definitions come from lib/file_id.c  */
 
 struct file_id vfs_file_id_from_sbuf(connection_struct *conn, const SMB_STRUCT_STAT *sbuf);
-bool file_id_equal(const struct file_id *id1, const struct file_id *id2);
-const char *file_id_string_tos(const struct file_id *id);
-void push_file_id_16(char *buf, const struct file_id *id);
-void push_file_id_24(char *buf, const struct file_id *id);
-void pull_file_id_24(char *buf, struct file_id *id);
 
 /* The following definitions come from lib/gencache.c  */
 
diff --git a/source3/lib/file_id.c b/source3/lib/file_id.c
index 67c1dd0b1b..026d2f8d27 100644
--- a/source3/lib/file_id.c
+++ b/source3/lib/file_id.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/file_id.h"
 
 /*
   return True if two file_id structures are equal
diff --git a/source3/lib/file_id.h b/source3/lib/file_id.h
new file mode 100644
index 0000000000..594f788e49
--- /dev/null
+++ b/source3/lib/file_id.h
@@ -0,0 +1,30 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   file_id structure handling
+
+   Copyright (C) Andrew Tridgell 2007
+
+   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 3 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, see <http://www.gnu.org/licenses/>.
+*/
+
+/* The following definitions come from lib/file_id.c  */
+
+#include "librpc/gen_ndr/file_id.h"
+
+bool file_id_equal(const struct file_id *id1, const struct file_id *id2);
+const char *file_id_string_tos(const struct file_id *id);
+void push_file_id_16(char *buf, const struct file_id *id);
+void push_file_id_24(char *buf, const struct file_id *id);
+void pull_file_id_24(char *buf, struct file_id *id);
diff --git a/source3/wscript_build b/source3/wscript_build
index 072799551a..9f05f70021 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -66,7 +66,7 @@ LIB_SRC = '''
           lib/ldap_escape.c
           lib/fncall.c
           libads/krb5_errs.c lib/system_smbd.c lib/audit.c
-          lib/file_id.c lib/idmap_cache.c'''
+          lib/idmap_cache.c'''
 
 LIB_UTIL_SRC = '''
                lib/system.c
@@ -1069,7 +1069,7 @@ bld.SAMBA3_LIBRARY('dbwrap',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('samba3-util',
-                   source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/memcache.c lib/string_init.c lib/namearray.c''',
+                   source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/memcache.c lib/string_init.c lib/namearray.c lib/file_id.c''',
                    deps='samba-util charset',
                    private_library=True)