diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0791e67a..f6ca99e9 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -1,4 +1,4 @@
-name: CMake
+name: Windows build
 
 on:
   workflow_dispatch:
diff --git a/installer/mosquitto.nsi b/installer/mosquitto.nsi
index 241618c0..a22750d5 100644
--- a/installer/mosquitto.nsi
+++ b/installer/mosquitto.nsi
@@ -52,6 +52,7 @@ Section "Files" SecInstall
 	File "..\build\lib\Release\mosquitto.dll"
 	File "..\build\lib\cpp\Release\mosquittopp.dll"
 	File "..\build\plugins\dynamic-security\Release\mosquitto_dynamic_security.dll"
+	File "..\build\plugins\persist-sqlite\Release\mosquitto_persist_sqlite.dll"
 	File "..\aclfile.example"
 	File "..\ChangeLog.txt"
 	File "..\mosquitto.conf"
@@ -61,8 +62,8 @@ Section "Files" SecInstall
 	File "..\README-windows.txt"
 	File "..\README-letsencrypt.md"
 	File "..\SECURITY.md"
-	File "C:\OpenSSL-Win32\bin\libssl-3.dll"
-	File "C:\OpenSSL-Win32\bin\libcrypto-3.dll"
+	File "C:\OpenSSL-Win32\bin\libssl-1_1.dll"
+	File "C:\OpenSSL-Win32\bin\libcrypto-1_1.dll"
 	File "..\edl-v10"
 	File "..\epl-v20"
 
@@ -72,8 +73,8 @@ Section "Files" SecInstall
 	File "..\include\mosquitto.h"
 	File "..\include\mosquitto_broker.h"
 	File "..\include\mosquitto_plugin.h"
+	File "..\include\mosquittopp.h"
 	File "..\include\mqtt_protocol.h"
-	File "..\lib\cpp\mosquittopp.h"
 
 	WriteUninstaller "$INSTDIR\Uninstall.exe"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mosquitto" "DisplayName" "Eclipse Mosquitto MQTT broker"
@@ -111,6 +112,7 @@ Section "Uninstall"
 	Delete "$INSTDIR\mosquitto.dll"
 	Delete "$INSTDIR\mosquittopp.dll"
 	Delete "$INSTDIR\mosquitto_dynamic_security.dll"
+	Delete "$INSTDIR\mosquitto_persist_sqlite.dll"
 	Delete "$INSTDIR\aclfile.example"
 	Delete "$INSTDIR\ChangeLog.txt"
 	Delete "$INSTDIR\mosquitto.conf"
@@ -120,8 +122,8 @@ Section "Uninstall"
 	Delete "$INSTDIR\README-windows.txt"
 	Delete "$INSTDIR\README-letsencrypt.md"
 	Delete "$INSTDIR\SECURITY.md"
-	Delete "$INSTDIR\libssl-3.dll"
-	Delete "$INSTDIR\libcrypto-3.dll"
+	Delete "$INSTDIR\libssl-1_1.dll"
+	Delete "$INSTDIR\libcrypto-1_1.dll"
 	Delete "$INSTDIR\edl-v10"
 	Delete "$INSTDIR\epl-v20"
 
@@ -150,4 +152,3 @@ LangString DESC_SecService ${LANG_ENGLISH} "Install mosquitto as a Windows servi
 	!insertmacro MUI_DESCRIPTION_TEXT ${SecInstall} $(DESC_SecInstall)
 	!insertmacro MUI_DESCRIPTION_TEXT ${SecService} $(DESC_SecService)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
-
diff --git a/installer/mosquitto64.nsi b/installer/mosquitto64.nsi
index 0259d07a..7b456b53 100644
--- a/installer/mosquitto64.nsi
+++ b/installer/mosquitto64.nsi
@@ -53,6 +53,7 @@ Section "Files" SecInstall
 	File "..\build64\lib\Release\mosquitto.dll"
 	File "..\build64\lib\cpp\Release\mosquittopp.dll"
 	File "..\build64\plugins\dynamic-security\Release\mosquitto_dynamic_security.dll"
+	File "..\build64\plugins\persist-sqlite\Release\mosquitto_persist_sqlite.dll"
 	File "..\aclfile.example"
 	File "..\ChangeLog.txt"
 	File "..\mosquitto.conf"
@@ -62,8 +63,8 @@ Section "Files" SecInstall
 	File "..\README-windows.txt"
 	File "..\README-letsencrypt.md"
 	File "..\SECURITY.md"
-	File "C:\OpenSSL-Win64\bin\libssl-3-x64.dll"
-	File "C:\OpenSSL-Win64\bin\libcrypto-3-x64.dll"
+	File "C:\Program Files\OpenSSL-Win64\bin\libssl-1_1-x64.dll"
+	File "C:\Program Files\OpenSSL-Win64\bin\libcrypto-1_1-x64.dll"
 	File "..\edl-v10"
 	File "..\epl-v20"
 
@@ -73,8 +74,8 @@ Section "Files" SecInstall
 	File "..\include\mosquitto.h"
 	File "..\include\mosquitto_broker.h"
 	File "..\include\mosquitto_plugin.h"
+	File "..\include\mosquittopp.h"
 	File "..\include\mqtt_protocol.h"
-	File "..\lib\cpp\mosquittopp.h"
 
 	WriteUninstaller "$INSTDIR\Uninstall.exe"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mosquitto64" "DisplayName" "Eclipse Mosquitto MQTT broker (64 bit)"
@@ -112,6 +113,7 @@ Section "Uninstall"
 	Delete "$INSTDIR\mosquitto.dll"
 	Delete "$INSTDIR\mosquittopp.dll"
 	Delete "$INSTDIR\mosquitto_dynamic_security.dll"
+	Delete "$INSTDIR\mosquitto_persist_sqlite.dll"
 	Delete "$INSTDIR\aclfile.example"
 	Delete "$INSTDIR\ChangeLog.txt"
 	Delete "$INSTDIR\mosquitto.conf"
@@ -121,8 +123,8 @@ Section "Uninstall"
 	Delete "$INSTDIR\README-windows.txt"
 	Delete "$INSTDIR\README-letsencrypt.md"
 	Delete "$INSTDIR\SECURITY.md"
-	Delete "$INSTDIR\libssl-3-x64.dll"
-	Delete "$INSTDIR\libcrypto-3-x64.dll"
+	Delete "$INSTDIR\libssl-1_1-x64.dll"
+	Delete "$INSTDIR\libcrypto-1_1-x64.dll"
 	Delete "$INSTDIR\edl-v10"
 	Delete "$INSTDIR\epl-v20"
 
@@ -151,4 +153,3 @@ LangString DESC_SecService ${LANG_ENGLISH} "Install mosquitto as a Windows servi
 	!insertmacro MUI_DESCRIPTION_TEXT ${SecInstall} $(DESC_SecInstall)
 	!insertmacro MUI_DESCRIPTION_TEXT ${SecService} $(DESC_SecService)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
-