Tweak uses sections.

ide/codetoolsdefines.pas

@@ -57,10 +57,10 @@ uses
   // IdeIntf
   IdeIntfStrConsts, IDEWindowIntf, IDEImagesIntf, IDEDialogs,
   // IdeConfig
-  LazConf, TransferMacros, IDEProcs,
+  LazConf, TransferMacros, IDEProcs, CompilerOptions,
   // IDE
   LazarusIDEStrConsts, CodeToolsOptions, CodeToolsDefPreview,
-  EditorOptions, InputFileDialog, EditDefineTree, CompilerOptions;
+  EditorOptions, InputFileDialog, EditDefineTree;
 
 type
 

ide/compiler.pp

@@ -48,9 +48,9 @@ uses
   // IdeIntf
   IDEMsgIntf, LazIDEIntf, CompOptsIntf,
   // IdeConfig
-  TransferMacros, IDECmdLine,
+  TransferMacros, IDECmdLine, CompilerOptions,
   // IDE
-  LazarusIDEStrConsts, CompilerOptions, Project;
+  LazarusIDEStrConsts, Project;
 
 type
   TOnCmdLineCreate = procedure(var CmdLine: string; var Abort:boolean) of object;

ide/debugmanager.pas

@@ -72,9 +72,9 @@ uses
   IdeDebuggerBackendValueConv, Debugger, BaseDebugManager,
   IdeDebuggerValueFormatter, IdeDebuggerDisplayFormats,
   // IdeConfig
-  LazConf,
+  LazConf, CompilerOptions,
   // IDE
-  CompilerOptions, SourceEditor, ProjectDefs, Project, ProjectDebugLink,
+  SourceEditor, ProjectDefs, Project, ProjectDebugLink,
   LazarusIDEStrConsts, MainBar, MainIntf, MainBase, BaseBuildManager, SourceMarks,
   DebugEventsForm, EnvGuiOptions, RunParamsOpts;
 

ide/editdefinetree.pas

@@ -42,8 +42,10 @@ uses
   FileProcs, CodeToolManager, DefineTemplates, LinkScanner,
   // BuildIntf
   CompOptsIntf,
+  // IdeConfig
+  CompilerOptions,
   // IDE
-  CompilerOptions, LazarusIDEStrConsts;
+  LazarusIDEStrConsts;
 
 
 // global

ide/etmessageframe.pas

@@ -45,10 +45,10 @@ uses
   // IDEIntf
   IDEImagesIntf, MenuIntf, IDECommands, IDEDialogs, LazIDEIntf, IdeIntfStrConsts,
   // IdeConfig
-  EnvironmentOpts, IDEOptionDefs,
+  EnvironmentOpts, IDEOptionDefs, CompilerOptions,
   // IDE
   LazarusIDEStrConsts, HelpFPCMessages, etSrcEditMarks,
-  MsgWnd_Options, etQuickFixes, ExtTools, CompilerOptions, EnvGuiOptions;
+  MsgWnd_Options, etQuickFixes, ExtTools, EnvGuiOptions;
 
 const
   CustomViewCaption = '------------------------------';

ide/frames/compiler_buildmacro_options.pas

@@ -32,9 +32,12 @@ uses
   Controls, Forms, StdCtrls, Buttons, ExtCtrls, Dialogs, ComCtrls,
   // CodeTools
   KeywordFuncLists, CodeToolsCfgScript,
+  // BuildIntf
+  IDEOptionsIntf, CompOptsIntf, MacroIntf,
   // IdeIntf
-  IDEOptionsIntf, IDEOptEditorIntf, CompOptsIntf, MacroIntf, IDEImagesIntf,
+  IDEOptEditorIntf, IDEImagesIntf, IDEDialogs,
-  IDEDialogs, ParsedCompilerOpts, CompilerOptions,
+  // IdeConfig
+  ParsedCompilerOpts, CompilerOptions,
   // IDE
   LazarusIDEStrConsts, PackageDefs;
 

ide/frames/compiler_codegen_options.pas

@@ -10,8 +10,10 @@ uses
   StdCtrls,
   // IdeIntf
   IDEOptionsIntf, IDEOptEditorIntf,
+  // IdeConfig
+  CompilerOptions,
   // IDE
-  CompilerOptions, LazarusIDEStrConsts;
+  LazarusIDEStrConsts;
 
 type
 

ide/frames/compiler_compilation_options.pas

