diff --git a/components/Makefile b/components/Makefile
index 5ea74a4739..3db668850e 100644
--- a/components/Makefile
+++ b/components/Makefile
@@ -1472,6 +1472,8 @@ bigide:
 	$(MAKE) -C externhelp
 	$(MAKE) -C tdbf
 	$(MAKE) -C sqldb
+	$(MAKE) -C PascalScript/Source
+	$(MAKE) -C macroscript
 all: bigide
 clean:
 	$(MAKE) -C lazutils clean
@@ -1501,4 +1503,6 @@ clean:
 	$(MAKE) -C externhelp clean
 	$(MAKE) -C tdbf clean
 	$(MAKE) -C sqldb clean
+	$(MAKE) -C PascalScript/Source
+	$(MAKE) -C macroscript
 cleanall: clean
diff --git a/components/Makefile.fpc b/components/Makefile.fpc
index 2e0c28c3b7..67a2376ab1 100644
--- a/components/Makefile.fpc
+++ b/components/Makefile.fpc
@@ -54,6 +54,8 @@ bigide:
 	$(MAKE) -C externhelp
 	$(MAKE) -C tdbf
 	$(MAKE) -C sqldb
+	$(MAKE) -C PascalScript/Source
+	$(MAKE) -C macroscript
 
 all: bigide
 
@@ -85,6 +87,8 @@ clean:
 	$(MAKE) -C externhelp clean
 	$(MAKE) -C tdbf clean
 	$(MAKE) -C sqldb clean
+	$(MAKE) -C PascalScript/Source clean
+	$(MAKE) -C macroscript clean
 
 cleanall: clean
 
diff --git a/ide/Makefile b/ide/Makefile
index 8f8597bc6f..9e8c51e158 100644
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -375,6 +375,8 @@ BIG_IDE_OPTIONS=-dBigIDE $(DEFAULT_IDE_OPTIONS) \
   -Fu../components/chmhelp/packages/idehelp/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/instantfpc/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/externhelp/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
+  -Fu../components/PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
+  -Fu../components/macroscript/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
 LAZBUILD_OPT=$(LAZARUS_LIBPATHS)
 ifneq ($(findstring $(OS_TARGET),win32 win64),)
 LAZARUS_OPT+= -WG
diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc
index db6c33413f..9074c7d9fd 100644
--- a/ide/Makefile.fpc
+++ b/ide/Makefile.fpc
@@ -122,6 +122,8 @@ BIG_IDE_OPTIONS=-dBigIDE $(DEFAULT_IDE_OPTIONS) \
   -Fu../components/chmhelp/packages/idehelp/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/instantfpc/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
   -Fu../components/externhelp/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
+  -Fu../components/PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
+  -Fu../components/macroscript/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
 
 #
 # Options for compiling lazbuild
diff --git a/ide/lazarus.pp b/ide/lazarus.pp
index 04290d8a00..f732a17253 100644
--- a/ide/lazarus.pp
+++ b/ide/lazarus.pp
@@ -67,6 +67,7 @@ uses
     FPCUnitTestRunner, FPCUnitIDE, ProjTemplates, TAChartLazarusPkg,
     TodoListLaz,
     SQLDBLaz, DBFLaz,
+    pascalscript, EditorMacroScript,
   {$ENDIF}
   MainBase;