diff --git a/tsk/fs/Makefile.am b/tsk/fs/Makefile.am
index 8743330f9bf4999e32557c13421cfdd91e349bb4..cffb8858419a61cfc2979887eded68b9979e628f 100644
--- a/tsk/fs/Makefile.am
+++ b/tsk/fs/Makefile.am
@@ -9,7 +9,11 @@ libtskfs_la_SOURCES  = tsk_fs_i.h fs_inode.c fs_io.c fs_block.c fs_open.c \
     fs_parse.c fs_file.c \
     unix_misc.c nofs_misc.c \
     ffs.c ffs_dent.c ext2fs.c ext2fs_dent.c ext2fs_journal.c \
-    fatfs.c fatfs_meta.c fatfs_dent.cpp ntfs.c ntfs_dent.cpp swapfs.c rawfs.c \
+    fatfs.c fatfs_meta.c fatfs_dent.cpp \
+    fatxxfs.c fatxxfs_meta.c fatxxfs_dent.c \
+    exfatfs.c exfatfs_meta.c exfatfs_dent.cpp \
+    fatfs_utils.c \
+    ntfs.c ntfs_dent.cpp swapfs.c rawfs.c \
     iso9660.c iso9660_dent.c \
     hfs.c hfs_dent.c hfs_journal.c hfs_unicompare.c \
     dcalc_lib.c dcat_lib.c dls_lib.c dstat_lib.c ffind_lib.c \
diff --git a/tsk/fs/ifind_lib.c b/tsk/fs/ifind_lib.c
index 02d00c530c009b766f392e52b8a13037d882b2c8..142a1d5ae6679cb1aa7817550dc742dd8c4de3b8 100644
--- a/tsk/fs/ifind_lib.c
+++ b/tsk/fs/ifind_lib.c
@@ -174,6 +174,7 @@ tsk_fs_path2inum(TSK_FS_INFO * a_fs, const char *a_path,
     char *cur_attr;             // The "current" attribute of the dir we are looking for
     TSK_INUM_T next_meta;
     uint8_t is_done;
+    char *strtok_last; 
     *a_result = 0;
 
     // copy path to a buffer that we can modify