diff --git a/Examples/FileFunc.nsi b/Examples/FileFunc.nsi
index 7b6458a3..cd393f64 100644
--- a/Examples/FileFunc.nsi
+++ b/Examples/FileFunc.nsi
@@ -14,26 +14,6 @@ RequestExecutionLevel user
 !include "WinMessages.nsh"
 !include "FileFunc.nsh"
 
-!insertmacro Locate
-!insertmacro GetSize
-!insertmacro DriveSpace
-!insertmacro GetDrives
-!insertmacro GetTime
-!insertmacro GetFileAttributes
-!insertmacro GetFileVersion
-!insertmacro GetExeName
-!insertmacro GetExePath
-!insertmacro GetParameters
-!insertmacro GetOptions
-!insertmacro GetRoot
-!insertmacro GetParent
-!insertmacro GetFileName
-!insertmacro GetBaseName
-!insertmacro GetFileExt
-!insertmacro BannerTrimPath
-!insertmacro DirState
-!insertmacro RefreshShellIcons
-
 Var INI
 Var HWND
 Var STATE
diff --git a/Examples/FileFuncTest.nsi b/Examples/FileFuncTest.nsi
index 08ed303b..0a2db35b 100644
--- a/Examples/FileFuncTest.nsi
+++ b/Examples/FileFuncTest.nsi
@@ -24,50 +24,6 @@ Var OUT7
 !include "FileFunc.nsh"
 !include "LogicLib.nsh"
 
-!insertmacro Locate
-!insertmacro GetSize
-!insertmacro DriveSpace
-!insertmacro GetDrives
-!insertmacro GetTime
-!insertmacro GetFileAttributes
-!insertmacro GetFileVersion
-!insertmacro GetExeName
-!insertmacro GetExePath
-!insertmacro GetParameters
-!insertmacro GetOptions
-!insertmacro GetOptionsS
-!insertmacro GetRoot
-!insertmacro GetParent
-!insertmacro GetFileName
-!insertmacro GetBaseName
-!insertmacro GetFileExt
-!insertmacro BannerTrimPath
-!insertmacro DirState
-!insertmacro RefreshShellIcons
-
-!insertmacro un.Locate
-!insertmacro un.GetSize
-!insertmacro un.GetDrives
-!insertmacro un.DriveSpace
-!insertmacro un.GetTime
-!insertmacro un.GetFileAttributes
-!insertmacro un.GetFileVersion
-!insertmacro un.GetExeName
-!insertmacro un.GetExePath
-!insertmacro un.GetParameters
-!insertmacro un.GetOptions
-!insertmacro un.GetOptionsS
-!insertmacro un.GetRoot
-!insertmacro un.GetParent
-!insertmacro un.GetFileName
-!insertmacro un.GetBaseName
-!insertmacro un.GetFileExt
-!insertmacro un.BannerTrimPath
-!insertmacro un.DirState
-!insertmacro un.RefreshShellIcons
-
-
-
 ;############### INSTALL ###############
 
 !define StackVerificationStart `!insertmacro StackVerificationStart`
@@ -585,26 +541,26 @@ SectionEnd
 ;############### UNINSTALL ###############
 
 Section un.Uninstall
