diff --git a/components/pas2js/frmdtstopas.pas b/components/pas2js/frmdtstopas.pas
index 794237c390..5a7ff97af1 100644
--- a/components/pas2js/frmdtstopas.pas
+++ b/components/pas2js/frmdtstopas.pas
@@ -46,7 +46,7 @@ type
     TSOptions: TTabSheet;
     VLEAliases: TValueListEditor;
     procedure cbModuleEnter(Sender: TObject);
-    procedure cbModuleKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure cbModuleKeyUp(Sender: TObject; var {%H-}Key: Word; {%H-}Shift: TShiftState);
     procedure FEDtsEnter(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -116,9 +116,6 @@ end;
 
 procedure TGetModulesThread.DoSetStringList;
 
-Var
-  I : Integer;
-
 begin
   ModuleList.Clear;
   ModuleList.BeginUpdate;
@@ -142,9 +139,7 @@ end;
 procedure TGetModulesThread.Execute;
 
 Var
-  URL,Res : String;
-  I : Integer;
-
+  URL: String;
 begin
   FreeOnTerminate:=true;
   try
diff --git a/components/pas2js/idedtstopas.pas b/components/pas2js/idedtstopas.pas
index 51a073e112..74adecd7c3 100644
--- a/components/pas2js/idedtstopas.pas
+++ b/components/pas2js/idedtstopas.pas
@@ -123,7 +123,7 @@ procedure TCreateUnitFromDTS.ExecuteLocal;
 
 Var
   ToolOpts : TIDEExternalToolOptions;
-  InFN,AliasFN,OutFN,Opts : string;
+  AliasFN,OutFN,Opts : string;
 
 begin
   AliasFN:='';
@@ -134,7 +134,6 @@ begin
     OutFN:=GetTempFileName;
     ToolOpts.Executable:=PJSOptions.DTS2Pas;
     ToolOpts.ResolveMacros:=True;
-    InFN:=LocalFileName;
     Opts:='-i '+MaybeQuote(LocalFileName)+' -o '+MaybeQuote(outFN)+' -u '+TargetUnitName;
     if UseWeb then
       opts:=Opts+' -w';
diff --git a/components/pas2js/regpas2jsatom.pas b/components/pas2js/regpas2jsatom.pas
index 812bccb8e5..55d90526d1 100644
--- a/components/pas2js/regpas2jsatom.pas
+++ b/components/pas2js/regpas2jsatom.pas
@@ -23,12 +23,12 @@ type
     FCommands : TStrings;
     FActivationCommands : TStrings;
     FFiles : TStrings;
-    procedure AddCSSFile(aProject: TLazProject);
+    procedure AddCSSFile({%H-}aProject: TLazProject);
     procedure AddFileToProject(const aFileName: string);
-    procedure AddGlueFile(aProject: TLazProject);
-    procedure AddKeyMapFile(aProject: TLazProject);
-    procedure AddMenuFile(aProject: TLazProject);
-    procedure AddPackageJSONFile(aProject: TLazProject);
+    procedure AddGlueFile({%H-}aProject: TLazProject);
+    procedure AddKeyMapFile({%H-}aProject: TLazProject);
+    procedure AddMenuFile({%H-}aProject: TLazProject);
+    procedure AddPackageJSONFile({%H-}aProject: TLazProject);
     procedure AddProjectFile(AProject: TLazProject);
     procedure CreateProjectDirs;
     procedure CreateProjectSource(Src: TStrings);
diff --git a/components/pas2js/regpas2jsvscode.pas b/components/pas2js/regpas2jsvscode.pas
index 254a8f9e51..ce3f9df6a4 100644
--- a/components/pas2js/regpas2jsvscode.pas
+++ b/components/pas2js/regpas2jsvscode.pas
@@ -5,7 +5,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs,
-  ProjectIntf, BaseIDEIntf, LazIDEIntf, LazFileUtils;
+  ProjectIntf, LazIDEIntf, LazFileUtils;
 
 type
 
@@ -24,11 +24,11 @@ type
     FContributesCommands : TStrings;
     FFiles : TStrings;
     procedure AddFileToProject(const aFileName: string);
-    procedure AddGlueFile(aProject: TLazProject);
-    procedure AddLaunchFile(aProject: TLazProject);
-    procedure AddPackageJSONFile(aProject: TLazProject);
+    procedure AddGlueFile({%H-}aProject: TLazProject);
+    procedure AddLaunchFile({%H-}aProject: TLazProject);
+    procedure AddPackageJSONFile({%H-}aProject: TLazProject);
     procedure AddProjectFile(AProject: TLazProject);
-    procedure AddTasksFile(aProject: TLazProject);
+    procedure AddTasksFile({%H-}aProject: TLazProject);
     procedure CreateProjectDirs;
     procedure CreateProjectSource(Src: TStrings);
     procedure DoDefaultReplaceMents(Src: TStrings);
@@ -56,7 +56,7 @@ implementation
 
 uses
   fpjson,frmpas2jsvscodeextensionsettings,  CompOptsIntf, pjscontroller,
-  NewItemIntf, MenuIntf, pjsprojectoptions, pjsdsgnoptions, strpas2jsdesign;
+  MenuIntf, pjsprojectoptions, pjsdsgnoptions, strpas2jsdesign;
 
 Var
   VSCodeProjDesc:TVSCodeExtensionProjectDescriptor;
@@ -241,7 +241,7 @@ Var
   procedure AddLn(aLine : String);
 
   begin
-    Src.Insert(aIndex+Cnt,'  '+aLine);
+    Src.Insert(aIndex+Cnt,Space(aIndent)+aLine);
     inc(cnt);
   end;
 Var