diff --git a/include/git2/email.h b/include/git2/email.h
index 3389353e796..08b573e8c68 100644
--- a/include/git2/email.h
+++ b/include/git2/email.h
@@ -84,30 +84,6 @@ typedef struct {
 	GIT_DIFF_FIND_OPTIONS_INIT \
 }
 
-/**
- * Create a diff for a commit in mbox format for sending via email.
- *
- * @param out buffer to store the e-mail patch in
- * @param diff the changes to include in the email
- * @param patch_idx the patch index
- * @param patch_count the total number of patches that will be included
- * @param commit_id the commit id for this change
- * @param summary the commit message for this change
- * @param body optional text to include above the diffstat
- * @param author the person who authored this commit
- * @param opts email creation options
- */
-GIT_EXTERN(int) git_email_create_from_diff(
-	git_buf *out,
-	git_diff *diff,
-	size_t patch_idx,
-	size_t patch_count,
-	const git_oid *commit_id,
-	const char *summary,
-	const char *body,
-	const git_signature *author,
-	const git_email_create_options *opts);
-
 /**
  * Create a diff for a commit in mbox format for sending via email.
  * The commit must not be a merge commit.
diff --git a/include/git2/odb.h b/include/git2/odb.h
index 60e293a13bd..4a7af07b81f 100644
--- a/include/git2/odb.h
+++ b/include/git2/odb.h
@@ -286,7 +286,7 @@ GIT_EXTERN(int) git_odb_expand_ids(
  * @param db database to refresh
  * @return 0 on success, error code otherwise
  */
-GIT_EXTERN(int) git_odb_refresh(struct git_odb *db);
+GIT_EXTERN(int) git_odb_refresh(git_odb *db);
 
 /**
  * List all objects available in the database
diff --git a/src/libgit2/diff.c b/src/libgit2/diff.c
index db12ccd6809..80027ba30a0 100644
--- a/src/libgit2/diff.c
+++ b/src/libgit2/diff.c
@@ -16,7 +16,7 @@
 #include "diff_generate.h"
 
 #include "git2/version.h"
-#include "git2/email.h"
+#include "git2/sys/email.h"
 
 struct patch_id_args {
 	git_diff *diff;
diff --git a/src/libgit2/email.c b/src/libgit2/email.c
index 8a10a12b75f..c1470c16323 100644
--- a/src/libgit2/email.c
+++ b/src/libgit2/email.c
@@ -16,6 +16,7 @@
 
 #include "git2/email.h"
 #include "git2/patch.h"
+#include "git2/sys/email.h"
 #include "git2/version.h"
 
 /*
diff --git a/src/libgit2/odb.c b/src/libgit2/odb.c
index 7e56774996d..00e8bb5065b 100644
--- a/src/libgit2/odb.c
+++ b/src/libgit2/odb.c
@@ -1923,7 +1923,7 @@ void git_odb_backend_data_free(git_odb_backend *backend, void *data)
 	git__free(data);
 }
 
-int git_odb_refresh(struct git_odb *db)
+int git_odb_refresh(git_odb *db)
 {
 	size_t i;
 	int error;
diff --git a/tests/libgit2/email/create.c b/tests/libgit2/email/create.c
index cf40ff552e0..cd3ccf7002b 100644
--- a/tests/libgit2/email/create.c
+++ b/tests/libgit2/email/create.c
@@ -1,5 +1,6 @@
 #include "clar.h"
 #include "clar_libgit2.h"
+#include "git2/sys/email.h"
 
 #include "diff_generate.h"