-	${un.Locate} '$DOCUMENTS' '/L=FD /M=*.* /S=0B /G=0' 'un.LocateCallback'
-	${un.GetSize} '$WINDIR' '/M=Explorer.exe /S=0K /G=0' $OUT1 $OUT2 $OUT3
-	${un.DriveSpace} 'C:\' '/D=F /S=M' $OUT1
-	${un.GetDrives} 'FDD+CDROM' 'un.GetDrivesCallback'
-	${un.GetTime} '' 'L' $OUT1 $OUT2 $OUT3 $OUT4 $OUT5 $OUT6 $OUT7
-	${un.GetFileAttributes} '$WINDIR\explorer.exe' 'ALL' $OUT1
-	${un.GetFileVersion} '$WINDIR\explorer.exe' $OUT1
-	${un.GetExeName} $OUT1
-	${un.GetExePath} $OUT1
-	${un.GetParameters} $OUT1
-	${un.GetOptions} '/INSTDIR=C:\Program Files\Common Files /SILENT=yes' '/INSTDIR=' $OUT1
-	${un.GetOptionsS} '/INSTDIR=C:\Program Files\Common Files /SILENT=yes' '/INSTDIR=' $OUT1
-	${un.GetRoot} 'C:\Program Files\NSIS' $OUT1
-	${un.GetParent} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1
-	${un.GetFileName} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1
-	${un.GetBaseName} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1
-	${un.GetFileExt} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1
-	${un.BannerTrimPath} 'C:\Server\Documents\Terminal\license.htm' '35A' $OUT1
-	${un.DirState} '$TEMP' $OUT1
-	${un.RefreshShellIcons}
+	${Locate} '$DOCUMENTS' '/L=FD /M=*.* /S=0B /G=0' 'un.LocateCallback'
+	${GetSize} '$WINDIR' '/M=Explorer.exe /S=0K /G=0' $OUT1 $OUT2 $OUT3
+	${DriveSpace} 'C:\' '/D=F /S=M' $OUT1
+	${GetDrives} 'FDD+CDROM' 'un.GetDrivesCallback'
+	${GetTime} '' 'L' $OUT1 $OUT2 $OUT3 $OUT4 $OUT5 $OUT6 $OUT7
+	${GetFileAttributes} '$WINDIR\explorer.exe' 'ALL' $OUT1
+	${GetFileVersion} '$WINDIR\explorer.exe' $OUT1
+	${GetExeName} $OUT1
+	${GetExePath} $OUT1
+	${GetParameters} $OUT1
+	${GetOptions} '/INSTDIR=C:\Program Files\Common Files /SILENT=yes' '/INSTDIR=' $OUT1
+	${GetOptionsS} '/INSTDIR=C:\Program Files\Common Files /SILENT=yes' '/INSTDIR=' $OUT1
+	${GetRoot} 'C:\Program Files\NSIS' $OUT1
+	${GetParent} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1
+	${GetFileName} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1
+	${GetBaseName} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1
+	${GetFileExt} 'C:\Program Files\Winamp\uninstwa.exe' $OUT1
+	${BannerTrimPath} 'C:\Server\Documents\Terminal\license.htm' '35A' $OUT1
+	${DirState} '$TEMP' $OUT1
+	${RefreshShellIcons}
 SectionEnd
 
 Function un.LocateCallback
diff --git a/Examples/TextFunc.nsi b/Examples/TextFunc.nsi
index 65b030c8..f5b1c565 100644
--- a/Examples/TextFunc.nsi
+++ b/Examples/TextFunc.nsi
@@ -14,15 +14,6 @@ RequestExecutionLevel user
 !include "WinMessages.nsh"
 !include "TextFunc.nsh"
 
-!insertmacro LineFind
-!insertmacro LineRead
-!insertmacro FileReadFromEnd
-!insertmacro LineSum
-!insertmacro FileJoin
-!insertmacro ConfigRead
-!insertmacro ConfigWrite
-!insertmacro FileRecode
-
 Var HWND
 Var INI
 Var LOG
diff --git a/Examples/TextFuncTest.nsi b/Examples/TextFuncTest.nsi
index d6b458df..359cdec8 100644
--- a/Examples/TextFuncTest.nsi
+++ b/Examples/TextFuncTest.nsi
@@ -21,36 +21,6 @@ Var OUT
 
 !include "TextFunc.nsh"
 
-!insertmacro LineFind
-!insertmacro LineRead
-!insertmacro FileReadFromEnd
-!insertmacro LineSum
-!insertmacro FileJoin
-!insertmacro TextCompare
-!insertmacro TextCompareS
-!insertmacro ConfigRead
-!insertmacro ConfigReadS
-!insertmacro ConfigWrite
-!insertmacro ConfigWriteS
-!insertmacro FileRecode
-!insertmacro TrimNewLines
-
-!insertmacro un.LineFind
-!insertmacro un.LineRead
-!insertmacro un.FileReadFromEnd
-!insertmacro un.LineSum
-!insertmacro un.FileJoin
-!insertmacro un.TextCompare
-!insertmacro un.TextCompareS
-!insertmacro un.ConfigRead
-!insertmacro un.ConfigReadS
-!insertmacro un.ConfigWrite
-!insertmacro un.ConfigWriteS
-!insertmacro un.FileRecode
-!insertmacro un.TrimNewLines
-
-
-
 ;############### INSTALL ###############
 
 !define StackVerificationStart `!insertmacro StackVerificationStart`
@@ -416,19 +386,19 @@ SectionEnd
 ;############### UNINSTALL ###############
 
 Section un.Uninstall
