diff --git a/kernel/include/hfi1/user_exp_rcv.h b/kernel/include/hfi1/user_exp_rcv.h
index be89c3da..3e976e56 100644
--- a/kernel/include/hfi1/user_exp_rcv.h
+++ b/kernel/include/hfi1/user_exp_rcv.h
@@ -77,6 +77,13 @@ struct tid_group {
 	u8 map;
 };
 
+struct tid_rb_node {
+	uintptr_t phys;
+	u32 len;
+	u32 rcventry;
+	struct tid_group *grp;
+};
+
 struct tid_pageset {
 	u16 idx;
 	u16 count;
diff --git a/kernel/user_exp_rcv.c b/kernel/user_exp_rcv.c
index 0ae9ea41..39325908 100644
--- a/kernel/user_exp_rcv.c
+++ b/kernel/user_exp_rcv.c
@@ -67,13 +67,6 @@ static int set_rcvarray_entry(struct hfi1_filedata *, uintptr_t,
 static int unprogram_rcvarray(struct hfi1_filedata *, u32, struct tid_group **);
 static void clear_tid_node(struct hfi1_filedata *, struct tid_rb_node *);
 
-struct tid_rb_node {
-	uintptr_t phys;
-	u32 len;
-	u32 rcventry;
-	struct tid_group *grp;
-};
-
 struct kmalloc_cache_header tidlist_cache = { NULL };
 
 /*