diff --git a/disk-io.c b/disk-io.c
index 7ad2cc27..dc84a468 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -344,7 +344,7 @@ int write_and_map_eb(struct btrfs_trans_handle *trans,
 	return 0;
 }
 
-int write_tree_block(struct btrfs_trans_handle *trans,
+static int write_tree_block(struct btrfs_trans_handle *trans,
 		     struct btrfs_root *root,
 		     struct extent_buffer *eb)
 {
diff --git a/qgroup.c b/qgroup.c
index 1c680468..94d1febf 100644
--- a/qgroup.c
+++ b/qgroup.c
@@ -76,7 +76,7 @@ struct btrfs_qgroup_list {
 /*
  * qgroupid,rfer,excl default to set
  */
-struct {
+static struct {
 	char *name;
 	char *column_name;
 	int need_print;
@@ -652,7 +652,7 @@ static int add_qgroup(struct qgroup_lookup *qgroup_lookup, u64 qgroupid,
 	return ret;
 }
 
-void __free_btrfs_qgroup(struct btrfs_qgroup *bq)
+static void __free_btrfs_qgroup(struct btrfs_qgroup *bq)
 {
 	struct btrfs_qgroup_list *list;
 	while (!list_empty(&bq->qgroups)) {
@@ -674,7 +674,7 @@ void __free_btrfs_qgroup(struct btrfs_qgroup *bq)
 	free(bq);
 }
 
-void __free_all_qgroups(struct qgroup_lookup *root_tree)
+static void __free_all_qgroups(struct qgroup_lookup *root_tree)
 {
 	struct btrfs_qgroup *entry;
 	struct rb_node *n;
diff --git a/utils.c b/utils.c
index 3c9701dd..2422338b 100644
--- a/utils.c
+++ b/utils.c
@@ -1954,7 +1954,7 @@ int test_dev_for_mkfs(char *file, int force_overwrite, char *estr)
 	return 0;
 }
 
-int test_skip_this_disk(char *path)
+static int test_skip_this_disk(char *path)
 {
 	int fd;