Index: /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi	(revision 76933)
+++ /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi	(revision 76934)
@@ -85,5 +85,4 @@
 !define REPLACEDLL_NOREGISTER ; Replace in use DLL function
 !include "ReplaceDLL.nsh"
-!include "dumplog.nsh"        ; Dump log to file function
 
 !if $%BUILD_TARGET_ARCH% == "amd64"
@@ -177,4 +176,7 @@
 !endif
 
+; Must come after MUI includes to have certain defines set for DumpLog
+!include "dumplog.nsh"        ; Dump log to file function
+
 ; Language files
 !include "Languages\English.nsh"
@@ -202,4 +204,8 @@
 ShowUnInstDetails show
 RequestExecutionLevel highest
+
+; Whether to use the Unicode version of NSIS
+; Note: Using Unicode will result in the installer not working on a Windows 95/98/ME guest
+;Unicode true
 
 ; Internal parameters
Index: /trunk/src/VBox/Additions/WINNT/Installer/dumplog.nsh
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Installer/dumplog.nsh	(revision 76933)
+++ /trunk/src/VBox/Additions/WINNT/Installer/dumplog.nsh	(revision 76934)
@@ -1,4 +1,8 @@
-!define LVM_GETITEMCOUNT 0x1004
-!define LVM_GETITEMTEXT 0x102D
+!ifndef LVM_GETITEMCOUNT
+  !define LVM_GETITEMCOUNT 0x1004
+!endif
+!ifndef LVM_GETITEMTEXT
+  !define LVM_GETITEMTEXT 0x102D
+!endif
 
 !macro DumpLog un