36 files changed, 37 insertions, 37 deletions
diff --git a/src/apply.c b/src/apply.c
index 9d607dd50..55b1a397f 100644
--- a/src/apply.c
+++ b/src/apply.c
@@ -18,7 +18,7 @@
 #include "git2/repository.h"
 #include "array.h"
 #include "patch.h"
-#include "fileops.h"
+#include "futils.h"
 #include "delta.h"
 #include "zstream.h"
 #include "reader.h"
diff --git a/src/attr_file.h b/src/attr_file.h
index 9538f478d..f4f9a097a 100644
--- a/src/attr_file.h
+++ b/src/attr_file.h
@@ -14,7 +14,7 @@
 #include "vector.h"
 #include "pool.h"
 #include "buffer.h"
-#include "fileops.h"
+#include "futils.h"
 
 #define GIT_ATTR_FILE			".gitattributes"
 #define GIT_ATTR_FILE_INREPO	"attributes"
diff --git a/src/blob.h b/src/blob.h
index b9aa33004..0d743ec2c 100644
--- a/src/blob.h
+++ b/src/blob.h
@@ -12,7 +12,7 @@
 #include "git2/blob.h"
 #include "repository.h"
 #include "odb.h"
-#include "fileops.h"
+#include "futils.h"
 
 struct git_blob {
 	git_object object;
diff --git a/src/clone.c b/src/clone.c
index 4e2dd50c7..e0b43f149 100644
--- a/src/clone.c
+++ b/src/clone.c
@@ -19,7 +19,7 @@
 #include "git2/tree.h"
 
 #include "remote.h"
-#include "fileops.h"
+#include "futils.h"
 #include "refs.h"
 #include "path.h"
 #include "repository.h"
diff --git a/src/config_cache.c b/src/config_cache.c
index dbc463bcf..e4e071b54 100644
--- a/src/config_cache.c
+++ b/src/config_cache.c
@@ -7,7 +7,7 @@
 
 #include "common.h"
 
-#include "fileops.h"
+#include "futils.h"
 #include "repository.h"
 #include "config.h"
 #include "git2/config.h"
diff --git a/src/config_parse.h b/src/config_parse.h
index 0129ee309..b791d3245 100644
--- a/src/config_parse.h
+++ b/src/config_parse.h
@@ -10,7 +10,7 @@
 #include "common.h"
 
 #include "array.h"
-#include "fileops.h"
+#include "futils.h"
 #include "oid.h"
 #include "parse.h"
 
diff --git a/src/crlf.c b/src/crlf.c
index 22989c16e..edccc0a42 100644
--- a/src/crlf.c
+++ b/src/crlf.c
@@ -12,7 +12,7 @@
 #include "git2/index.h"
 #include "git2/sys/filter.h"
 
-#include "fileops.h"
+#include "futils.h"
 #include "hash.h"
 #include "filter.h"
 #include "buf_text.h"
diff --git a/src/diff_file.c b/src/diff_file.c
index 48e95eb00..978d7eaba 100644
--- a/src/diff_file.c
+++ b/src/diff_file.c
@@ -12,7 +12,7 @@
 #include "diff.h"
 #include "diff_generate.h"
 #include "odb.h"
-#include "fileops.h"
+#include "futils.h"
 #include "filter.h"
 
 #define DIFF_MAX_FILESIZE 0x20000000
diff --git a/src/diff_generate.c b/src/diff_generate.c
index dad3c0c41..7ec317b4a 100644
--- a/src/diff_generate.c
+++ b/src/diff_generate.c
@@ -9,7 +9,7 @@
 
 #include "diff.h"
 #include "patch_generate.h"
-#include "fileops.h"
+#include "futils.h"
 #include "config.h"
 #include "attr_file.h"
 #include "filter.h"
diff --git a/src/diff_print.c b/src/diff_print.c
index 664336e21..f1aac5eb0 100644
--- a/src/diff_print.c
+++ b/src/diff_print.c
@@ -10,7 +10,7 @@
 #include "diff.h"
 #include "diff_file.h"
 #include "patch_generate.h"
-#include "fileops.h"
+#include "futils.h"
 #include "zstream.h"
 #include "blob.h"
 #include "delta.h"
diff --git a/src/diff_tform.c b/src/diff_tform.c
index a87661eae..fc6012126 100644
--- a/src/diff_tform.c
+++ b/src/diff_tform.c
@@ -14,7 +14,7 @@
 #include "diff.h"
 #include "diff_generate.h"
 #include "path.h"
-#include "fileops.h"
+#include "futils.h"
 #include "config.h"
 
 git_diff_delta *git_diff__delta_dup(
diff --git a/src/fetchhead.c b/src/fetchhead.c
index bdded029a..a3f6fbc7a 100644
--- a/src/fetchhead.c
+++ b/src/fetchhead.c
@@ -11,7 +11,7 @@
 #include "git2/oid.h"
 
 #include "buffer.h"
-#include "fileops.h"
+#include "futils.h"
 #include "filebuf.h"
 #include "refs.h"
 #include "repository.h"
diff --git a/src/filebuf.c b/src/filebuf.c
index 8a70bcd66..aaebf82ec 100644
--- a/src/filebuf.c
+++ b/src/filebuf.c
@@ -7,7 +7,7 @@
 
 #include "filebuf.h"
 
-#include "fileops.h"
+#include "futils.h"
 
 static const size_t WRITE_BUFFER_SIZE = (4096 * 2);
 
diff --git a/src/filebuf.h b/src/filebuf.h
index f51ff230f..b5002ecb2 100644
--- a/src/filebuf.h
+++ b/src/filebuf.h
@@ -9,7 +9,7 @@
 
 #include "common.h"
 
-#include "fileops.h"
+#include "futils.h"
 #include "hash.h"
 #include <zlib.h>
 
diff --git a/src/filter.c b/src/filter.c
index 34e2dfa17..6c929c030 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -8,7 +8,7 @@
 #include "filter.h"
 
 #include "common.h"
-#include "fileops.h"
+#include "futils.h"
 #include "hash.h"
 #include "repository.h"
 #include "global.h"
diff --git a/src/fileops.c b/src/futils.c
index 648ffbe5d..e15c8017f 100644
--- a/src/fileops.c
+++ b/src/futils.c
@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "fileops.h"
+#include "futils.h"
 
 #include "global.h"
 #include "strmap.h"
diff --git a/src/fileops.h b/src/futils.h
index 85131f834..1e2d3f9d9 100644
--- a/src/fileops.h
+++ b/src/futils.h
@@ -4,8 +4,8 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
-#ifndef INCLUDE_fileops_h__
-#define INCLUDE_fileops_h__
+#ifndef INCLUDE_futils_h__
+#define INCLUDE_futils_h__
 
 #include "common.h"
 
diff --git a/src/hashsig.c b/src/hashsig.c
index abebd7a54..14ec34b2f 100644
--- a/src/hashsig.c
+++ b/src/hashsig.c
@@ -8,7 +8,7 @@
 #include "common.h"
 
 #include "git2/sys/hashsig.h"
-#include "fileops.h"
+#include "futils.h"
 #include "util.h"
 
 typedef uint32_t hashsig_t;
diff --git a/src/index.h b/src/index.h
index 982afed3a..54402f563 100644
--- a/src/index.h
+++ b/src/index.h
@@ -9,7 +9,7 @@
 
 #include "common.h"
 
-#include "fileops.h"
+#include "futils.h"
 #include "filebuf.h"
 #include "vector.h"
 #include "idxmap.h"
diff --git a/src/merge_file.c b/src/merge_file.c
index 0647a5df6..23daa84c4 100644
--- a/src/merge_file.c
+++ b/src/merge_file.c
@@ -9,7 +9,7 @@
 
 #include "repository.h"
 #include "posix.h"
-#include "fileops.h"
+#include "futils.h"
 #include "index.h"
 #include "diff_xdiff.h"
 #include "merge.h"
diff --git a/src/mwindow.c b/src/mwindow.c
index 949e5fa46..e834f7621 100644
--- a/src/mwindow.c
+++ b/src/mwindow.c
@@ -8,7 +8,7 @@
 #include "mwindow.h"
 
 #include "vector.h"
-#include "fileops.h"
+#include "futils.h"
 #include "map.h"
 #include "global.h"
 #include "strmap.h"
diff --git a/src/odb.c b/src/odb.c
index 24befad18..06e4930b0 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -10,7 +10,7 @@
 #include <zlib.h>
 #include "git2/object.h"
 #include "git2/sys/odb_backend.h"
-#include "fileops.h"
+#include "futils.h"
 #include "hash.h"
 #include "delta.h"
 #include "filter.h"
diff --git a/src/odb_loose.c b/src/odb_loose.c
index 4b249b6b6..04b81653b 100644
--- a/src/odb_loose.c
+++ b/src/odb_loose.c
@@ -10,7 +10,7 @@
 #include <zlib.h>
 #include "git2/object.h"
 #include "git2/sys/odb_backend.h"
-#include "fileops.h"
+#include "futils.h"
 #include "hash.h"
 #include "odb.h"
 #include "delta.h"
diff --git a/src/odb_mempack.c b/src/odb_mempack.c
index fc2302301..6728c6c42 100644
--- a/src/odb_mempack.c
+++ b/src/odb_mempack.c
@@ -10,7 +10,7 @@
 #include "git2/object.h"
 #include "git2/sys/odb_backend.h"
 #include "git2/sys/mempack.h"
-#include "fileops.h"
+#include "futils.h"
 #include "hash.h"
 #include "odb.h"
 #include "array.h"
diff --git a/src/odb_pack.c b/src/odb_pack.c
index bd760dbe1..c93d07c46 100644
--- a/src/odb_pack.c
+++ b/src/odb_pack.c
@@ -11,7 +11,7 @@
 #include "git2/repository.h"
 #include "git2/indexer.h"
 #include "git2/sys/odb_backend.h"
-#include "fileops.h"
+#include "futils.h"
 #include "hash.h"
 #include "odb.h"
 #include "delta.h"
diff --git a/src/pack.c b/src/pack.c
index c9d5602cd..68eeb7b0d 100644
--- a/src/pack.c
+++ b/src/pack.c
@@ -11,7 +11,7 @@
 #include "delta.h"
 #include "sha1_lookup.h"
 #include "mwindow.h"
-#include "fileops.h"
+#include "futils.h"
 #include "oid.h"
 
 #include <zlib.h>
diff --git a/src/patch_generate.c b/src/patch_generate.c
index 5023bfe28..18256d076 100644
--- a/src/patch_generate.c
+++ b/src/patch_generate.c
@@ -15,7 +15,7 @@
 #include "diff_xdiff.h"
 #include "delta.h"
 #include "zstream.h"
-#include "fileops.h"
+#include "futils.h"
 
 static void diff_output_init(
 	git_patch_generated_output *, const git_diff_options *, git_diff_file_cb,
diff --git a/src/reader.c b/src/reader.c
index 1a4844698..2d87251ee 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -7,7 +7,7 @@
 
 #include "reader.h"
 
-#include "fileops.h"
+#include "futils.h"
 #include "blob.h"
 
 #include "git2/tree.h"
diff --git a/src/refdb_fs.c b/src/refdb_fs.c
index 09ec7192f..a20f1ebcc 100644
--- a/src/refdb_fs.c
+++ b/src/refdb_fs.c
@@ -10,7 +10,7 @@
 #include "refs.h"
 #include "hash.h"
 #include "repository.h"
-#include "fileops.h"
+#include "futils.h"
 #include "filebuf.h"
 #include "pack.h"
 #include "reflog.h"
diff --git a/src/refs.c b/src/refs.c
index fd407b34b..07784302b 100644
--- a/src/refs.c
+++ b/src/refs.c
@@ -9,7 +9,7 @@
 
 #include "hash.h"
 #include "repository.h"
-#include "fileops.h"
+#include "futils.h"
 #include "filebuf.h"
 #include "pack.h"
 #include "reflog.h"
diff --git a/src/repository.c b/src/repository.c
index 002e84f91..6a49899ad 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -16,7 +16,7 @@
 #include "commit.h"
 #include "tag.h"
 #include "blob.h"
-#include "fileops.h"
+#include "futils.h"
 #include "sysdir.h"
 #include "filebuf.h"
 #include "index.h"
diff --git a/src/sortedcache.h b/src/sortedcache.h
index a53ff48a3..e553d01dd 100644
--- a/src/sortedcache.h
+++ b/src/sortedcache.h
@@ -10,7 +10,7 @@
 #include "common.h"
 
 #include "util.h"
-#include "fileops.h"
+#include "futils.h"
 #include "vector.h"
 #include "thread-utils.h"
 #include "pool.h"
diff --git a/src/status.c b/src/status.c
index 754fe084e..42c98f60e 100644
--- a/src/status.c
+++ b/src/status.c
@@ -8,7 +8,7 @@
 #include "status.h"
 
 #include "git2.h"
-#include "fileops.h"
+#include "futils.h"
 #include "hash.h"
 #include "vector.h"
 #include "tree.h"
diff --git a/src/submodule.h b/src/submodule.h
index 91a4e1223..57d95c3fc 100644
--- a/src/submodule.h
+++ b/src/submodule.h
@@ -11,7 +11,7 @@
 
 #include "git2/submodule.h"
 #include "git2/repository.h"
-#include "fileops.h"
+#include "futils.h"
 
 /* Notes:
  *
diff --git a/src/tree.c b/src/tree.c
index 3799cabca..cd6ab9b2f 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -10,7 +10,7 @@
 #include "commit.h"
 #include "git2/repository.h"
 #include "git2/object.h"
-#include "fileops.h"
+#include "futils.h"
 #include "tree-cache.h"
 #include "index.h"
 
diff --git a/src/win32/posix_w32.c b/src/win32/posix_w32.c
index 91e164348..2d1fa9050 100644
--- a/src/win32/posix_w32.c
+++ b/src/win32/posix_w32.c
@@ -8,7 +8,7 @@
 #include "common.h"
 
 #include "../posix.h"
-#include "../fileops.h"
+#include "../futils.h"
 #include "path.h"
 #include "path_w32.h"
 #include "utf-conv.h"