diff --git a/libpkg/pkg_manifest.c b/libpkg/pkg_manifest.c
index 19fa10049..7cfe3f0d1 100644
--- a/libpkg/pkg_manifest.c
+++ b/libpkg/pkg_manifest.c
@@ -1020,7 +1020,7 @@ pkg_emit_object(struct pkg *pkg, short flags)
 
 	dbg(4, "Emitting deps");
 	map = NULL;
-	DL_FOREACH(pkg->depends, dep) {
+	while (pkg_deps(pkg, &dep) == EPKG_OK) {
 		submap = ucl_object_typed_new(UCL_OBJECT);
 		MANIFEST_EXPORT_FIELD(submap, dep, origin, string);
 		MANIFEST_EXPORT_FIELD(submap, dep, version, string);
@@ -1113,7 +1113,7 @@ pkg_emit_object(struct pkg *pkg, short flags)
 
 	dbg(4, "Emitting options");
 	map = NULL;
-	DL_FOREACH(pkg->options, option) {
+	while (pkg_options(pkg, &option) == EPKG_OK) {
 		dbg(4, "Emitting option: %s", option->value);
 		if (map == NULL)
 			map = ucl_object_typed_new(UCL_OBJECT);
@@ -1144,7 +1144,7 @@ pkg_emit_object(struct pkg *pkg, short flags)
 		if ((flags & PKG_MANIFEST_EMIT_NOFILES) == 0) {
 			dbg(4, "Emitting files");
 			map = NULL;
-			DL_FOREACH(pkg->files, file) {
+			while (pkg_files(pkg, &file) == EPKG_OK) {
 				char dpath[MAXPATHLEN];
 				const char *dp = file->path;
 
@@ -1172,7 +1172,7 @@ pkg_emit_object(struct pkg *pkg, short flags)
 
 			dbg(4, "Emitting config files");
 			seq = NULL;
-			DL_FOREACH(pkg->config_files, cf) {
+			while (pkg_config_files(pkg, &cf) == EPKG_OK) {
 				urlencode(cf->path, &tmpsbuf);
 				if (seq == NULL)
 					seq = ucl_object_typed_new(UCL_ARRAY);
@@ -1183,7 +1183,7 @@ pkg_emit_object(struct pkg *pkg, short flags)
 
 			dbg(4, "Emitting directories");
 			map = NULL;
-			DL_FOREACH(pkg->dirs, dir) {
+			while (pkg_dirs(pkg, &dir) == EPKG_OK) {
 				urlencode(dir->path, &tmpsbuf);
 				if (map == NULL)
 					map = ucl_object_typed_new(UCL_OBJECT);