diff --git a/.gitattributes b/.gitattributes
index b322c1b006..8239567897 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1605,6 +1605,28 @@ debugger/debuggerdlg.pp svneol=native#text/pascal
 debugger/evaluatedlg.lfm svneol=native#text/plain
 debugger/evaluatedlg.lrs svneol=native#text/pascal
 debugger/evaluatedlg.pp svneol=native#text/pascal
+debugger/fpdebug/fpdd/fpdumpdwarf.lpr svneol=native#text/pascal
+debugger/fpdebug/fpwd/README.txt svneol=native#text/plain
+debugger/fpdebug/fpwd/fpwd.lpr svneol=native#text/pascal
+debugger/fpdebug/fpwd/fpwdcommand.pas svneol=native#text/pascal
+debugger/fpdebug/fpwd/fpwdglobal.pas svneol=native#text/pascal
+debugger/fpdebug/fpwd/fpwdloop.pas svneol=native#text/pascal
+debugger/fpdebug/fpwd/fpwdpeimage.pas svneol=native#text/pascal
+debugger/fpdebug/fpwd/fpwdtype.pas svneol=native#text/pascal
+debugger/fpdebug/test/asmtest.lpi svneol=native#text/plain
+debugger/fpdebug/test/asmtest.lpr svneol=native#text/pascal
+debugger/fpdebug/test/asmtestunit.lfm svneol=native#text/plain
+debugger/fpdebug/test/asmtestunit.lrs svneol=native#text/plain
+debugger/fpdebug/test/asmtestunit.pas svneol=native#text/pascal
+debugger/fpdebug/winddwarf.pas svneol=native#text/pascal
+debugger/fpdebug/winddwarfconst.pas svneol=native#text/pascal
+debugger/fpdebug/windebugger.pp svneol=native#text/pascal
+debugger/fpdebug/windextra.pp svneol=native#text/pascal
+debugger/fpdebug/windisas.pp svneol=native#text/plain
+debugger/fpdebug/windloader.pp svneol=native#text/pascal
+debugger/fpdebug/windpetypes.pp svneol=native#text/pascal
+debugger/fpdebug/windsymbols.pas svneol=native#text/pascal
+debugger/fpdebug/windutil.pp svneol=native#text/pascal
 debugger/frames/options_debugger_eventlog.lfm svneol=native#text/plain
 debugger/frames/options_debugger_eventlog.lrs svneol=native#text/pascal
 debugger/frames/options_debugger_eventlog.pas svneol=native#text/pascal
@@ -1640,28 +1662,6 @@ debugger/watchesdlg.pp svneol=native#text/pascal
 debugger/watchpropertydlg.lfm svneol=native#text/plain
 debugger/watchpropertydlg.lrs svneol=native#text/pascal
 debugger/watchpropertydlg.pp svneol=native#text/pascal
-debugger/windebug/fpdd/fpdumpdwarf.lpr svneol=native#text/pascal
-debugger/windebug/fpwd/README.txt svneol=native#text/plain
-debugger/windebug/fpwd/fpwd.lpr svneol=native#text/pascal
-debugger/windebug/fpwd/fpwdcommand.pas svneol=native#text/pascal
-debugger/windebug/fpwd/fpwdglobal.pas svneol=native#text/pascal
-debugger/windebug/fpwd/fpwdloop.pas svneol=native#text/pascal
-debugger/windebug/fpwd/fpwdpeimage.pas svneol=native#text/pascal
-debugger/windebug/fpwd/fpwdtype.pas svneol=native#text/pascal
-debugger/windebug/test/asmtest.lpi svneol=native#text/plain
-debugger/windebug/test/asmtest.lpr svneol=native#text/pascal
-debugger/windebug/test/asmtestunit.lfm svneol=native#text/plain
-debugger/windebug/test/asmtestunit.lrs svneol=native#text/plain
-debugger/windebug/test/asmtestunit.pas svneol=native#text/pascal
-debugger/windebug/winddwarf.pas svneol=native#text/pascal
-debugger/windebug/winddwarfconst.pas svneol=native#text/pascal
-debugger/windebug/windebugger.pp svneol=native#text/pascal
-debugger/windebug/windextra.pp svneol=native#text/pascal
-debugger/windebug/windisas.pp svneol=native#text/plain
-debugger/windebug/windloader.pp svneol=native#text/pascal
-debugger/windebug/windpetypes.pp svneol=native#text/pascal
-debugger/windebug/windsymbols.pas svneol=native#text/pascal
-debugger/windebug/windutil.pp svneol=native#text/pascal
 designer/abstracteditor.pp svneol=native#text/pascal
 designer/aligncompsdlg.lfm svneol=native#text/plain
 designer/aligncompsdlg.lrs svneol=native#text/plain
