diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index 3d128193f8..e5e9254239 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -3201,6 +3201,7 @@ begin
   // rtl
   RTLDir:=TDefineTemplate.Create('RTL',ctsRuntimeLibrary,'','rtl',da_Directory);
   MainDir.AddChild(RTLDir);
+  // rtl include paths
   s:=IncPathMacro
     +';'+Dir+'rtl'+DS+'objpas'+DS
     +';'+Dir+'rtl'+DS+'objpas'+DS+'sysutils'
@@ -3216,6 +3217,7 @@ begin
     Format(ctsIncludeDirectoriesPlusDirs,
     ['objpas, inc,'+TargetProcessor+','+SrcOS]),
     ExternalMacroStart+'IncPath',s,da_DefineRecurse));
+  // rtl/$(TargetOS)
   if TargetOS<>'' then begin
     RTLOSDir:=TDefineTemplate.Create('TargetOS','Target OS','',
                                      TargetOS,da_Directory);
@@ -3224,8 +3226,14 @@ begin
     RTLOSDir.AddChild(TDefineTemplate.Create('Include Path',
       Format(ctsIncludeDirectoriesPlusDirs,[TargetProcessor]),
       ExternalMacroStart+'IncPath',s,da_DefineRecurse));
+    s:=SrcPathMacro
+      +';'+Dir+'rtl'+DS+'objpas'+DS;
+    RTLOSDir.AddChild(TDefineTemplate.Create('Src Path',
+      Format(ctsAddsDirToSourcePath,[TargetProcessor]),
+      ExternalMacroStart+'SrcPath',s,da_DefineRecurse));
     RTLDir.AddChild(RTLOSDir);
   end;
+  // rtl/win32
   RTLWin32Dir:=TDefineTemplate.Create('Win32','Win32','','win32',da_Directory);
   RTLDir.AddChild(RTLWin32Dir);
   RTLWin32Dir.AddChild(TDefineTemplate.Create('Include Path',
@@ -3251,6 +3259,7 @@ begin
     +';'+Dir+'fcl'+DS+'classes'+DS
     +';'+Dir+'rtl'+DS+TargetOS+DS
     ,da_DefineRecurse));
+  // fcl/db
   FCLDBDir:=TDefineTemplate.Create('DB','DB','','db',da_Directory);
   FCLDir.AddChild(FCLDBDir);
   FCLDBInterbaseDir:=TDefineTemplate.Create('interbase','interbase','',
diff --git a/ide/main.pp b/ide/main.pp
index 16ef41597c..f10cba8fb1 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -8756,6 +8756,8 @@ var
   ActiveSrcEdit:TSourceEditor;
   ErrorCaret: TPoint;
   OpenFlags: TOpenFlags;
+  ErrorFilename: string;
+  ErrorTopLine: integer;
 begin
   if CodeToolBoss.ErrorMessage='' then begin
     UpdateSourceNames;
@@ -8782,13 +8784,15 @@ writeln('TMainIDE.DoJumpToCodeToolBossError A ',CodeToolBoss.ErrorCode<>nil);
   if CodeToolBoss.ErrorCode<>nil then begin
     SourceNotebook.AddJumpPointClicked(Self);
     ErrorCaret:=Point(CodeToolBoss.ErrorColumn,CodeToolBoss.ErrorLine);
-writeln('TMainIDE.DoJumpToCodeToolBossError B ',CodeToolBoss.ErrorCode.Filename,' ',CodeToolBoss.ErrorCode.IsVirtual);
+    ErrorFilename:=CodeToolBoss.ErrorCode.Filename;
+    ErrorTopLine:=CodeToolBoss.ErrorTopLine;
+writeln('TMainIDE.DoJumpToCodeToolBossError B ',ErrorFilename,' ',CodeToolBoss.ErrorCode.IsVirtual);
     OpenFlags:=[ofOnlyIfExists,ofUseCache];
     if CodeToolBoss.ErrorCode.IsVirtual then
       Include(OpenFlags,ofVirtualFile);
-    if DoOpenEditorFile(CodeToolBoss.ErrorCode.Filename,-1,OpenFlags)=mrOk
+    if DoOpenEditorFile(ErrorFilename,-1,OpenFlags)=mrOk
     then begin
-writeln('TMainIDE.DoJumpToCodeToolBossError C ',CodeToolBoss.ErrorCode.Filename,' ',CodeToolBoss.ErrorCode.IsVirtual);
+writeln('TMainIDE.DoJumpToCodeToolBossError C ',ErrorFilename);
       ActiveSrcEdit:=SourceNoteBook.GetActiveSE;
       MessagesView.ShowOnTop;
       SourceNoteBook.ShowOnTop;
@@ -8796,8 +8800,8 @@ writeln('TMainIDE.DoJumpToCodeToolBossError C ',CodeToolBoss.ErrorCode.Filename,
         CaretXY:=ErrorCaret;
         BlockBegin:=CaretXY;
         BlockEnd:=CaretXY;
-        if CodeToolBoss.ErrorTopLine>0 then
-          TopLine:=CodeToolBoss.ErrorTopLine;
+        if ErrorTopLine>0 then
+          TopLine:=ErrorTopLine;
       end;
       SourceNotebook.FocusEditor;
       SourceNotebook.ClearErrorLines;
@@ -10267,6 +10271,9 @@ end.
 
 { =============================================================================
   $Log$
+  Revision 1.698  2004/01/11 11:32:46  mattias
+  updates defines for fpc 1.9.2
+
   Revision 1.697  2004/01/09 15:20:38  mattias
   fixed close editor shortcut