3 files changed, 49 insertions, 23 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 283ba9c6c0d1..82cd0d08d9b1 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -87,26 +87,4 @@ End
 
 #endif
 
-#if defined(WITH_VC100_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC100_CRT_x64
-    Feature = gm_Root;
-    Name = "Microsoft_VC100_CRT_x64.msm";
-    RootDir = "TARGETDIR";
-    ComponentCondition = "(VC_REDIST=1) AND VersionNT64";
-End
-
-#endif
-
-#if defined(WITH_VC110_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC110_CRT_x64
-    Feature = gm_Root;
-    Name = "Microsoft_VC110_CRT_x64.msm";
-    RootDir = "TARGETDIR";
-    ComponentCondition = "(VC_REDIST=1) AND VersionNT64";
-End
-
-#endif
-
 #endif
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index f2a2a89e8ec6..ce8dc1c586ab 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -95,3 +95,47 @@ File gid_File_Lib_Shlxtmsi
     Dir = SCP2_OOO_BIN_DIR;
     Name = "shlxtmsi.dll";
 End
+
+#ifdef BUILD_X64
+
+#if defined(WITH_VC100_REDIST)
+
+File gid_File_Lib_Msvcr100
+    LIB_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Shlxthdl;
+    Name = "msvcr100.dll";
+    ComponentCondition = "VersionNT64";
+End
+
+File gid_File_Lib_Msvcp100
+    LIB_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Shlxthdl;
+    Name = "msvcp100.dll";
+    ComponentCondition = "VersionNT64";
+End
+
+#endif
+
+#if defined(WITH_VC110_REDIST)
+
+File gid_File_Lib_Msvcr110
+    LIB_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Shlxthdl;
+    Name = "msvcr110.dll";
+    ComponentCondition = "VersionNT64";
+End
+
+File gid_File_Lib_Msvcp110
+    LIB_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Shlxthdl;
+    Name = "msvcp110.dll";
+    ComponentCondition = "VersionNT64";
+End
+
+#endif
+
+#endif
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index 3932e4f4d7c9..6756a305829a 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -51,5 +51,9 @@ Module gid_Module_Optional_Winexplorerext_x64
     Dirs = (gid_Dir_Shlxthdl);
     Files = (gid_File_Lib_Shlxthdl64,
              gid_File_Lib_OOoFilt64,
-             gid_File_Lib_PropertyHdl64);
+             gid_File_Lib_PropertyHdl64,
+             gid_File_Lib_Msvcp100,
+             gid_File_Lib_Msvcr100,
+             gid_File_Lib_Msvcp110,
+             gid_File_Lib_Msvcr110);
 End