thodg/got

diff --git a/include/got_commit_graph.h b/include/got_commit_graph.h
index 19df892..006b16f 100644
--- a/include/got_commit_graph.h
+++ b/include/got_commit_graph.h
@@ -21,9 +21,8 @@ const struct got_error *got_commit_graph_open(struct got_commit_graph **,
     struct got_repository *repo);
 void got_commit_graph_close(struct got_commit_graph *);
 
-const struct got_error *
-got_commit_graph_fetch_commits(struct got_commit_graph *, int,
-    struct got_repository *);
+const struct got_error *got_commit_graph_fetch_commits(
+    struct got_commit_graph *, int, struct got_repository *);
 const struct got_error *got_commit_graph_iter_start(
     struct got_commit_graph *, struct got_object_id *, struct got_repository *);
 const struct got_error *got_commit_graph_iter_next(struct got_object_id **,
diff --git a/include/got_diff.h b/include/got_diff.h
index f80b6b9..79cfc0f 100644
--- a/include/got_diff.h
+++ b/include/got_diff.h
@@ -30,9 +30,8 @@ const struct got_error *got_diff_blob(struct got_blob_object *,
  * well as a const char * diff header label which identifies the file.
  * The number of context lines to show in the diff must be specified as well.
  */
-const struct got_error *
-got_diff_blob_file(struct got_blob_object *, FILE *, size_t, const char *, int,
-    FILE *);
+const struct got_error *got_diff_blob_file(struct got_blob_object *, FILE *,
+    size_t, const char *, int, FILE *);
 
 /*
  * Compute the differences between two trees and write unified diff text
diff --git a/include/got_object.h b/include/got_object.h
index c6f0b03..2bd9503 100644
--- a/include/got_object.h
+++ b/include/got_object.h
@@ -80,9 +80,8 @@ struct got_object_id *got_object_id_dup(struct got_object_id *);
  * path in the tree of the specified commit.
  * The caller should dispose of it with free(3).
  */
-const struct got_error *
-got_object_id_by_path(struct got_object_id **, struct got_repository *,
-    struct got_object_id *, const char *);
+const struct got_error *got_object_id_by_path(struct got_object_id **,
+    struct got_repository *, struct got_object_id *, const char *);
 
 /*
  * Obtain the type of an object.
@@ -96,16 +95,14 @@ const struct got_error *got_object_get_type(int *, struct got_repository *,
  * to the ID of an existing object in the repository.
  * The caller should dispose of the ID with free(3).
  */
-const struct got_error *
-got_object_resolve_id_str(struct got_object_id **, struct got_repository *,
-    const char *);
+const struct got_error *got_object_resolve_id_str(struct got_object_id **,
+    struct got_repository *, const char *);
 
 /*
  * Attempt to open a commit object in a repository.
  * The caller must dispose of the commit with got_object_commit_close().
  */
-const struct got_error *
-got_object_open_as_commit(struct got_commit_object **,
+const struct got_error *got_object_open_as_commit(struct got_commit_object **,
     struct got_repository *, struct got_object_id *);
 
 /* Dispose of a commit object. */
@@ -146,8 +143,7 @@ const char *got_object_commit_get_logmsg(struct got_commit_object *);
  * Attempt to open a tree object in a repository.
  * The caller must dispose of the tree with got_object_tree_close().
  */
-const struct got_error *
-got_object_open_as_tree(struct got_tree_object **,
+const struct got_error *got_object_open_as_tree(struct got_tree_object **,
     struct got_repository *, struct got_object_id *);
 
 /* Dispose of a tree object. */
@@ -171,8 +167,7 @@ const struct got_error *got_object_tree_path_changed(int *,
  * The size_t argument specifies the block size of an associated read buffer.
  * The caller must dispose of the blob with got_object_blob_close().
  */
-const struct got_error *
-got_object_open_as_blob(struct got_blob_object **,
+const struct got_error *got_object_open_as_blob(struct got_blob_object **,
     struct got_repository *, struct got_object_id *, size_t);
 
 /* Dispose of a blob object. */
diff --git a/include/got_reference.h b/include/got_reference.h
index 239c9df..cf87b34 100644
--- a/include/got_reference.h
+++ b/include/got_reference.h
@@ -30,7 +30,7 @@ struct got_object_id;
  * Attempt to open the reference with the provided name in a repository.
  * The caller must dispose of it with got_ref_close().
  */
-const struct got_error * got_ref_open(struct got_reference **,
+const struct got_error *got_ref_open(struct got_reference **,
     struct got_repository *, const char *);
 
 /*
diff --git a/include/got_worktree.h b/include/got_worktree.h
index 3908cf7..c8d82fa 100644
--- a/include/got_worktree.h
+++ b/include/got_worktree.h
@@ -74,7 +74,7 @@ const struct got_error *got_worktree_match_path_prefix(int *,
  * Get the name of a work tree's HEAD reference.
  * The caller must dispose of it with free(3).
  */
-char  *got_worktree_get_head_ref_name(struct got_worktree *);
+char *got_worktree_get_head_ref_name(struct got_worktree *);
 
 /*
  * Get the work tree's HEAD reference.
@@ -121,9 +121,8 @@ typedef const struct got_error *(*got_worktree_status_cb)(void *,
  * The status callback will be invoked with the provided void * argument,
  * a path, and a corresponding status code.
  */
-const struct got_error *
-got_worktree_status(struct got_worktree *, const char *,
-    struct got_repository *, got_worktree_status_cb, void *,
+const struct got_error *got_worktree_status(struct got_worktree *,
+    const char *, struct got_repository *, got_worktree_status_cb, void *,
     got_worktree_cancel_cb cancel_cb, void *);
 
 /*