diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c
index 863c6fc8e192..bf8470060c74 100644
--- a/fs/orangefs/orangefs-bufmap.c
+++ b/fs/orangefs/orangefs-bufmap.c
@@ -9,6 +9,14 @@
 
 DECLARE_WAIT_QUEUE_HEAD(orangefs_bufmap_init_waitq);
 
+/* used to describe mapped buffers */
+struct orangefs_bufmap_desc {
+	void *uaddr;			/* user space address pointer */
+	struct page **page_array;	/* array of mapped pages */
+	int array_count;		/* size of above arrays */
+	struct list_head list_link;
+};
+
 static struct orangefs_bufmap {
 	atomic_t refcnt;
 
@@ -50,7 +58,7 @@ orangefs_bufmap_free(struct orangefs_bufmap *bufmap)
 	kfree(bufmap);
 }
 
-struct orangefs_bufmap *orangefs_bufmap_ref(void)
+static struct orangefs_bufmap *orangefs_bufmap_ref(void)
 {
 	struct orangefs_bufmap *bufmap = NULL;
 
@@ -63,7 +71,7 @@ struct orangefs_bufmap *orangefs_bufmap_ref(void)
 	return bufmap;
 }
 
-void orangefs_bufmap_unref(struct orangefs_bufmap *bufmap)
+static void orangefs_bufmap_unref(struct orangefs_bufmap *bufmap)
 {
 	if (atomic_dec_and_lock(&bufmap->refcnt, &orangefs_bufmap_lock)) {
 		__orangefs_bufmap = NULL;
diff --git a/fs/orangefs/orangefs-bufmap.h b/fs/orangefs/orangefs-bufmap.h
index 91d1755c231a..f652b464b340 100644
--- a/fs/orangefs/orangefs-bufmap.h
+++ b/fs/orangefs/orangefs-bufmap.h
@@ -7,19 +7,8 @@
 #ifndef __ORANGEFS_BUFMAP_H
 #define __ORANGEFS_BUFMAP_H
 
-/* used to describe mapped buffers */
-struct orangefs_bufmap_desc {
-	void *uaddr;			/* user space address pointer */
-	struct page **page_array;	/* array of mapped pages */
-	int array_count;		/* size of above arrays */
-	struct list_head list_link;
-};
-
 struct orangefs_bufmap;
 
-struct orangefs_bufmap *orangefs_bufmap_ref(void);
-void orangefs_bufmap_unref(struct orangefs_bufmap *bufmap);
-
 /*
  * orangefs_bufmap_size_query is now an inline function because buffer
  * sizes are not hardcoded