@@ -17,10 +17,9 @@ uses
   IDEOptionsIntf, IDEOptEditorIntf, CompOptsIntf, IDEExternToolIntf,
   IDEDialogs, IDEUtils, InputHistory,
   // IdeConfig
-  LazConf, EnvironmentOpts, RecentListProcs,
+  LazConf, EnvironmentOpts, RecentListProcs, CompilerOptions,
   // IDE
-  Project, CompilerOptions, PackageDefs, LazarusIDEStrConsts,
+  LazarusIDEStrConsts, Project, PackageDefs, DialogProcs, InitialSetupProc;
-  DialogProcs, InitialSetupProc;
 
 type
 

ide/frames/compiler_config_target.pas

@@ -35,11 +35,14 @@ uses
   LazFileUtils, LazStringUtils, LazUTF8, LazLoggerBase,
   // CodeTools
   DefineTemplates, CodeToolManager,
+  // BuildIntf
+  IDEOptionsIntf, MacroIntf,
   // IdeIntf
-  IDEOptionsIntf, IDEOptEditorIntf, MacroIntf, IDEDialogs, IDEUtils,
+  IDEOptEditorIntf, IDEDialogs, IDEUtils,
+  // IdeConfig
+  RecentListProcs, TransferMacros, CompilerOptions,
   // IDE
-  CompilerOptions, LazarusIDEStrConsts, TransferMacros, PackageDefs, Project,
+  LazarusIDEStrConsts, PackageDefs, Project, InputHistory, compiler_parsing_options;
-  RecentListProcs, InputHistory, compiler_parsing_options;
 
 type
 

ide/frames/compiler_debugging_options.pas

@@ -9,10 +9,14 @@ uses
   StdCtrls,
   // LazUtils
   LazLoggerBase,
+  // BuildIntf
+  IDEOptionsIntf, CompOptsIntf,
   // IdeIntf
-  IDEOptionsIntf, IDEOptEditorIntf, CompOptsIntf,
+  IDEOptEditorIntf,
+  // IdeConfig
+  CompilerOptions,
   // IDE
-  CompilerOptions, LazarusIDEStrConsts;
+  LazarusIDEStrConsts;
 
 type
 

ide/frames/compiler_messages_options.pas

@@ -19,9 +19,9 @@ uses
   // IdeIntf
   IDEOptEditorIntf, IDEDialogs,
   // IdeConfig
-  etFPCMsgFilePool,
+  etFPCMsgFilePool, CompilerOptions,
   // IDE
-  CompilerOptions, LazarusIDEStrConsts;
+  LazarusIDEStrConsts;
 
 type
 

ide/frames/compiler_other_options.pas

@@ -35,8 +35,10 @@ uses
   LazUTF8, LazLoggerBase,
   // Codetools
   CodeToolsCfgScript, KeywordFuncLists,
+  // BuildIntf
+  IDEOptionsIntf, CompOptsIntf,
   // IdeIntf
-  IDEOptionsIntf, IDEOptEditorIntf, CompOptsIntf, IDECommands,
+  IDEOptEditorIntf, IDECommands,
   // SynEdit
   SynEdit, SynEditKeyCmds, SynCompletion,
   // IdeConfig

ide/frames/compiler_parsing_options.pas

@@ -10,10 +10,14 @@ uses
   ExtCtrls, StdCtrls,
   // CodeTools
   LinkScanner,
+  // BuildIntf
+  IDEOptionsIntf,
   // IdeIntf
-  IDEOptionsIntf, IDEOptEditorIntf,
+  IDEOptEditorIntf,
+  // IdeConfig
+  CompilerOptions,
   // IDE
-  CompilerOptions, PackageDefs, LazarusIDEStrConsts;
+  PackageDefs, LazarusIDEStrConsts;
 
 type
 

ide/frames/compiler_verbosity_options.pas

@@ -8,10 +8,14 @@ uses
   SysUtils,
   // LCL
   ExtCtrls, StdCtrls,
+  // BuildIntf
+  IDEOptionsIntf,
   // IdeIntf
-  IDEOptionsIntf, IDEOptEditorIntf,
+  IDEOptEditorIntf,
+  // IdeConfig
+  CompilerOptions,
   // IDE
-  CompilerOptions, LazarusIDEStrConsts;
+  LazarusIDEStrConsts;
 
 type
 

ide/frames/project_application_options.pas

@@ -14,9 +14,10 @@ uses
   DividerBevel,
   // IdeIntf
   IDEOptionsIntf, IDEOptEditorIntf, LazIDEIntf, IDEImagesIntf, IDEDialogs,
