diff --git a/Makefile b/Makefile
index bf04669583..cc83330402 100644
--- a/Makefile
+++ b/Makefile
@@ -3598,6 +3598,7 @@ basecomponents:
 	$(MAKE) -C components/ideintf
 	$(MAKE) -C components/synedit
 	$(MAKE) -C components/lazdebuggergdbmi
+	$(MAKE) -C components/lazcontrols/design
 bigidecomponents:
 	$(MAKE) -C components bigide
 tools:
diff --git a/Makefile.fpc b/Makefile.fpc
index eb53937832..474c2d604d 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -154,6 +154,7 @@ basecomponents:
 	$(MAKE) -C components/ideintf
 	$(MAKE) -C components/synedit
 	$(MAKE) -C components/lazdebuggergdbmi
+	$(MAKE) -C components/lazcontrols/design
 
 #-----------------------------------------------------------------------------
 # build a lot of extra packages for the LCL_PLATFORM
diff --git a/components/Makefile b/components/Makefile
index 2a48bcfb69..54070a7c0e 100644
--- a/components/Makefile
+++ b/components/Makefile
@@ -1784,9 +1784,9 @@ basecomponents:
 	$(MAKE) -C synedit
 	$(MAKE) -C debuggerintf
 	$(MAKE) -C lazdebuggergdbmi
+	$(MAKE) -C lazcontrols/design
 bigide:
 	$(MAKE) -C synedit/design
-	$(MAKE) -C lazcontrols/design
 	$(MAKE) -C rtticontrols
 	$(MAKE) -C cairocanvas
 	$(MAKE) -C printers
diff --git a/components/Makefile.fpc b/components/Makefile.fpc
index f329915fdc..f55d67c2e0 100644
--- a/components/Makefile.fpc
+++ b/components/Makefile.fpc
@@ -50,12 +50,12 @@ basecomponents:
 	$(MAKE) -C synedit
 	$(MAKE) -C debuggerintf
 	$(MAKE) -C lazdebuggergdbmi
+	$(MAKE) -C lazcontrols/design
 
 #-----------------------------------------------------------------------------
 # build the extra packages needed by the bigide
 bigide:
 	$(MAKE) -C synedit/design
-	$(MAKE) -C lazcontrols/design
 	$(MAKE) -C rtticontrols
 	$(MAKE) -C cairocanvas
 	$(MAKE) -C printers
diff --git a/ide/Makefile b/ide/Makefile
index 3f823837d9..9024b2913b 100644
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -381,11 +381,11 @@ DEFAULT_IDE_OPTIONS= $(LAZARUS_LIBPATHS) \
   -Fu../components/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
+  -Fu../components/lazcontrols/design/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/lazdebuggergdbmi/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 BIG_IDE_OPTIONS=-dBigIDE $(DEFAULT_IDE_OPTIONS) \
   -Fu../components/synedit/design/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
-  -Fu../components/lazcontrols/design/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/rtticontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc
index 5e27bbd132..cec3aa75ec 100644
--- a/ide/Makefile.fpc
+++ b/ide/Makefile.fpc
@@ -95,6 +95,7 @@ DEFAULT_IDE_OPTIONS= $(LAZARUS_LIBPATHS) \
   -Fu../components/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
+  -Fu../components/lazcontrols/design/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/lazdebuggergdbmi/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 
@@ -102,7 +103,6 @@ DEFAULT_IDE_OPTIONS= $(LAZARUS_LIBPATHS) \
 # Options to compile an IDE with a lot of packages
 BIG_IDE_OPTIONS=-dBigIDE $(DEFAULT_IDE_OPTIONS) \
   -Fu../components/synedit/design/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
-  -Fu../components/lazcontrols/design/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/rtticontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
diff --git a/ide/lazarus.pp b/ide/lazarus.pp
index 372ec403ba..c8e1e92b52 100644
--- a/ide/lazarus.pp
+++ b/ide/lazarus.pp
@@ -67,7 +67,7 @@ uses
   {$I staticpackages.inc}
   {$ENDIF}
   {$IFDEF BigIDE}
-    AllSynEditDsgn, LazControlDsgn, DateTimeCtrlsDsgn,
+    AllSynEditDsgn, DateTimeCtrlsDsgn,
     RunTimeTypeInfoControls, Printer4Lazarus, Printers4LazIDE,
     LeakView, MemDSLaz, SDFLaz, InstantFPCLaz, ExternHelp,
     TurboPowerIPro, TurboPowerIProDsgn,
diff --git a/packager/packagesystem.pas b/packager/packagesystem.pas
index 8846498c49..78688d111c 100644
--- a/packager/packagesystem.pas
+++ b/packager/packagesystem.pas
@@ -2370,7 +2370,9 @@ begin
        or (PackageName='debuggerintf')
        or (PackageName='lazdebuggergdbmi')
        or (PackageName='codetools')
-       or (PackageName='lazcontrols');
+       or (PackageName='buildintf')
+       or (PackageName='lazcontrols')
+       or (PackageName='lazcontroldsgn');
 end;
 
 procedure TLazPackageGraph.FreeAutoInstallDependencies;