# build the libxfs code first
 xfs-y                          += $(addprefix libxfs/, \
+                                  xfs_alloc.o \
+                                  xfs_alloc_btree.o \
+                                  xfs_attr.o \
+                                  xfs_attr_leaf.o \
+                                  xfs_attr_remote.o \
+                                  xfs_bmap.o \
+                                  xfs_bmap_btree.o \
+                                  xfs_btree.o \
+                                  xfs_da_btree.o \
+                                  xfs_da_format.o \
+                                  xfs_dir2.o \
+                                  xfs_dir2_block.o \
+                                  xfs_dir2_data.o \
+                                  xfs_dir2_leaf.o \
+                                  xfs_dir2_node.o \
+                                  xfs_dir2_sf.o \
+                                  xfs_dquot_buf.o \
+                                  xfs_ialloc.o \
+                                  xfs_ialloc_btree.o \
+                                  xfs_inode_fork.o \
+                                  xfs_inode_buf.o \
+                                  xfs_log_rlimit.o \
                                   xfs_sb.o \
+                                  xfs_symlink_remote.o \
+                                  xfs_trans_resv.o \
+                                  )
+# xfs_rtbitmap is shared with libxfs
+xfs-$(CONFIG_XFS_RT)           += $(addprefix libxfs/, \
+                                  xfs_rtbitmap.o \
                                   )
 
 # highlevel code
                                   xfs_ioctl.o \
                                   xfs_iomap.o \
                                   xfs_iops.o \
+                                  xfs_inode.o \
                                   xfs_itable.o \
                                   xfs_message.o \
                                   xfs_mount.o \
                                   kmem.o \
                                   uuid.o
 
-# code shared with libxfs
-xfs-y                          += xfs_alloc.o \
-                                  xfs_alloc_btree.o \
-                                  xfs_attr.o \
-                                  xfs_attr_leaf.o \
-                                  xfs_attr_remote.o \
-                                  xfs_bmap.o \
-                                  xfs_bmap_btree.o \
-                                  xfs_btree.o \
-                                  xfs_da_btree.o \
-                                  xfs_da_format.o \
-                                  xfs_dir2.o \
-                                  xfs_dir2_block.o \
-                                  xfs_dir2_data.o \
-                                  xfs_dir2_leaf.o \
-                                  xfs_dir2_node.o \
-                                  xfs_dir2_sf.o \
-                                  xfs_dquot_buf.o \
-                                  xfs_ialloc.o \
-                                  xfs_ialloc_btree.o \
-                                  xfs_icreate_item.o \
-                                  xfs_inode.o \
-                                  xfs_inode_fork.o \
-                                  xfs_inode_buf.o \
-                                  xfs_log_recover.o \
-                                  xfs_log_rlimit.o \
-                                  xfs_symlink_remote.o \
-                                  xfs_trans_resv.o
-
 # low-level transaction/log code
 xfs-y                          += xfs_log.o \
                                   xfs_log_cil.o \
                                   xfs_buf_item.o \
                                   xfs_extfree_item.o \
+                                  xfs_icreate_item.o \
                                   xfs_inode_item.o \
+                                  xfs_log_recover.o \
                                   xfs_trans_ail.o \
                                   xfs_trans_buf.o \
                                   xfs_trans_extfree.o \
                                   xfs_quotaops.o
 
 # xfs_rtbitmap is shared with libxfs
-xfs-$(CONFIG_XFS_RT)           += xfs_rtalloc.o \
-                                  xfs_rtbitmap.o
+xfs-$(CONFIG_XFS_RT)           += xfs_rtalloc.o
 
 xfs-$(CONFIG_XFS_POSIX_ACL)    += xfs_acl.o
 xfs-$(CONFIG_PROC_FS)          += xfs_stats.o