diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 3a68a63f..bc8ffae4 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -17,7 +17,7 @@
 
 !define MUI_MACROS_USED
 
-!include "${NSISDIR}\Examples\WinMessages.nsh"
+!include "${NSISDIR}\Include\WinMessages.nsh"
 
 !define MUI_TEMP1 $R0
 !define MUI_TEMP2 $R1
diff --git a/Contrib/System/SysFunc.nsh b/Contrib/System/SysFunc.nsh
index a4abe292..c914a895 100644
--- a/Contrib/System/SysFunc.nsh
+++ b/Contrib/System/SysFunc.nsh
@@ -10,8 +10,8 @@
 !include "${NSISDIR}\Contrib\System\System.nsh"
 
 !verbose 3      ; For WinMessages especially
-!include "${NSISDIR}\Examples\WinMessages.nsh"
-!verbose 3
+  !include "${NSISDIR}\Include\WinMessages.nsh"
+!verbose 4
 
 ; ================= systemGetFileSysTime implementation =================
 
diff --git a/Docs/src/callback.but b/Docs/src/callback.but
index e9adebfe..ed918b92 100644
--- a/Docs/src/callback.but
+++ b/Docs/src/callback.but
@@ -10,7 +10,7 @@ This callback will be called just before the first page is loaded and the instal
 
 Example:
 
-\c  !include "${NSISDIR}\Examples\WinMessages.NSH"
+\c  !include "${NSISDIR}\Include\WinMessages.nsh"
 \c
 \c  Function .onGUIInit
 \c    # 1028 is the id of the branding text control
diff --git a/Docs/src/flowcontrol.but b/Docs/src/flowcontrol.but
index 263bcd7f..2f055a0b 100644
--- a/Docs/src/flowcontrol.but
+++ b/Docs/src/flowcontrol.but
@@ -142,7 +142,7 @@ Returns from a function or section.
 
 \b \e{WM_USER} 1024
 
-Include $\{NSISDIR\}\\Examples\\WinMessages.nsh to have all of Windows messages defined in your script.
+Include $\{NSISDIR\}\\Include\\WinMessages.nsh to have all of Windows messages defined in your script.
 
 To send a string param, put STR: before the parameter, for example: "STR:Some string".
 
diff --git a/Docs/src/ui.but b/Docs/src/ui.but
index 57b43030..d99987b6 100644
--- a/Docs/src/ui.but
+++ b/Docs/src/ui.but
@@ -84,4 +84,4 @@ Same as \W{http://msdn.microsoft.com/library/en-us/winui/winui/windowsuserinterf
 
 \c hwnd show_state
 
-Sets the visibilty of a window. Possible show_states are the same as \W{http://msdn.microsoft.com/library/en-us/winui/winui/windowsuserinterface/windowing/windows/windowreference/windowfunctions/showwindow.asp}{Widnows ShowWindow} function. SW_* are defined in \W{../Examples/WinMessages.NSH}{Examples\\WinMessages.NSH}.
\ No newline at end of file
+Sets the visibilty of a window. Possible show_states are the same as \W{http://msdn.microsoft.com/library/en-us/winui/winui/windowsuserinterface/windowing/windows/windowreference/windowfunctions/showwindow.asp}{Widnows ShowWindow} function. SW_* are defined in \W{../Include/WinMessages.NSH}{Include\\WinMessages.NSH}.
\ No newline at end of file
diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index 3c83d6bf..49d6e491 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -72,6 +72,9 @@ Section "NSIS Development System (required)" SecCore
   File ..\nsisconf.nsh
   SetOverwrite try
 
+  SetOutPath $INSTDIR\Include
+  File ..\Include\WinMessages.nsh
+
   SetOutPath $INSTDIR\Docs
   File ..\Docs\*.html
   File ..\Docs\*.css
@@ -100,7 +103,6 @@ Section "NSIS Examples (recommended)" SecExample
   File ..\Examples\gfx.nsi
   File ..\Examples\one-section.nsi
   File ..\Examples\languages.nsi
-  File ..\Examples\WinMessages.nsh
 SectionEnd
 
 Section "NSI Development Shell Extensions" SecExtention
diff --git a/Examples/WinMessages.NSH b/Include/WinMessages.nsh
similarity index 96%
rename from Examples/WinMessages.NSH
rename to Include/WinMessages.nsh
index 39dc47cc..62100dbe 100644
--- a/Examples/WinMessages.NSH
+++ b/Include/WinMessages.nsh
@@ -1,6 +1,12 @@
-; KiCHiK put together this list of WM_ messages.
-!ifndef WINMESSAGES_NSH
-!define WINMESSAGES_NSH
+; List of common Windows Messages
+; By KiCHiK
+
+; Include in your script using:
+; !include "${NSISDIR}\Include\WinMessages.nsh"
+
+!ifndef WINMESSAGES_INCLUDED
+
+!define WINMESSAGES_INCLUDED
 
 !define HWND_BROADCAST 0xFFFF