+  // IdeConfig
+  CompilerOptions,
   // IDE
-  LazarusIDEStrConsts, Project, ProjectIcon, CompilerOptions,
+  LazarusIDEStrConsts, Project, ProjectIcon, ApplicationBundle, W32Manifest;
-  ApplicationBundle, W32Manifest;
 
 type
 

ide/imexportcompileropts.pas

@@ -40,9 +40,9 @@ uses
   // IdeIntf
   IDEOptEditorIntf, IDEImagesIntf, InputHistory,
   // IdeConfig
-  RecentListProcs,
+  RecentListProcs, CompilerOptions,
   // IDE
-  LazarusIDEStrConsts, Project, CompilerOptions;
+  LazarusIDEStrConsts, Project;
 
 type
   { TImExportCompOptsDlg }

ide/mainbase.pas

@@ -73,9 +73,9 @@ uses
   // IDEDebugger
   IdeDebuggerStringConstants,
   // IdeConfig
-  LazConf, EnvironmentOpts,
+  LazConf, EnvironmentOpts, CompilerOptions,
   // IDE
-  LazarusIDEStrConsts, EditorOptions, CompilerOptions, EnvGuiOptions,
+  LazarusIDEStrConsts, EditorOptions, EnvGuiOptions,
   Project, SourceEditor, SourceSynEditor, FindInFilesDlg,
   Splash, MainBar, MainIntf, Designer, Debugger, RunParamsOpts, FindInFilesWnd;
 

ide/runparamsopts.pas

@@ -51,15 +51,16 @@ uses
   // LCL
   Controls, Forms, Buttons, StdCtrls, ComCtrls, Dialogs, ButtonPanel, ExtCtrls,
   Spin, EditBtn,
-  // IdeIntf
-  IdeIntfStrConsts, BaseIDEIntf, IDEHelpIntf, ProjectIntf, IDEDialogs, InputHistory,
-  IDEImagesIntf, IDEWindowIntf, MacroIntf,
   // LazUtils
   LazFileUtils, LazFileCache, LazUTF8, Laz2_XMLCfg, DbgIntfDebuggerBase,
+  // BuildIntf
+  BaseIDEIntf, ProjectIntf, MacroIntf,
+  // IdeIntf
+  IdeIntfStrConsts, IDEHelpIntf, IDEDialogs, IDEImagesIntf, IDEWindowIntf,
   // IdeConfig
   EnvironmentOpts, RecentListProcs,
   // IDE
-  MiscOptions, SysVarUserOverrideDlg, LazarusIDEStrConsts
+  InputHistory, MiscOptions, SysVarUserOverrideDlg, LazarusIDEStrConsts
   {$IFnDef LCLNoGui}, BaseDebugManager {$ENDIF} ;
 
 { The xml format version:

packager/basepkgmanager.pas

@@ -48,9 +48,9 @@ uses
   Forms, ComCtrls,
   PackageIntf, BaseIDEIntf,
   MenuIntf, IdeIntfStrConsts,
-  EnvironmentOpts,
+  EnvironmentOpts, CompilerOptions,
   LazarusIDEStrConsts,
-  CompilerOptions, PackageDefs, PackageSystem, Project;
+  PackageDefs, PackageSystem, Project;
 
 type
   { TBasePkgManager }

packager/interpkgconflictfiles.pas

@@ -61,8 +61,10 @@ uses
   BasicCodeTools, DefineTemplates, CodeToolManager, FileProcs,
   // LazUtils
   FPCAdds, LazFileUtils, LazFileCache, LazTracer,
+  // BuildIntf
+  ProjectIntf, CompOptsIntf, IDEExternToolIntf,
   // IDEIntf
-  ProjectIntf, CompOptsIntf, IDEWindowIntf, LazIDEIntf, IDEMsgIntf, IDEExternToolIntf,
+  IDEWindowIntf, LazIDEIntf, IDEMsgIntf,
   // IdeConfig
   EnvironmentOpts, TransferMacros, IDEProcs, SearchPathProcs,
   ParsedCompilerOpts, CompilerOptions,

packager/projpackcommon.pas

@@ -11,7 +11,7 @@ uses
   LazTracer, FileReferenceList,
   // Codetools
   DefineTemplates, CodeToolManager,
-  // IDE
+  // IdeConfig
   CompilerOptions;
 
 type