Index: /trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk	(revision 82741)
+++ /trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk	(revision 82742)
@@ -37,6 +37,6 @@
 VBoxHeadlessHardened_TEMPLATE = VBOXR3HARDENEDEXE
 VBoxHeadlessHardened_SOURCES = VBoxHeadlessHardened.cpp
-VBoxHeadlessHardened_SOURCES.win = $(VBoxHeadless_0_OUTDIR)/VBoxHeadless-icon.rc
 VBoxHeadlessHardened_NAME = VBoxHeadless
+$(call VBOX_SET_VER_INFO_DLL,VBoxHeadlessHardened,VirtualBox Headless Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
 
 
@@ -58,16 +58,9 @@
  VBoxHeadless_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxHeadless.dylib
 endif
-
-
-ifeq ($(KBUILD_TARGET),win)
-# Icon include file.
-VBoxHeadless_SOURCES   += VBoxHeadless.rc
-VBoxHeadless.rc_INCS    = $(VBoxHeadless_0_OUTDIR)
-VBoxHeadless.rc_DEPS    = $(VBoxHeadless_0_OUTDIR)/VBoxHeadless-icon.rc
-VBoxHeadless.rc_CLEAN   = $(VBoxHeadless_0_OUTDIR)/VBoxHeadless-icon.rc
-$$(VBoxHeadless_0_OUTDIR)/VBoxHeadless-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxHeadless_DEFPATH)/Makefile.kmk | $$(dir $$@)
-	$(RM) -f $@
-	$(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
-endif # win
+ifdef VBOX_WITH_HARDENING
+$(call VBOX_SET_VER_INFO_DLL,VBoxHeadless,VirtualBox Headless Frontend (dll),$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
+else
+$(call VBOX_SET_VER_INFO_EXE,VBoxHeadless,VirtualBox Headless Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
+endif
 
 include $(FILE_KBUILD_SUB_FOOTER)
Index: unk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.rc
===================================================================
--- /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.rc	(revision 82741)
+++ 	(revision )
@@ -1,65 +1,0 @@
-/* $Id$ */
-/** @file
- * VBox headless frontent - Windows resource file.
- */
-
-/*
- * Copyright (C) 2015-2019 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-#include <windows.h>
-#include <VBox/version.h>
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION      VBOX_RC_FILE_VERSION
-  PRODUCTVERSION   VBOX_RC_FILE_VERSION
-  FILEFLAGSMASK    VS_FFI_FILEFLAGSMASK
-  FILEFLAGS        VBOX_RC_FILE_FLAGS
-  FILEOS           VBOX_RC_FILE_OS
-#ifdef VBOXR3_HARDENED_DLL
-  FILETYPE         VBOX_RC_TYPE_APP
-#else
-  FILETYPE         VBOX_RC_TYPE_DLL
-#endif
-  FILESUBTYPE      VFT2_UNKNOWN
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual
-    BEGIN
-      VALUE "FileDescription",  "VirtualBox Headless Frontend\0"
-#ifdef VBOXR3_HARDENED_DLL
-      VALUE "InternalName",     "VBoxHeadless\0"
-#else
-      VALUE "InternalName",     "VBoxHeadless\0"
-#endif
-#ifdef VBOXR3_HARDENED_DLL
-      VALUE "OriginalFilename", "VBoxHeadless.dll\0"
-#else
-      VALUE "OriginalFilename", "VBoxHeadless.exe\0"
-#endif
-      VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
-      VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
-      VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
-      VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_STR
-      VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
-      VBOX_RC_MORE_STRINGS
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x409, 1252
-  END
-END
-
-/* Creates the application icon. */
-#include "VBoxHeadless-icon.rc"
-