diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index 107600e1ec..792ec7b534 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -4007,7 +4007,8 @@ begin
   DirTempl.AddChild(TDefineTemplate.Create('IDE path addition',
     Format(ctsAddsDirToSourcePath,['designer, debugger, synedit, ...']),
     ExternalMacroStart+'SrcPath',
-      d(LazarusSrcDir+'/ide/frames;'
+      d(LazarusSrcDir+'/ide;'
+       +LazarusSrcDir+'/ide/frames;'
        +LazarusSrcDir+'/designer;'
        +LazarusSrcDir+'/designer/jitform;'
        +LazarusSrcDir+'/debugger;'
diff --git a/ide/frames/options_compiler_conditionals.pas b/ide/frames/options_compiler_conditionals.pas
index 7ecb4ea4bf..da14de7c49 100644
--- a/ide/frames/options_compiler_conditionals.pas
+++ b/ide/frames/options_compiler_conditionals.pas
@@ -25,7 +25,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, ComCtrls, Menus,
-  compop;
+  CompOptsModes;
 
 type