diff --git a/include/git2/refs.h b/include/git2/refs.h
index c92646115..af6c2f43b 100644
--- a/include/git2/refs.h
+++ b/include/git2/refs.h
@@ -381,7 +381,7 @@ GIT_EXTERN(int) git_reference_foreach_glob(
 	git_repository *repo,
 	const char *glob,
 	unsigned int list_flags,
-	int (*callback)(const char *reference_name, void *payload),
+	git_reference_foreach_cb callback,
 	void *payload);
 
 /**
diff --git a/include/git2/strarray.h b/include/git2/strarray.h
index 030567978..338d13873 100644
--- a/include/git2/strarray.h
+++ b/include/git2/strarray.h
@@ -19,11 +19,10 @@
 GIT_BEGIN_DECL
 
 /** Array of strings */
-typedef struct _git_strarray git_strarray;
-struct _git_strarray {
+typedef struct git_strarray {
     char **strings;
     size_t count;
-};
+} git_strarray;
 
 /**
  * Close a string array object
diff --git a/tests-clar/network/fetch.c b/tests-clar/network/fetch.c
index 84c947291..26937c608 100644
--- a/tests-clar/network/fetch.c
+++ b/tests-clar/network/fetch.c
@@ -78,6 +78,7 @@ void test_network_fetch__no_tags_http(void)
 
 static void transferProgressCallback(const git_transfer_progress *stats, void *payload)
 {
+	GIT_UNUSED(stats);
 	bool *invoked = (bool *)payload;
 	*invoked = true;
 }
diff --git a/tests-clar/refs/branches/tracking.c b/tests-clar/refs/branches/tracking.c
index e8b2f24d7..84d2961ae 100644
--- a/tests-clar/refs/branches/tracking.c
+++ b/tests-clar/refs/branches/tracking.c
@@ -65,7 +65,8 @@ static void assert_merge_and_or_remote_key_missing(git_repository *repository, g
 {
 	git_reference *branch;
 
-	cl_git_pass(git_branch_create(&branch, repository, entry_name, target, 0));
+	cl_assert_equal_i(GIT_OBJ_COMMIT, git_object_type(target));
+	cl_git_pass(git_branch_create(&branch, repository, entry_name, (git_commit*)target, 0));
 
 	cl_assert_equal_i(GIT_ENOTFOUND, git_branch_tracking(&tracking, branch));