Index: /trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk	(revision 82759)
+++ /trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk	(revision 82760)
@@ -22,21 +22,13 @@
 
 #
-# Targets.
+# Hardened VBoxHeadless.
 #
 ifdef VBOX_WITH_HARDENING
- PROGRAMS += VBoxHeadlessHardened
- DLLS += VBoxHeadless
-else
- PROGRAMS += VBoxHeadless
-endif
-
-
-#
-# Hardened VBoxHeadless.
-#
+PROGRAMS += VBoxHeadlessHardened
 VBoxHeadlessHardened_TEMPLATE = VBOXR3HARDENEDEXE
 VBoxHeadlessHardened_SOURCES = VBoxHeadlessHardened.cpp
 VBoxHeadlessHardened_NAME = VBoxHeadless
 $(call VBOX_SET_VER_INFO_DLL,VBoxHeadlessHardened,VirtualBox Headless Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
+endif
 
 
@@ -44,14 +36,19 @@
 # VBoxHeadless
 #
-VBoxHeadless_TEMPLATE  := $(if $(VBOX_WITH_HARDENING),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE)
-VBoxHeadless_DEFS      += $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,)
+ifdef VBOX_WITH_HARDENING
+DLLS     += VBoxHeadless
+else
+PROGRAMS += VBoxHeadless
+endif
+VBoxHeadless_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE)
+VBoxHeadless_DEFS     += $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,)
 VBoxHeadless_INCS      = \
 	$(VBOX_GRAPHICS_INCS) \
 	../Common
-VBoxHeadless_SOURCES    = \
+VBoxHeadless_SOURCES   = \
 	VBoxHeadless.cpp \
 	../Common/PasswordInput.cpp
 ifdef VBOX_WITH_GUEST_PROPS
- VBoxHeadless_DEFS     += VBOX_WITH_GUEST_PROPS
+ VBoxHeadless_DEFS    += VBOX_WITH_GUEST_PROPS
 endif
 ifdef VBOX_WITH_HARDENING