diff --git a/tools/install/win/create_installer.bat b/tools/install/win/create_installer.bat
index e52ec495d7..797ec0b3f0 100644
--- a/tools/install/win/create_installer.bat
+++ b/tools/install/win/create_installer.bat
@@ -125,13 +125,6 @@ if not [%IDE_WIDGETSET%]==[win32] SET OutputFileName=lazarus-%IDE_WIDGETSET%-%LA
 
 :GO_ON
 
-if [%FPCTARGETOS%]==[win64] GOTO GO64
-cp RemovedFiles32.iss RemovedFiles.iss
-GOTO GO_ON2
-:GO64
-cp RemovedFiles64.iss RemovedFiles.iss
-
-:GO_ON2
 %ISCC% lazarus.iss >> installer.log
 
 :: do not delete build dir, if installer failed.
diff --git a/tools/install/win/lazarus.iss b/tools/install/win/lazarus.iss
index ad85d7d905..80cb024542 100644
--- a/tools/install/win/lazarus.iss
+++ b/tools/install/win/lazarus.iss
@@ -78,7 +78,12 @@ Name: {localappdata}\lazarus\staticpackages.inc; Type: files; Tasks: delusersett
 Name: {localappdata}\lazarus\unitdictionarycodyunitdictionary*.tmp; Type: files; Tasks: delusersettings
 Name: {localappdata}\lazarus\projectsessions\*.lps; Type: files; Tasks: delusersettings
 Name: {localappdata}\lazarus\userschemes\*.xml; Type: files; Tasks: delusersettings
-#include "RemovedFiles.iss"
+#if FPCTargetOS=="win32"
+#include "RemovedFiles32.iss"
+#endif
+#if FPCTargetOS=="win64"
+#include "RemovedFiles64.iss"
+#endif
 
 [Files]
 Source: {#BuildDir}\*.*; DestDir: {app}; Flags: recursesubdirs