diff --git a/.gitattributes b/.gitattributes
index 913f7e729a..4f99f0e8e1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4583,7 +4583,6 @@ rtl/win32/wprt0_10.as -text
 rtl/win64/Makefile svneol=native#text/plain
 rtl/win64/Makefile.fpc svneol=native#text/plain
 rtl/win64/classes.pp svneol=native#text/plain
-rtl/win64/makefile.fpc -text
 rtl/win64/system.pp svneol=native#text/plain
 rtl/win64/windows.pp svneol=native#text/plain
 rtl/wince/Makefile svneol=native#text/plain
diff --git a/rtl/win64/makefile.fpc b/rtl/win64/makefile.fpc
deleted file mode 100644
index c8e33614a0..0000000000
--- a/rtl/win64/makefile.fpc
+++ /dev/null
@@ -1,243 +0,0 @@
-#
-#   Makefile.fpc for Free Pascal Win64 RTL
-#
-
-[package]
-main=rtl
-
-[target]
-loaders=$(LOADERS)
-units=system ctypes objpas macpas strings \
-      lineinfo heaptrc matrix \
-      dos objects \
-      windows winsock winsock2 cmem \
-      rtlconsts sysconst sysutils math types \
-      strutils convutils dateutils \
-      varutils variants typinfo classes getopts \
-      sockets printer charset ucomplex \
-      winevent video mouse keyboard \
-      dynlibs crt messages \
-      fpmkunit
-#     winsysut signals
-#     cpu mmx
-#     no cygwin so far
-#	initc
-
-rsts=math varutils typinfo variants classes dateutils sysconst fpmkunit
-
-[require]
-nortl=y
-
-[install]
-fpcpackage=y
-
-[default]
-fpcdir=../..
-target=win64
-
-[compiler]
-includedir=$(INC) $(PROCINC)
-sourcedir=$(INC) $(PROCINC) $(COMMON) $(WINDIR)
-
-
-[prerules]
-RTL=..
-INC=$(RTL)/inc
-COMMON=$(RTL)/common
-PROCINC=$(RTL)/$(CPU_TARGET)
-WININC=../win/wininc
-WINDIR=../win
-
-UNITPREFIX=rtl
-
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-LOADERS=wprt0 wdllprt0 gprt0 wcygprt0
-endif
-
-# Paths
-OBJPASDIR=$(RTL)/objpas
-
-# Files used by windows.pp
-#include $(WININC)/makefile.inc
-
-WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
-
-
-[rules]
-SYSTEMPPU=$(addsuffix $(PPUEXT),system)
-
-# Get the system independent include file names.
-# This will set the following variables :
-# SYSINCNAMES
-include $(INC)/makefile.inc
-SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
-
-# Get the processor dependent include file names.
-# This will set the following variables :
-# CPUINCNAMES
-include $(PROCINC)/makefile.cpu
-SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
-
-# Put system unit dependencies together.
-SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
-
-
-#
-# Loaders
-#
-
-wprt0$(OEXT) : wprt0.as
-
-gprt0$(OEXT) : gprt0.as
-
-wdllprt0$(OEXT) : wdllprt0.as
-
-wcygprt0$(OEXT) : wcygprt0.as
-
-#
-# System Units (System, Objpas, Strings)
-#
-
-system$(PPUEXT) : system.pp $(SYSDEPS)
-        $(COMPILER) -Us -Sg system.pp -Fi../win
-
-objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc system$(PPUEXT)
-        $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp
-
-strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
-                   $(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
-                   system$(PPUEXT)
-
-#
-# System Dependent Units
-#
-
-windows$(PPUEXT) : windows.pp $(WINDOWS_SOURCE_FILES) system$(PPUEXT)
-        $(COMPILER) -I$(WININC) windows.pp
-
-messages$(PPUEXT): $(WINDIR)/messages.pp $(WININC)/messages.inc system$(PPUEXT)
-        $(COMPILER) -I$(WININC) $(WINDIR)/messages.pp
-
-opengl32$(PPUEXT) : opengl32.pp windows$(PPUEXT) system$(PPUEXT)
-
-winsock$(PPUEXT) : $(WINDIR)/winsock.pp windows$(PPUEXT) system$(PPUEXT)
-
-winsock2$(PPUEXT) : $(WINDIR)/winsock2.pp windows$(PPUEXT) system$(PPUEXT)
-
-sockets$(PPUEXT) : $(WINDIR)/sockets.pp windows$(PPUEXT) winsock$(PPUEXT) system$(PPUEXT) \
-                   $(INC)/sockets.inc $(INC)/socketsh.inc
-
-# initc$(PPUEXT) : initc.pp system$(PPUEXT)
-
-dynlibs$(PPUEXT) : $(INC)/dynlibs.pp windows$(PPUEXT)
-	$(COMPILER) -I$(WINDIR) $(INC)/dynlibs.pp
-
-#
-# TP7 Compatible RTL Units
-#
-
-dos$(PPUEXT) : $(WINDIR)/dos.pp $(INC)/filerec.inc $(INC)/textrec.inc strings$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) $(WINDIR)/dos.pp
-
-crt$(PPUEXT) : $(WINDIR)/crt.pp $(INC)/textrec.inc system$(PPUEXT) objpas$(PPUEXT) dos$(PPUEXT) windows$(PPUEXT)
-
-objects$(PPUEXT) : $(INC)/objects.pp dos$(PPUEXT) strings$(PPUEXT) system$(PPUEXT)
-
-printer$(PPUEXT) : $(WINDIR)/printer.pp system$(PPUEXT)
-
-#
-# Delphi Compatible Units
-#
-
-sysutils$(PPUEXT) : $(WINDIR)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-                    objpas$(PPUEXT) dos$(PPUEXT) windows$(PPUEXT) sysconst$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(WINDIR)/sysutils.pp
-
-classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
-                   sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) sysconst$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) -Fi../win -Fi$(OBJPASDIR)/classes classes.pp
-
-winsysut$(PPUEXT) : winsysut.pp sysutils$(PPUEXT) system$(PPUEXT)
-
-typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp
-
-math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) $(OBJPASDIR)/math.pp
-
-varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \
-                    $(OBJPASDIR)/varutilh.inc $(WINDIR)/varutils.pp sysutils$(PPUEXT)
-        $(COMPILER) -Fi$(OBJPASDIR) $(WINDIR)/varutils.pp
-
-variants$(PPUEXT) : $(INC)/variants.pp varutils$(PPUEXT) sysutils$(PPUEXT) sysconst$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) -Fi$(INC) $(INC)/variants.pp
-
-types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) $(OBJPASDIR)/types.pp
-
-rtlconsts$(PPUEXT) : objpas$(PPUEXT) $(OBJPASDIR)/rtlconsts.pp
-        $(COMPILER) $(OBJPASDIR)/rtlconsts.pp
-
-sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) $(OBJPASDIR)/sysconst.pp
-
-dateutils$(PPUEXT) : $(OBJPASDIR)/dateutils.pp system$(PPUEXT)
-        $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/dateutils.pp
-
-convutils$(PPUEXT) : $(OBJPASDIR)/convutils.pp system$(PPUEXT)
-        $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/convutils.pp
-
-strutils$(PPUEXT) : $(OBJPASDIR)/strutils.pp system$(PPUEXT)
-        $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/strutils.pp
-
-#
-# Mac Pascal Model
-#
-
-macpas$(PPUEXT) : $(INC)/macpas.pp system$(PPUEXT)
-        $(COMPILER) $(INC)/macpas.pp $(REDIR)
-
-#
-# Other system-independent RTL Units
-#
-
-cpu$(PPUEXT) : $(PROCINC)/cpu.pp system$(PPUEXT)
-
-mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) system$(PPUEXT)
-
-getopts$(PPUEXT) : $(INC)/getopts.pp system$(PPUEXT)
-
-heaptrc$(PPUEXT) : $(INC)/heaptrc.pp system$(PPUEXT)
-        $(COMPILER) -Sg $(INC)/heaptrc.pp
-
-lineinfo$(PPUEXT) : $(INC)/lineinfo.pp system$(PPUEXT)
-
-charset$(PPUEXT) : $(INC)/charset.pp system$(PPUEXT)
-
-cmem$(PPUEXT) : $(INC)/cmem.pp system$(PPUEXT)
-
-ucomplex$(PPUEXT) : $(INC)/ucomplex.pp math$(PPUEXT) system$(PPUEXT)
-
-fpmkunit$(PPUEXT) : $(COMMON)/fpmkunit.pp classes$(PPUEXT) system$(PPUEXT)
-
-#
-# Other system-dependent RTL Units
-#
-
-callspec$(PPUEXT) : $(INC)/callspec.pp system$(PPUEXT)
-
-ctypes$(PPUEXT) :  $(INC)/ctypes.pp system$(PPUEXT)
-
-variants$(PPUEXT) : $(INC)/variants.pp varutils$(PPUEXT) typinfo$(PPUEXT) system$(PPUEXT)
-
-winevent$(PPUEXT) : $(WINDIR)/winevent.pp windows$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) $(WINDIR)/winevent.pp
-
-video$(PPUEXT) : $(WINDIR)/video.pp windows$(PPUEXT) dos$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) $(WINDIR)/video.pp
-
-mouse$(PPUEXT) : $(WINDIR)/mouse.pp windows$(PPUEXT) dos$(PPUEXT) winevent$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) $(WINDIR)/mouse.pp
-
-keyboard$(PPUEXT) : $(WINDIR)/keyboard.pp windows$(PPUEXT) dos$(PPUEXT) winevent$(PPUEXT) system$(PPUEXT)
-        $(COMPILER) $(WINDIR)/keyboard.pp