diff --git a/src/apps/cortex/Persistence/ImportContext.cpp b/src/apps/cortex/Persistence/ImportContext.cpp
index a7c37d5399..d928da9ad5 100644
--- a/src/apps/cortex/Persistence/ImportContext.cpp
+++ b/src/apps/cortex/Persistence/ImportContext.cpp
@@ -2,7 +2,7 @@
 // e.moon 1jul99
 
 #include "ImportContext.h"
-#include "xmlparse.h"
+#include "expat.h"
 
 using namespace std;
 
diff --git a/src/apps/cortex/Persistence/Importer.h b/src/apps/cortex/Persistence/Importer.h
index 8d14e2ca3b..1c9154c795 100644
--- a/src/apps/cortex/Persistence/Importer.h
+++ b/src/apps/cortex/Persistence/Importer.h
@@ -18,7 +18,7 @@
 
 #include "ImportContext.h"
 #include "XML.h"
-#include "xmlparse.h"
+#include "expat.h"
 
 #include "cortex_defs.h"
 __BEGIN_CORTEX_NAMESPACE
diff --git a/src/apps/cortex/Persistence/Jamfile b/src/apps/cortex/Persistence/Jamfile
index 22064d096b..642fe74c3c 100644
--- a/src/apps/cortex/Persistence/Jamfile
+++ b/src/apps/cortex/Persistence/Jamfile
@@ -1,9 +1,10 @@
 SubDir HAIKU_TOP src apps cortex Persistence ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
-SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) expat xmlparse ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) support ] ;
 
+UseLibraryHeaders expat ;
+
 SubDirCcFlags -DCORTEX_NAMESPACE=cortex ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;