diff --git a/libs/libplatforminfo/Makefile b/libs/libplatforminfo/Makefile
index 39d33c6..fd8e8d1 100644
--- a/libs/libplatforminfo/Makefile
+++ b/libs/libplatforminfo/Makefile
@@ -18,7 +18,7 @@ define Package/libplatforminfo
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Platform information library
-  DEPENDS:=@(TARGET_ar71xx_generic||TARGET_ar71xx_mikrotik||TARGET_ar71xx_nand||TARGET_mpc85xx_generic||TARGET_x86_generic||TARGET_x86_geode||TARGET_x86_kvm_guest||TARGET_x86_64||TARGET_x86_xen_domu||TARGET_ramips_mt7621||TARGET_ramips_mt7628||TARGET_ramips_rt305x||TARGET_brcm2708_bcm2708||TARGET_brcm2708_bcm2709||TARGET_sunxi||TARGET_mvebu)
+  DEPENDS:=@(TARGET_ar71xx_generic||TARGET_ar71xx_mikrotik||TARGET_ar71xx_nand||TARGET_mpc85xx_generic||TARGET_x86_generic||TARGET_x86_geode||TARGET_x86_64||TARGET_ramips_mt7621||TARGET_ramips_mt7628||TARGET_ramips_rt305x||TARGET_brcm2708_bcm2708||TARGET_brcm2708_bcm2709||TARGET_sunxi||TARGET_mvebu)
 endef
 
 CMAKE_OPTIONS += \
diff --git a/libs/libplatforminfo/src/targets/template/x86.c b/libs/libplatforminfo/src/targets/template/x86.c
index f932571..1903a5e 100644
--- a/libs/libplatforminfo/src/targets/template/x86.c
+++ b/libs/libplatforminfo/src/targets/template/x86.c
@@ -93,17 +93,5 @@ const char * platforminfo_get_model(void) {
 }
 
 const char * platforminfo_get_image_name(void) {
-#if defined(TARGET_x86_generic)
-        return "x86-generic";
-#elif defined(TARGET_x86_geode)
-        return "x86-geode";
-#elif defined(TARGET_x86_kvm_guest)
-        return "x86-kvm";
-#elif defined(TARGET_x86_xen_domu)
-        return "x86-xen";
-#elif defined(TARGET_x86_64)
-        return "x86-64";
-#else
-#error Unknown x86 subtarget
-#endif
+        return STRINGIFY(TARGET) "-" STRINGIFY(SUBTARGET);
 }
diff --git a/libs/libplatforminfo/src/targets/x86-kvm_guest.c b/libs/libplatforminfo/src/targets/x86-kvm_guest.c
deleted file mode 120000
index c6233a6..0000000
--- a/libs/libplatforminfo/src/targets/x86-kvm_guest.c
+++ /dev/null
@@ -1 +0,0 @@
-template/x86.c
\ No newline at end of file
diff --git a/libs/libplatforminfo/src/targets/x86-xen_domu.c b/libs/libplatforminfo/src/targets/x86-xen_domu.c
deleted file mode 120000
index c6233a6..0000000
--- a/libs/libplatforminfo/src/targets/x86-xen_domu.c
+++ /dev/null
@@ -1 +0,0 @@
-template/x86.c
\ No newline at end of file