diff --git a/Makefile b/Makefile
index a83a5bd503..fe6b1d973b 100644
--- a/Makefile
+++ b/Makefile
@@ -3775,6 +3775,7 @@ basecomponents:
 	$(MAKE) -C components/lazcontrols/design
 	$(MAKE) -C components/lclextensions
 	$(MAKE) -C components/virtualtreeview
+	$(MAKE) -C components/fpdebug
 	$(MAKE) -C ide/packages/idedebugger
 bigidecomponents:
 	$(MAKE) -C components bigide
diff --git a/Makefile.fpc b/Makefile.fpc
index ed82331fd2..2a9adfafb0 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -148,6 +148,7 @@ basecomponents:
 	$(MAKE) -C components/lazcontrols/design
 	$(MAKE) -C components/lclextensions
 	$(MAKE) -C components/virtualtreeview
+	$(MAKE) -C components/fpdebug
 	$(MAKE) -C ide/packages/idedebugger
 
 #-----------------------------------------------------------------------------
diff --git a/ide/Makefile b/ide/Makefile
index b6a553a776..abc337e1be 100644
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -389,6 +389,7 @@ DEFAULT_IDE_OPTIONS= $(LAZARUS_LIBPATHS) \
   -Fu../components/lazdebuggergdbmi/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) \
   -Fu../components/virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) \
+  -Fu../components/fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) \
   -Fupackages/idedebugger/lib/$(CPU_TARGET)-$(OS_TARGET)
 BIG_IDE_OPTIONS=-dBigIDE $(DEFAULT_IDE_OPTIONS) \
   -Fu../components/synedit/design/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
@@ -404,7 +405,6 @@ BIG_IDE_OPTIONS=-dBigIDE $(DEFAULT_IDE_OPTIONS) \
   -Fu../components/projecttemplates/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/sqldb/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/sdf/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
-  -Fu../components/fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) \
   -Fu../components/lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) \
   -Fu../components/lazdebuggers/lazdebuggerfplldb/lib/$(CPU_TARGET)-$(OS_TARGET) \
   -Fu../components/lazdebuggers/lazdebuggerfp/lib/$(CPU_TARGET)-$(OS_TARGET) \
diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc
index 18f485dd76..91acfe66ec 100644
--- a/ide/Makefile.fpc
+++ b/ide/Makefile.fpc
@@ -101,6 +101,7 @@ DEFAULT_IDE_OPTIONS= $(LAZARUS_LIBPATHS) \
   -Fu../components/lazdebuggergdbmi/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) \
   -Fu../components/virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) \
+  -Fu../components/fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) \
   -Fupackages/idedebugger/lib/$(CPU_TARGET)-$(OS_TARGET)
 
 #
@@ -119,7 +120,6 @@ BIG_IDE_OPTIONS=-dBigIDE $(DEFAULT_IDE_OPTIONS) \
   -Fu../components/projecttemplates/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/sqldb/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/sdf/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
-  -Fu../components/fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) \
   -Fu../components/lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) \
   -Fu../components/lazdebuggers/lazdebuggerfplldb/lib/$(CPU_TARGET)-$(OS_TARGET) \
   -Fu../components/lazdebuggers/lazdebuggerfp/lib/$(CPU_TARGET)-$(OS_TARGET) \