-	${un.LineFind} '$TEMPFILE1' '/NUL' '1:-1' 'un.LineFindCallback'
-	${un.LineRead} '$TEMPFILE1' '-1' $OUT
-	${un.FileReadFromEnd} '$TEMPFILE1' 'un.FileReadFromEndCallback'
-	${un.LineSum} '$TEMPFILE1' $OUT
-	${un.FileJoin} '$TEMPFILE1' '$TEMPFILE2' '$TEMPFILE3'
-	${un.TextCompare} '$TEMPFILE1' '$TEMPFILE2' 'FastDiff' 'un.TextCompareCallback'
-	${un.TextCompareS} '$TEMPFILE1' '$TEMPFILE2' 'FastDiff' 'un.TextCompareCallback'
-	${un.ConfigRead} '$TEMPFILE1' '3c=' $OUT
-	${un.ConfigReadS} '$TEMPFILE1' '3c=' $OUT
-	${un.ConfigWrite} '$TEMPFILE1' '5E=' 'e**' $OUT
-	${un.ConfigWriteS} '$TEMPFILE1' '5E=' 'e**' $OUT
-	${un.FileRecode} '$TEMPFILE1' 'CharToOem'
-	${un.TrimNewLines} 'Text Line$\r$\n' $OUT
+	${LineFind} '$TEMPFILE1' '/NUL' '1:-1' 'un.LineFindCallback'
+	${LineRead} '$TEMPFILE1' '-1' $OUT
+	${FileReadFromEnd} '$TEMPFILE1' 'un.FileReadFromEndCallback'
+	${LineSum} '$TEMPFILE1' $OUT
+	${FileJoin} '$TEMPFILE1' '$TEMPFILE2' '$TEMPFILE3'
+	${TextCompare} '$TEMPFILE1' '$TEMPFILE2' 'FastDiff' 'un.TextCompareCallback'
+	${TextCompareS} '$TEMPFILE1' '$TEMPFILE2' 'FastDiff' 'un.TextCompareCallback'
+	${ConfigRead} '$TEMPFILE1' '3c=' $OUT
+	${ConfigReadS} '$TEMPFILE1' '3c=' $OUT
+	${ConfigWrite} '$TEMPFILE1' '5E=' 'e**' $OUT
+	${ConfigWriteS} '$TEMPFILE1' '5E=' 'e**' $OUT
+	${FileRecode} '$TEMPFILE1' 'CharToOem'
+	${TrimNewLines} 'Text Line$\r$\n' $OUT
 SectionEnd
 
 Function un.LineFindCallback
diff --git a/Examples/WordFunc.nsi b/Examples/WordFunc.nsi
index deec782c..f416927b 100644
--- a/Examples/WordFunc.nsi
+++ b/Examples/WordFunc.nsi
@@ -18,15 +18,6 @@ Var STATE
 !include "WinMessages.nsh"
 !include "WordFunc.nsh"
 
-!insertmacro WordFind
-!insertmacro WordFind2X
-!insertmacro WordReplace
-!insertmacro WordAdd
-!insertmacro WordInsert
-!insertmacro StrFilter
-!insertmacro VersionCompare
-!insertmacro VersionConvert
-
 Page Custom ShowCustom LeaveCustom
 
 Function ShowCustom
diff --git a/Examples/WordFuncTest.nsi b/Examples/WordFuncTest.nsi
index 9f347b88..e9d1160b 100644
--- a/Examples/WordFuncTest.nsi
+++ b/Examples/WordFuncTest.nsi
@@ -17,42 +17,6 @@ Var OUT
 
 !include "WordFunc.nsh"
 
-!insertmacro WordFind
-!insertmacro WordFindS
-!insertmacro WordFind2X
-!insertmacro WordFind2XS
-!insertmacro WordFind3X
-!insertmacro WordFind3XS
-!insertmacro WordReplace
-!insertmacro WordReplaceS
-!insertmacro WordAdd
-!insertmacro WordAddS
-!insertmacro WordInsert
-!insertmacro WordInsertS
-!insertmacro StrFilter
-!insertmacro StrFilterS
-!insertmacro VersionCompare
-!insertmacro VersionConvert
-
-!insertmacro un.WordFind
-!insertmacro un.WordFindS
-!insertmacro un.WordFind2X
-!insertmacro un.WordFind2XS
-!insertmacro un.WordFind3X
-!insertmacro un.WordFind3XS
-!insertmacro un.WordReplace
-!insertmacro un.WordReplaceS
-!insertmacro un.WordAdd
-!insertmacro un.WordAddS
-!insertmacro un.WordInsert
-!insertmacro un.WordInsertS
-!insertmacro un.StrFilter
-!insertmacro un.StrFilterS
-!insertmacro un.VersionCompare
-!insertmacro un.VersionConvert
-
-
-
 ;############### INSTALL ###############
 
 !define StackVerificationStart `!insertmacro StackVerificationStart`
