diff --git a/Project/CMake/CLI/CMakeLists.txt b/Project/CMake/CLI/CMakeLists.txt
index 0a48b42d49..653caa5c8b 100644
--- a/Project/CMake/CLI/CMakeLists.txt
+++ b/Project/CMake/CLI/CMakeLists.txt
@@ -32,7 +32,8 @@ set(CLI_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/CLI/CommandLine_Parser.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/CLI/Help.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/Common/Core.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../MSVC2022/CLI/MediaInfo_CLI.rc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/CLI/MediaInfo_CLI.rc
+    ${CMAKE_CURRENT_SOURCE_DIR}/segmentheap.manifest
 )
 
 add_executable(mediainfo_cli ${CLI_SOURCES})
diff --git a/Project/CMake/CLI/segmentheap.manifest b/Project/CMake/CLI/segmentheap.manifest
new file mode 100644
index 0000000000..f9dd5c1f6e
--- /dev/null
+++ b/Project/CMake/CLI/segmentheap.manifest
@@ -0,0 +1,7 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">
+      <heapType>SegmentHeap</heapType>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
\ No newline at end of file
diff --git a/Project/MSVC2022/CLI/MediaInfo-CLI.vcxproj b/Project/MSVC2022/CLI/MediaInfo-CLI.vcxproj
index 2ee5923dc8..ba7aff38f2 100644
--- a/Project/MSVC2022/CLI/MediaInfo-CLI.vcxproj
+++ b/Project/MSVC2022/CLI/MediaInfo-CLI.vcxproj
@@ -138,6 +138,9 @@
       <SubSystem>Console</SubSystem>
       <Profile>true</Profile>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <ClCompile>
@@ -152,6 +155,9 @@
       <SubSystem>Console</SubSystem>
       <Profile>true</Profile>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -167,6 +173,9 @@
       <SubSystem>Console</SubSystem>
       <Profile>true</Profile>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <ClCompile>
@@ -182,6 +191,9 @@
       <SubSystem>Console</SubSystem>
       <Profile>true</Profile>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -202,6 +214,9 @@
       <Profile>true</Profile>
       <CETCompat>true</CETCompat>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <ClCompile>
@@ -220,6 +235,9 @@
       <GenerateDebugInformation>No</GenerateDebugInformation>
       <Profile>true</Profile>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -240,6 +258,9 @@
       <Profile>true</Profile>
       <CETCompat>true</CETCompat>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <ClCompile>
@@ -259,6 +280,9 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <Profile>true</Profile>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\CLI\CLI_Main.cpp" />
@@ -276,7 +300,7 @@
     <ClInclude Include="..\..\..\Source\Common\Utils.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="MediaInfo_CLI.rc" />
+    <ResourceCompile Include="..\..\..\Source\CLI\MediaInfo_CLI.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2022\Library\MediaInfoLib.vcxproj">
diff --git a/Project/MSVC2026/CLI/MediaInfo-CLI.vcxproj b/Project/MSVC2026/CLI/MediaInfo-CLI.vcxproj
index 9107a66600..ec5a1dfaa4 100644
--- a/Project/MSVC2026/CLI/MediaInfo-CLI.vcxproj
+++ b/Project/MSVC2026/CLI/MediaInfo-CLI.vcxproj
@@ -138,6 +138,9 @@
       <SubSystem>Console</SubSystem>
       <Profile>true</Profile>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <ClCompile>
@@ -152,6 +155,9 @@
       <SubSystem>Console</SubSystem>
       <Profile>true</Profile>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -167,6 +173,9 @@
       <SubSystem>Console</SubSystem>
       <Profile>true</Profile>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <ClCompile>
@@ -182,6 +191,9 @@
       <SubSystem>Console</SubSystem>
       <Profile>true</Profile>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -202,6 +214,9 @@
       <Profile>true</Profile>
       <CETCompat>true</CETCompat>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <ClCompile>
@@ -220,6 +235,9 @@
       <GenerateDebugInformation>No</GenerateDebugInformation>
       <Profile>true</Profile>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -240,6 +258,9 @@
       <Profile>true</Profile>
       <CETCompat>true</CETCompat>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <ClCompile>
@@ -259,6 +280,9 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <Profile>true</Profile>
     </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\CLI\CLI_Main.cpp" />
@@ -276,7 +300,7 @@
     <ClInclude Include="..\..\..\Source\Common\Utils.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="MediaInfo_CLI.rc" />
+    <ResourceCompile Include="..\..\..\Source\CLI\MediaInfo_CLI.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\MediaInfoLib\Project\MSVC2026\Library\MediaInfoLib.vcxproj">
diff --git a/Project/MSVC2026/CLI/MediaInfo_CLI.rc b/Project/MSVC2026/CLI/MediaInfo_CLI.rc
deleted file mode 100644
index 12e6a7828d..0000000000
--- a/Project/MSVC2026/CLI/MediaInfo_CLI.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <winresrc.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 25,10,0,0
- PRODUCTVERSION 25,10,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // U.S. English (0x0409, 1033), Unicode (0x04B0, 1200)
-        BEGIN
-            VALUE "CompanyName", "MediaArea.net"
-            VALUE "FileDescription", "MediaInfo"
-            VALUE "FileVersion", "25.10.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2025 MediaArea.net SARL"
-            VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "25.10.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/Project/QMake/GUI/MediaInfoQt.pro b/Project/QMake/GUI/MediaInfoQt.pro
index 14a2033e82..344132f6e9 100644
--- a/Project/QMake/GUI/MediaInfoQt.pro
+++ b/Project/QMake/GUI/MediaInfoQt.pro
@@ -90,6 +90,7 @@ unix {
 win32 {
     QMAKE_CXXFLAGS += /MP /guard:cf
     QMAKE_LFLAGS += /guard:cf /CETCOMPAT
+    QMAKE_LFLAGS += /MANIFESTINPUT:$$_PRO_FILE_PWD_\segmentheap.manifest
 
     contains(UWP, yes|1) {
 
diff --git a/Project/QMake/GUI/segmentheap.manifest b/Project/QMake/GUI/segmentheap.manifest
new file mode 100644
index 0000000000..f9dd5c1f6e
--- /dev/null
+++ b/Project/QMake/GUI/segmentheap.manifest
@@ -0,0 +1,7 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">
+      <heapType>SegmentHeap</heapType>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
\ No newline at end of file
diff --git a/Project/MSVC2022/CLI/MediaInfo_CLI.rc b/Source/CLI/MediaInfo_CLI.rc
similarity index 100%
rename from Project/MSVC2022/CLI/MediaInfo_CLI.rc
rename to Source/CLI/MediaInfo_CLI.rc