diff --git a/Contrib/AdvSplash/advsplash.c b/Contrib/AdvSplash/advsplash.c
index 9a0d0006..c222fca0 100644
--- a/Contrib/AdvSplash/advsplash.c
+++ b/Contrib/AdvSplash/advsplash.c
@@ -3,7 +3,7 @@
 
 #include <windows.h>
 #include <windowsx.h>
-#include "../ExDLL/exdll.h"
+#include <plugin.h> // nsis plugin.h
 
 HINSTANCE g_hInstance;
 
diff --git a/Contrib/Banner/Banner.c b/Contrib/Banner/Banner.c
index 22e7fbcc..02ca6764 100644
--- a/Contrib/Banner/Banner.c
+++ b/Contrib/Banner/Banner.c
@@ -1,5 +1,5 @@
 #include <windows.h>
-#include "../ExDLL/exdll.h"
+#include <plugin.h> // nsis plugin.h
 #include "../../Source/exehead/resource.h"
 
 // Turn a pair of chars into a word
diff --git a/Contrib/BgImage/BgImage.cpp b/Contrib/BgImage/BgImage.cpp
index 8668d9a6..6fd591a5 100644
--- a/Contrib/BgImage/BgImage.cpp
+++ b/Contrib/BgImage/BgImage.cpp
@@ -1,6 +1,6 @@
 #include <windows.h>
 #include <mmsystem.h>
-#include "../ExDLL/exdll.h"
+#include <plugin.h> // nsis plugin.h
 
 #undef EXDLL_INIT
 
diff --git a/Contrib/Dialer/dialer.c b/Contrib/Dialer/dialer.c
index 1f126ca6..3abf14e8 100644
--- a/Contrib/Dialer/dialer.c
+++ b/Contrib/Dialer/dialer.c
@@ -2,7 +2,7 @@
 #include <windows.h>
 #include <wininet.h>
 
-#include "../ExDLL/exdll.h"
+#include <plugin.h> // nsis plugin.h
 
 #define NSISFunction(funcname) void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop, extra_parameters *extra)
 
diff --git a/Contrib/ExDLL/exdll.c b/Contrib/ExDLL/exdll.c
index a999380d..d7335dfd 100644
--- a/Contrib/ExDLL/exdll.c
+++ b/Contrib/ExDLL/exdll.c
@@ -1,5 +1,5 @@
 #include <windows.h>
-#include "exdll.h"
+#include <plugin.h> // nsis plugin.h
 
 HINSTANCE g_hInstance;
 
diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index b4f42f7f..845ffbc3 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -14,9 +14,7 @@
 #include "resource.h"
 #include "shellapi.h"
 
-#define popstring dontuseme
-#include "../ExDLL/exdll.h"
-#undef popstring
+#include <plugin.h> // nsis plugin.h
 
 // Use for functions only called from one place to possibly reduce some code
 // size.  Allows the source code to remain readable by leaving the function
@@ -30,18 +28,6 @@
 void *WINAPI MALLOC(int len) { return (void*)GlobalAlloc(GPTR,len); }
 void WINAPI FREE(void *d) { if (d) GlobalFree((HGLOBAL)d); }
 
-void WINAPI popstring(char *str)
-{
-  if (g_stacktop && *g_stacktop)
-  {
-    stack_t *th = *g_stacktop;
-    *g_stacktop = th->next;
-    if (str)
-      lstrcpy(str, th->text);
-    FREE(th);
-  }
-}
-
 #define strcpy(x,y) lstrcpy(x,y)
 //#define strncpy(x,y,z) lstrcpyn(x,y,z)
 #define strdup(x) STRDUP(x)
diff --git a/Contrib/LangDLL/LangDLL.c b/Contrib/LangDLL/LangDLL.c
index 015b6824..a7366961 100644
--- a/Contrib/LangDLL/LangDLL.c
+++ b/Contrib/LangDLL/LangDLL.c
@@ -10,7 +10,7 @@
 //  LangDLL:LangDialog "Language Selection" "Choose a language" 2F French 1036 English 1033 12 Garamond
 
 
