diff --git a/commands/service_compile.go b/commands/service_compile.go
index 9da7ab82c71..3dc8d46cb51 100644
--- a/commands/service_compile.go
+++ b/commands/service_compile.go
@@ -264,7 +264,6 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
 		extraCoreBuildCachePaths,
 		int(req.GetJobs()),
 		req.GetBuildProperties(),
-		s.settings.HardwareDirectories(),
 		librariesDirs,
 		s.settings.IDEBuiltinLibrariesDir(),
 		fqbn,
diff --git a/internal/arduino/builder/builder.go b/internal/arduino/builder/builder.go
index 4813e3334c7..1ae31ff31ee 100644
--- a/internal/arduino/builder/builder.go
+++ b/internal/arduino/builder/builder.go
@@ -123,7 +123,6 @@ func NewBuilder(
 	extraCoreBuildCachePaths paths.PathList,
 	jobs int,
 	customBuildProperties []string,
-	hardwareDirs paths.PathList,
 	librariesDirs paths.PathList,
 	builtInLibrariesDirs *paths.Path,
 	fqbn *fqbn.FQBN,
@@ -225,7 +224,7 @@ func NewBuilder(
 		buildPlatform:                 buildPlatform,
 		toolEnv:                       toolEnv,
 		buildOptions: newBuildOptions(
-			hardwareDirs,
+			paths.PathList{targetPlatform.InstallDir, buildPlatform.InstallDir},
 			librariesDirs,
 			builtInLibrariesDirs,
 			buildPath,