@@ -627,20 +591,20 @@ SectionEnd
 ;############### UNINSTALL ###############
 
 Section un.Uninstall
-	${un.WordFind} 'C:\io.sys C:\Program Files C:\WINDOWS' ' C:\' '-02' $OUT
-	${un.WordFindS} 'C:\io.sys C:\Program Files C:\WINDOWS' ' C:\' '-02' $OUT
-	${un.WordFind2X} '[C:\io.sys];[C:\logo.sys];[C:\WINDOWS]' '[C:\' '];' '+2' $OUT
-	${un.WordFind2XS} '[C:\io.sys];[C:\logo.sys];[C:\WINDOWS]' '[C:\' '];' '+2' $OUT
-	${un.WordFind3X} '[1.AAB];[2.BAA];[3.BBB];' '[' 'AA' '];' '+1' $OUT
-	${un.WordFind3XS} '[1.AAB];[2.BAA];[3.BBB];' '[' 'AA' '];' '+1' $OUT
-	${un.WordReplace} 'C:\io.sys C:\logo.sys C:\WINDOWS' 'SYS' 'bmp' '+2' $OUT
-	${un.WordReplaceS} 'C:\io.sys C:\logo.sys C:\WINDOWS' 'SYS' 'bmp' '+2' $OUT
-	${un.WordAdd} 'C:\io.sys C:\WINDOWS' ' ' '+C:\WINDOWS C:\config.sys' $OUT
-	${un.WordAddS} 'C:\io.sys C:\WINDOWS' ' ' '+C:\WINDOWS C:\config.sys' $OUT
-	${un.WordInsert} 'C:\io.sys C:\WINDOWS' ' ' 'C:\logo.sys' '-2' $OUT
-	${un.WordInsertS} 'C:\io.sys C:\WINDOWS' ' ' 'C:\logo.sys' '-2' $OUT
-	${un.StrFilter} '123abc 456DEF 7890|%#' '+' '' '' $OUT
-	${un.StrFilterS} '123abc 456DEF 7890|%#' '+' '' '' $OUT
-	${un.VersionCompare} '1.1.1.9' '1.1.1.01' $OUT
-	${un.VersionConvert} '9.0a' '' $OUT
+	${WordFind} 'C:\io.sys C:\Program Files C:\WINDOWS' ' C:\' '-02' $OUT
+	${WordFindS} 'C:\io.sys C:\Program Files C:\WINDOWS' ' C:\' '-02' $OUT
+	${WordFind2X} '[C:\io.sys];[C:\logo.sys];[C:\WINDOWS]' '[C:\' '];' '+2' $OUT
+	${WordFind2XS} '[C:\io.sys];[C:\logo.sys];[C:\WINDOWS]' '[C:\' '];' '+2' $OUT
+	${WordFind3X} '[1.AAB];[2.BAA];[3.BBB];' '[' 'AA' '];' '+1' $OUT
+	${WordFind3XS} '[1.AAB];[2.BAA];[3.BBB];' '[' 'AA' '];' '+1' $OUT
+	${WordReplace} 'C:\io.sys C:\logo.sys C:\WINDOWS' 'SYS' 'bmp' '+2' $OUT
+	${WordReplaceS} 'C:\io.sys C:\logo.sys C:\WINDOWS' 'SYS' 'bmp' '+2' $OUT
+	${WordAdd} 'C:\io.sys C:\WINDOWS' ' ' '+C:\WINDOWS C:\config.sys' $OUT
+	${WordAddS} 'C:\io.sys C:\WINDOWS' ' ' '+C:\WINDOWS C:\config.sys' $OUT
+	${WordInsert} 'C:\io.sys C:\WINDOWS' ' ' 'C:\logo.sys' '-2' $OUT
+	${WordInsertS} 'C:\io.sys C:\WINDOWS' ' ' 'C:\logo.sys' '-2' $OUT
+	${StrFilter} '123abc 456DEF 7890|%#' '+' '' '' $OUT
+	${StrFilterS} '123abc 456DEF 7890|%#' '+' '' '' $OUT
+	${VersionCompare} '1.1.1.9' '1.1.1.01' $OUT
+	${VersionConvert} '9.0a' '' $OUT
 SectionEnd