-#include "../ExDLL/exdll.h"
+#include <plugin.h> // nsis plugin.h
 
 int myatoi(char *s);
 
diff --git a/Contrib/Library/TypeLib/TypeLib.cpp b/Contrib/Library/TypeLib/TypeLib.cpp
index ef1b23eb..d03594b1 100644
--- a/Contrib/Library/TypeLib/TypeLib.cpp
+++ b/Contrib/Library/TypeLib/TypeLib.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <windows.h>
-#include "../../ExDLL/exdll.h"
+#include <plugin.h> // nsis plugin.h
 
 #define NSISFunction(funcname) extern "C" void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop)
 
diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp
index 60c18d73..634d1cfa 100644
--- a/Contrib/NSISdl/nsisdl.cpp
+++ b/Contrib/NSISdl/nsisdl.cpp
@@ -25,7 +25,8 @@
 #include "netinc.h"
 #include "util.h"
 #include "httpget.h"
-#include "../ExDLL/exdll.h"
+
+#include <plugin.h> // nsis plugin.h
 
 void *operator new( unsigned int num_bytes )
 {
diff --git a/Contrib/Splash/splash.c b/Contrib/Splash/splash.c
index 20588bf5..25924bc4 100644
--- a/Contrib/Splash/splash.c
+++ b/Contrib/Splash/splash.c
@@ -1,5 +1,5 @@
 #include <windows.h>
-#include "../ExDLL/exdll.h"
+#include <plugin.h> // nsis plugin.h
 
 HINSTANCE g_hInstance;
 
diff --git a/Contrib/StartMenu/StartMenu.c b/Contrib/StartMenu/StartMenu.c
index 9acd5cfa..5e03b709 100644
--- a/Contrib/StartMenu/StartMenu.c
+++ b/Contrib/StartMenu/StartMenu.c
@@ -1,6 +1,6 @@
 #include <windows.h>
 #include <shlobj.h>
-#include "../ExDLL/exdll.h"
+#include <plugin.h> // nsis plugin.h
 #include "resource.h"
 
 HINSTANCE g_hInstance;
diff --git a/Contrib/UserInfo/UserInfo.c b/Contrib/UserInfo/UserInfo.c
index 74874ee3..a5879888 100644
--- a/Contrib/UserInfo/UserInfo.c
+++ b/Contrib/UserInfo/UserInfo.c
@@ -1,5 +1,5 @@
 #include <windows.h>
-#include "../ExDLL/exdll.h"
+#include <plugin.h> // nsis plugin.h
 typedef BOOL (WINAPI*CHECKTOKENMEMBERSHIP)(HANDLE TokenHandle,PSID SidToCheck,PBOOL IsMember);
 CHECKTOKENMEMBERSHIP _CheckTokenMembership=NULL;
 
diff --git a/Contrib/VPatch/Source/Plugin/vpatchdll.c b/Contrib/VPatch/Source/Plugin/vpatchdll.c
index 11b863f5..cc624b03 100644
--- a/Contrib/VPatch/Source/Plugin/vpatchdll.c
+++ b/Contrib/VPatch/Source/Plugin/vpatchdll.c
@@ -25,9 +25,9 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <plugin.h> // nsis plugin.h
 #include "apply_patch.h"
 #include "checksum.h"
-#include "../../../ExDLL/exdll.h"
 
 /* ------------------------ Plug-in code ------------------------- */
 
diff --git a/Contrib/nsExec/nsexec.c b/Contrib/nsExec/nsexec.c
index dba3cafb..ead27595 100644
--- a/Contrib/nsExec/nsexec.c
+++ b/Contrib/nsExec/nsexec.c
@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
 #include <windows.h>
 #include <commctrl.h>
 #include <winnt.h>
-#include "../ExDLL/exdll.h"
+#include <plugin.h> // nsis plugin.h
 
 #ifndef true
 #define true TRUE