diff --git a/Contrib/Modern UI 2/MUI2.nsh b/Contrib/Modern UI 2/MUI2.nsh
index 3e95815f..f0cce86c 100644
--- a/Contrib/Modern UI 2/MUI2.nsh	
+++ b/Contrib/Modern UI 2/MUI2.nsh	
@@ -5,23 +5,17 @@ Copyright 2002-2009 Joost Verburg
 
 */
 
+!ifndef MUI_INCLUDED
 !echo "NSIS Modern User Interface version 2.0 - Copyright 2002-2009 Joost Verburg"
 
 ;--------------------------------
-
-!ifndef MUI_INCLUDED
-!define MUI_INCLUDED
-
-!define MUI_SYSVERSION "2.0"
-
-!verbose push
-
-!ifndef MUI_VERBOSE
-  !define MUI_VERBOSE 3
-!endif
-
+!verbose push 3
+!define /IfNDef MUI_VERBOSE 3
 !verbose ${MUI_VERBOSE}
 
+!define MUI_INCLUDED
+!define MUI_SYSVERSION "2.0"
+
 !addincludedir "${NSISDIR}\Contrib\Modern UI 2"
 
 ;--------------------------------
@@ -117,6 +111,5 @@ Copyright 2002-2009 Joost Verburg
 
 !macroend
 
-!endif
-
 !verbose pop
+!endif
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index e4b9d948..003cdae9 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -5,22 +5,17 @@ Copyright 2002-2009 Joost Verburg
 
 */
 
+!ifndef MUI_INCLUDED
 !echo "NSIS Modern User Interface version 1.8 - Copyright 2002-2009 Joost Verburg"
 
 ;--------------------------------
+!verbose push 3
+!define /IfNDef MUI_VERBOSE 3
+!verbose ${MUI_VERBOSE}
 
-!ifndef MUI_INCLUDED
 !define MUI_INCLUDED
-
 !define MUI_SYSVERSION "1.8"
 
-!verbose push
-
-!ifndef MUI_VERBOSE
-  !define MUI_VERBOSE 3
-!endif
-
-!verbose ${MUI_VERBOSE}
 
 ;--------------------------------
 ;HEADER FILES, DECLARATIONS
@@ -2201,6 +2196,5 @@ Var MUI_TEMP2
 ;--------------------------------
 ;END
 
-!endif
-
 !verbose pop
+!endif
diff --git a/Include/FileFunc.nsh b/Include/FileFunc.nsh
index e1963770..a6ba591b 100644
--- a/Include/FileFunc.nsh
+++ b/Include/FileFunc.nsh
@@ -67,24 +67,20 @@ RefreshShellIcons
 ; ${FILEFUNC_VERBOSE} 3   # no script
 
 !ifndef FILEFUNC_INCLUDED
+
+!verbose push 3
+!define /IfNDef _FILEFUNC_VERBOSE 3
+!verbose ${_FILEFUNC_VERBOSE}
+!define FILEFUNC_VERBOSE `!insertmacro FILEFUNC_VERBOSE`
+
 !define FILEFUNC_INCLUDED
 
 !include Util.nsh
 
-!verbose push
-!verbose 3
-!ifndef _FILEFUNC_VERBOSE
-	!define _FILEFUNC_VERBOSE 3
-!endif
-!verbose ${_FILEFUNC_VERBOSE}
-!define FILEFUNC_VERBOSE `!insertmacro FILEFUNC_VERBOSE`
-!verbose pop
 
 !macro FILEFUNC_VERBOSE _VERBOSE
-	!verbose push
-	!verbose 3
-	!undef _FILEFUNC_VERBOSE
-	!define _FILEFUNC_VERBOSE ${_VERBOSE}
+	!verbose push 3
+	!define /ReDef _FILEFUNC_VERBOSE ${_VERBOSE}
 	!verbose pop
 !macroend
 
@@ -2015,4 +2011,5 @@ RefreshShellIcons
 	!verbose pop
 !macroend
 
+!verbose pop
 !endif
diff --git a/Include/TextFunc.nsh b/Include/TextFunc.nsh
index 2a9c459a..67678207 100644
--- a/Include/TextFunc.nsh
+++ b/Include/TextFunc.nsh
@@ -54,25 +54,21 @@ TrimNewLines
 ; ${TEXTFUNC_VERBOSE} 3   # no script
 
 !ifndef TEXTFUNC_INCLUDED
+
+!verbose push 3
+!define /IfNDef _TEXTFUNC_VERBOSE 3
+!verbose ${_TEXTFUNC_VERBOSE}
+!define TEXTFUNC_VERBOSE `!insertmacro TEXTFUNC_VERBOSE`
+
 !define TEXTFUNC_INCLUDED
 
 !include FileFunc.nsh
 !include Util.nsh
 
-!verbose push
-!verbose 3
-!ifndef _TEXTFUNC_VERBOSE
-	!define _TEXTFUNC_VERBOSE 3
-!endif
-!verbose ${_TEXTFUNC_VERBOSE}
-!define TEXTFUNC_VERBOSE `!insertmacro TEXTFUNC_VERBOSE`
-!verbose pop
 
 !macro TEXTFUNC_VERBOSE _VERBOSE
-	!verbose push
-	!verbose 3
-	!undef _TEXTFUNC_VERBOSE
-	!define _TEXTFUNC_VERBOSE ${_VERBOSE}
+	!verbose push 3
+	!define /ReDef _TEXTFUNC_VERBOSE ${_VERBOSE}
 	!verbose pop
 !macroend
 
@@ -1211,4 +1207,5 @@ TrimNewLines
 	!verbose pop
 !macroend
 
+!verbose pop
 !endif
diff --git a/Include/WordFunc.nsh b/Include/WordFunc.nsh
index 2e62d403..0cb645a0 100644
--- a/Include/WordFunc.nsh
+++ b/Include/WordFunc.nsh
@@ -50,24 +50,20 @@ VersionConvert
 ; ${WORDFUNC_VERBOSE} 3   # no script
 
 !ifndef WORDFUNC_INCLUDED
+
+!verbose push 3
+!define /IfNDef _WORDFUNC_VERBOSE 3
+!verbose ${_WORDFUNC_VERBOSE}
+!define WORDFUNC_VERBOSE `!insertmacro WORDFUNC_VERBOSE`
+
 !define WORDFUNC_INCLUDED
 
 !include Util.nsh
 
-!verbose push
-!verbose 3
-!ifndef _WORDFUNC_VERBOSE
-	!define _WORDFUNC_VERBOSE 3
-!endif
-!verbose ${_WORDFUNC_VERBOSE}
-!define WORDFUNC_VERBOSE `!insertmacro WORDFUNC_VERBOSE`
-!verbose pop
 
 !macro WORDFUNC_VERBOSE _VERBOSE
-	!verbose push
-	!verbose 3
-	!undef _WORDFUNC_VERBOSE
-	!define _WORDFUNC_VERBOSE ${_VERBOSE}
+	!verbose push 3
+	!define /ReDef _WORDFUNC_VERBOSE ${_VERBOSE}
 	!verbose pop
 !macroend
 
@@ -1800,4 +1796,5 @@ VersionConvert
 	!verbose pop
 !macroend
 
+!verbose pop
 !endif