diff --git a/src/common/ManagedCommon/PowerToysPathResolver.cs b/src/common/ManagedCommon/PowerToysPathResolver.cs
index 71cd2b6942..03ffe09b09 100644
--- a/src/common/ManagedCommon/PowerToysPathResolver.cs
+++ b/src/common/ManagedCommon/PowerToysPathResolver.cs
@@ -27,7 +27,7 @@ namespace ManagedCommon
             return GetPathFromCurrentProcess();
 #else
             // Try to get path from Per-User installation first
-            string path = GetPathFromRegistry(RegistryHive.CurrentUser);
+            string? path = GetPathFromRegistry(RegistryHive.CurrentUser);
             if (!string.IsNullOrEmpty(path))
             {
                 return path;
diff --git a/src/modules/FileLocksmith/FileLocksmithExt/PowerToysModule.cpp b/src/modules/FileLocksmith/FileLocksmithExt/PowerToysModule.cpp
index 5c4b7da6ce..54c1f9e2e1 100644
--- a/src/modules/FileLocksmith/FileLocksmithExt/PowerToysModule.cpp
+++ b/src/modules/FileLocksmith/FileLocksmithExt/PowerToysModule.cpp
@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "../FileLocksmithExt/RuntimeRegistration.h"
 
 // Update registration based on enabled state
 EXTERN_C __declspec(dllexport) void UpdateFileLocksmithRegistrationWin10(bool enabled)
diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/powertoys_module.cpp b/src/modules/NewPlus/NewShellExtensionContextMenu/powertoys_module.cpp
index 03115f5449..2f4159412e 100644
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/powertoys_module.cpp
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/powertoys_module.cpp
@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "RuntimeRegistration.h"
 
 #include <winrt/Windows.Data.Json.h>
 
diff --git a/src/modules/ZoomIt/ZoomIt/RCa66112 b/src/modules/ZoomIt/ZoomIt/RCa66112
new file mode 100644
index 0000000000..15c3d346b5
Binary files /dev/null and b/src/modules/ZoomIt/ZoomIt/RCa66112 differ
diff --git a/src/modules/ZoomIt/ZoomIt/RCb66112 b/src/modules/ZoomIt/ZoomIt/RCb66112
new file mode 100644
index 0000000000..15c3d346b5
Binary files /dev/null and b/src/modules/ZoomIt/ZoomIt/RCb66112 differ
diff --git a/src/modules/ZoomIt/ZoomIt/RCc66112 b/src/modules/ZoomIt/ZoomIt/RCc66112
new file mode 100644
index 0000000000..15c3d346b5
Binary files /dev/null and b/src/modules/ZoomIt/ZoomIt/RCc66112 differ
diff --git a/src/modules/ZoomIt/ZoomIt/RCd66112 b/src/modules/ZoomIt/ZoomIt/RCd66112
new file mode 100644
index 0000000000..15c3d346b5
Binary files /dev/null and b/src/modules/ZoomIt/ZoomIt/RCd66112 differ
diff --git a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj b/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
index e98f18b2ab..3855325b23 100644
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
@@ -109,7 +109,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;_M_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\..\common\utils\version;$(MSBuildThisFileDirectory)PowerToys;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\..\common\utils\;$(MSBuildThisFileDirectory)PowerToys;</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>Shlwapi.lib;comctl32.lib;odbc32.lib;odbccp32.lib;version.lib;Winmm.lib;gdiplus.lib;Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/modules/imageresizer/dll/dllmain.cpp b/src/modules/imageresizer/dll/dllmain.cpp
index 4ed21d648e..716c473efe 100644
--- a/src/modules/imageresizer/dll/dllmain.cpp
+++ b/src/modules/imageresizer/dll/dllmain.cpp
@@ -1,5 +1,6 @@
 #include "pch.h"
 #include "dllmain.h"
+#include "../dll/RuntimeRegistration.h"
 
 #include <trace.h>
 
diff --git a/src/modules/powerrename/PowerRenameContextMenu/dllmain.cpp b/src/modules/powerrename/PowerRenameContextMenu/dllmain.cpp
index ea90a51ff1..f3c1aa9645 100644
--- a/src/modules/powerrename/PowerRenameContextMenu/dllmain.cpp
+++ b/src/modules/powerrename/PowerRenameContextMenu/dllmain.cpp
@@ -25,6 +25,7 @@
 #include <Helpers.h>
 #include <Settings.h>
 #include <trace.h>
+#include "../dll/RuntimeRegistration.h"
 
 #include <mutex>
 #include <thread>
diff --git a/src/modules/powerrename/dll/dllmain.cpp b/src/modules/powerrename/dll/dllmain.cpp
index e6c85f0fd2..e485ebea3f 100644
--- a/src/modules/powerrename/dll/dllmain.cpp
+++ b/src/modules/powerrename/dll/dllmain.cpp
@@ -1,6 +1,7 @@
 #include "pch.h"
 
 #include "PowerRenameExt.h"
+#include "../dll/RuntimeRegistration.h"
 
 #include <trace.h>