diff --git a/src/iterator.c b/src/iterator.c
index 1276903a7..a7a44914c 100644
--- a/src/iterator.c
+++ b/src/iterator.c
@@ -10,7 +10,7 @@
 #include "index.h"
 #include "ignore.h"
 #include "buffer.h"
-#include "git2/submodule.h"
+#include "submodule.h"
 #include <ctype.h>
 
 #define ITERATOR_SET_CB(P,NAME_LC) do { \
diff --git a/src/merge_file.c b/src/merge_file.c
index ab9ca4168..ff0364432 100644
--- a/src/merge_file.c
+++ b/src/merge_file.c
@@ -117,7 +117,7 @@ static int git_merge_file__from_inputs(
 
 	memset(out, 0x0, sizeof(git_merge_file_result));
 
-	merge_file_normalize_opts(&options, given_opts);		
+	merge_file_normalize_opts(&options, given_opts);
 
 	memset(&xmparam, 0x0, sizeof(xmparam_t));
 
@@ -165,7 +165,7 @@ static int git_merge_file__from_inputs(
 	}
 
 	out->automergeable = (xdl_result == 0);
-	out->ptr = (unsigned char *)mmbuffer.ptr;
+	out->ptr = (const char *)mmbuffer.ptr;
 	out->len = mmbuffer.size;
 	out->mode = merge_file_best_mode(ancestor, ours, theirs);
 
diff --git a/src/submodule.h b/src/submodule.h
index 8199eb1da..1c41897e3 100644
--- a/src/submodule.h
+++ b/src/submodule.h
@@ -120,7 +120,7 @@ enum {
 	((S) & ~(0xFFFFFFFFu << 20))
 
 /* Internal submodule check does not attempt to refresh cached data */
-bool git_submodule__is_submodule(git_repository *repo, const char *name);
+extern bool git_submodule__is_submodule(git_repository *repo, const char *name);
 
 /* Internal status fn returns status and optionally the various OIDs */
 extern int git_submodule__status(