diff --git a/.gitignore b/.gitignore
index 8da251d98f..ae4e33a44a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,19 +158,19 @@ converter/units
 debian/*.bak
 debian/units
 debugger/*.bak
+debugger/fpdebug/*.bak
+debugger/fpdebug/fpdd/*.bak
+debugger/fpdebug/fpdd/units
+debugger/fpdebug/fpwd/*.bak
+debugger/fpdebug/fpwd/units
+debugger/fpdebug/test/*.bak
+debugger/fpdebug/test/units
+debugger/fpdebug/units
 debugger/test/*.bak
 debugger/test/examples/*.bak
 debugger/test/examples/units
 debugger/test/units
 debugger/units
-debugger/windebug/*.bak
-debugger/windebug/fpdd/*.bak
-debugger/windebug/fpdd/units
-debugger/windebug/fpwd/*.bak
-debugger/windebug/fpwd/units
-debugger/windebug/test/*.bak
-debugger/windebug/test/units
-debugger/windebug/units
 designer/*.bak
 designer/jitform/*.bak
 designer/jitform/units
diff --git a/debugger/windebug/fpdd/fpdumpdwarf.lpr b/debugger/fpdebug/fpdd/fpdumpdwarf.lpr
similarity index 100%
rename from debugger/windebug/fpdd/fpdumpdwarf.lpr
rename to debugger/fpdebug/fpdd/fpdumpdwarf.lpr
diff --git a/debugger/windebug/fpwd/README.txt b/debugger/fpdebug/fpwd/README.txt
similarity index 100%
rename from debugger/windebug/fpwd/README.txt
rename to debugger/fpdebug/fpwd/README.txt
diff --git a/debugger/windebug/fpwd/fpwd.lpr b/debugger/fpdebug/fpwd/fpwd.lpr
similarity index 100%
rename from debugger/windebug/fpwd/fpwd.lpr
rename to debugger/fpdebug/fpwd/fpwd.lpr
diff --git a/debugger/windebug/fpwd/fpwdcommand.pas b/debugger/fpdebug/fpwd/fpwdcommand.pas
similarity index 100%
rename from debugger/windebug/fpwd/fpwdcommand.pas
rename to debugger/fpdebug/fpwd/fpwdcommand.pas
diff --git a/debugger/windebug/fpwd/fpwdglobal.pas b/debugger/fpdebug/fpwd/fpwdglobal.pas
similarity index 100%
rename from debugger/windebug/fpwd/fpwdglobal.pas
rename to debugger/fpdebug/fpwd/fpwdglobal.pas
diff --git a/debugger/windebug/fpwd/fpwdloop.pas b/debugger/fpdebug/fpwd/fpwdloop.pas
similarity index 100%
rename from debugger/windebug/fpwd/fpwdloop.pas
rename to debugger/fpdebug/fpwd/fpwdloop.pas
diff --git a/debugger/windebug/fpwd/fpwdpeimage.pas b/debugger/fpdebug/fpwd/fpwdpeimage.pas
similarity index 100%
rename from debugger/windebug/fpwd/fpwdpeimage.pas
rename to debugger/fpdebug/fpwd/fpwdpeimage.pas
diff --git a/debugger/windebug/fpwd/fpwdtype.pas b/debugger/fpdebug/fpwd/fpwdtype.pas
similarity index 100%
rename from debugger/windebug/fpwd/fpwdtype.pas
rename to debugger/fpdebug/fpwd/fpwdtype.pas
diff --git a/debugger/windebug/test/asmtest.lpi b/debugger/fpdebug/test/asmtest.lpi
similarity index 100%
rename from debugger/windebug/test/asmtest.lpi
rename to debugger/fpdebug/test/asmtest.lpi
diff --git a/debugger/windebug/test/asmtest.lpr b/debugger/fpdebug/test/asmtest.lpr
similarity index 100%
rename from debugger/windebug/test/asmtest.lpr
rename to debugger/fpdebug/test/asmtest.lpr
diff --git a/debugger/windebug/test/asmtestunit.lfm b/debugger/fpdebug/test/asmtestunit.lfm
similarity index 100%
rename from debugger/windebug/test/asmtestunit.lfm
rename to debugger/fpdebug/test/asmtestunit.lfm
diff --git a/debugger/windebug/test/asmtestunit.lrs b/debugger/fpdebug/test/asmtestunit.lrs
similarity index 100%
rename from debugger/windebug/test/asmtestunit.lrs
rename to debugger/fpdebug/test/asmtestunit.lrs
diff --git a/debugger/windebug/test/asmtestunit.pas b/debugger/fpdebug/test/asmtestunit.pas
similarity index 100%
rename from debugger/windebug/test/asmtestunit.pas
rename to debugger/fpdebug/test/asmtestunit.pas
diff --git a/debugger/windebug/winddwarf.pas b/debugger/fpdebug/winddwarf.pas
similarity index 100%
rename from debugger/windebug/winddwarf.pas
rename to debugger/fpdebug/winddwarf.pas
diff --git a/debugger/windebug/winddwarfconst.pas b/debugger/fpdebug/winddwarfconst.pas
similarity index 100%
rename from debugger/windebug/winddwarfconst.pas
rename to debugger/fpdebug/winddwarfconst.pas
diff --git a/debugger/windebug/windebugger.pp b/debugger/fpdebug/windebugger.pp
similarity index 100%
rename from debugger/windebug/windebugger.pp
rename to debugger/fpdebug/windebugger.pp
diff --git a/debugger/windebug/windextra.pp b/debugger/fpdebug/windextra.pp
similarity index 100%
rename from debugger/windebug/windextra.pp
rename to debugger/fpdebug/windextra.pp
diff --git a/debugger/windebug/windisas.pp b/debugger/fpdebug/windisas.pp
similarity index 100%
rename from debugger/windebug/windisas.pp
rename to debugger/fpdebug/windisas.pp
diff --git a/debugger/windebug/windloader.pp b/debugger/fpdebug/windloader.pp
similarity index 100%
rename from debugger/windebug/windloader.pp
rename to debugger/fpdebug/windloader.pp
diff --git a/debugger/windebug/windpetypes.pp b/debugger/fpdebug/windpetypes.pp
similarity index 100%
rename from debugger/windebug/windpetypes.pp
rename to debugger/fpdebug/windpetypes.pp
diff --git a/debugger/windebug/windsymbols.pas b/debugger/fpdebug/windsymbols.pas
similarity index 100%
rename from debugger/windebug/windsymbols.pas
rename to debugger/fpdebug/windsymbols.pas
diff --git a/debugger/windebug/windutil.pp b/debugger/fpdebug/windutil.pp
similarity index 100%
rename from debugger/windebug/windutil.pp
rename to debugger/fpdebug/windutil.pp