diff --git a/meta/packages/file/file-native_4.18.bb b/meta/packages/file/file-native_4.18.bb
deleted file mode 100644
index 63554b01fb..0000000000
--- a/meta/packages/file/file-native_4.18.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require file_${PV}.bb
-inherit native
-
-# avoid dependency loop
-DEPENDS = ""
-PR = "r1"
-
-SRC_URI += "file://native-fix.diff;patch=1"
diff --git a/meta/packages/file/files/dump b/meta/packages/file/file/dump
similarity index 100%
rename from meta/packages/file/files/dump
rename to meta/packages/file/file/dump
diff --git a/meta/packages/file/files/filesystems b/meta/packages/file/file/filesystems
similarity index 100%
rename from meta/packages/file/files/filesystems
rename to meta/packages/file/file/filesystems
diff --git a/meta/packages/file/files/native-fix.diff b/meta/packages/file/file/native-fix.diff
similarity index 100%
rename from meta/packages/file/files/native-fix.diff
rename to meta/packages/file/file/native-fix.diff
diff --git a/meta/packages/file/file_4.18.bb b/meta/packages/file/file_4.18.bb
index 6d2eed0cd2..f5ed6e1300 100644
--- a/meta/packages/file/file_4.18.bb
+++ b/meta/packages/file/file_4.18.bb
@@ -15,3 +15,7 @@ do_configure_prepend() {
 	cp ${WORKDIR}/dump ${S}/magic/Magdir/
 	cp ${WORKDIR}/filesystems ${S}/magic/Magdir/
 }
+
+DEPENDS_virtclass-native = ""
+SRC_URI_append_virtclass-native = " file://native-fix.diff;patch=1"
+BBCLASSEXTEND = "native"