diff --git a/src/asset_manager.c b/src/asset_manager.c
index 3896cdd..f15dfb3 100644
--- a/src/asset_manager.c
+++ b/src/asset_manager.c
@@ -18,7 +18,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <libgen.h>
 #include <dirent.h>
 #include <limits.h>
 #include <assert.h>
diff --git a/src/system4.c b/src/system4.c
index 8589dc9..0d1e174 100644
--- a/src/system4.c
+++ b/src/system4.c
@@ -18,7 +18,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <libgen.h>
 #include <dirent.h>
 #include <ctype.h>
 #include <getopt.h>
@@ -266,7 +265,7 @@ static bool config_init_with_ini(const char *ini_path)
 	if (!config.ain_filename)
 		ERROR("No AIN filename specified in %s", ini_path);
 	char *tmp = strdup(ini_path);
-	config.game_dir = strdup(dirname(tmp));
+	config.game_dir = strdup(path_dirname(tmp));
 	free(tmp);
 	config_init();
 	return true;
@@ -286,12 +285,8 @@ static bool config_init_with_dir(const char *dir)
 
 static void config_init_with_ain(const char *ain_path)
 {
-	char *basename_tmp = strdup(ain_path);
-	char *dirname_tmp = strdup(ain_path);
-	config.ain_filename = strdup(basename(basename_tmp));
-	config.game_dir = strdup(dirname(dirname_tmp));
-	free(basename_tmp);
-	free(dirname_tmp);
+	config.ain_filename = strdup(path_basename(ain_path));
+	config.game_dir = strdup(path_dirname(ain_path));
 	config_init();
 }
 
diff --git a/subprojects/libsys4 b/subprojects/libsys4
index 481581b..187a463 160000
--- a/subprojects/libsys4
+++ b/subprojects/libsys4
@@ -1 +1 @@
-Subproject commit 481581b3b5833ec676d0578a044fa7c54b421089
+Subproject commit 187a463044a0b9b207f322796aa20c42322fed98