diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi
index d6db3e4b38..f1a411b887 100644
--- a/ide/lazarus.lpi
+++ b/ide/lazarus.lpi
@@ -1292,11 +1292,6 @@
         <Filename Value="wordcompletion.pp"/>
         <IsPartOfProject Value="True"/>
       </Unit>
-      <Unit>
-        <Filename Value="editdefinetree.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="EditDefineTree"/>
-      </Unit>
       <Unit>
         <Filename Value="runparamsopts.pas"/>
         <IsPartOfProject Value="True"/>
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 458011439e..566d57346b 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -1276,6 +1276,7 @@ resourcestring
   lisNumberOfFilesToConvert = 'Number of files to convert: %s';
   lisConvertEncoding = 'Convert Encoding';
   lisConvertProjectOrPackage = 'Convert project or package';
+  lisEdtDefCurrentProject = 'Current Project';
   lisNewEncoding = 'New encoding:';
   lisFileFilter = 'File filter';
   lisFilesInASCIIOrUTF8Encoding = 'Files in ASCII or UTF-8 encoding';
@@ -4244,21 +4245,6 @@ resourcestring
   lisDiskDiffReloadCheckedFilesFromDisk = 'Reload checked files from disk';
   lisDiskDiffIgnoreAllDiskChanges = 'Ignore all disk changes';
   
-  // edit define tree
-  lisEdtDefCurrentProject = 'Current Project';
-  lisEdtDefAllPackages = 'All packages';
-  lisEdtDefsAllProjects = 'All projects';
-  lisEdtDefsetFPCModeToDELPHI = 'set FPC mode to DELPHI';
-  lisEdtDefsetFPCModeToTP = 'set FPC mode to TP';
-  lisEdtDefsetFPCModeToGPC = 'set FPC mode to GPC';
-  lisEdtDefsetFPCModeToMacPas = 'set FPC mode to MacPas';
-  lisEdtDefsetFPCModeToFPC = 'set FPC mode to FPC';
-  lisEdtDefsetIOCHECKSOn = 'set IOCHECKS on';
-  lisEdtDefsetRANGECHECKSOn = 'set RANGECHECKS on';
-  lisEdtDefsetOVERFLOWCHECKSOn = 'set OVERFLOWCHECKS on';
-  lisEdtDefuseLineInfoUnit = 'use LineInfo unit';
-  lisEdtDefuseHeapTrcUnit = 'use HeapTrc unit';
-  
   // external tools
   lisExtToolExternalTools = 'External Tools';
   lisTheseSettingsAreStoredWithTheProject = 'These settings are stored with '
diff --git a/ide/editdefinetree.pas b/ide/packages/ideconfig/editdefinetree.pas
similarity index 99%
rename from ide/editdefinetree.pas
rename to ide/packages/ideconfig/editdefinetree.pas
index 4157a55b56..a908c8af37 100644
--- a/ide/editdefinetree.pas
+++ b/ide/packages/ideconfig/editdefinetree.pas
@@ -24,7 +24,7 @@
  ***************************************************************************
 
   Author: Mattias Gaertner
- 
+
   Abstract:
     - procedures to transfer the compiler options to the CodeTools
 }
@@ -43,9 +43,7 @@ uses
   // BuildIntf
   CompOptsIntf,
   // IdeConfig
-  CompilerOptions,
-  // IDE
-  LazarusIDEStrConsts;
+  CompilerOptions, IdeConfStrConsts;
 
 
 // global
@@ -255,7 +253,7 @@ begin
   Result:=false; // no change
   if ParentTemplate=nil then
     RaiseGDBException('UpdateCompilerOptionsTemplates internal error');
-  
+
   { ToDo:
 
     StackChecks
@@ -349,7 +347,7 @@ begin
     Result:=Result or
          RemoveAutoGeneratedDefine(ParentTemplate,UseHeapTrcUnitDefTemplName);
   end;
-  
+
   // custom options -----------------------------------------------------------
   CustomOpts:=CodeToolBoss.DefinePool.CreateFPCCommandLineDefines(
     FPCCmdLineDefTemplName,CompOpts.GetCustomOptions(coptParsed),
@@ -392,7 +390,7 @@ begin
     and (OldNode.Action=DefType)
     and (dtfAutoGenerated in OldNode.Flags)
     then exit;
-    
+
     OldNode.Name:=Name;
     OldNode.Description:=Description;
     OldNode.Variable:=Variable;
diff --git a/ide/packages/ideconfig/fpmake.pp b/ide/packages/ideconfig/fpmake.pp
index 22f786208a..e1f91c1bf9 100644
--- a/ide/packages/ideconfig/fpmake.pp
+++ b/ide/packages/ideconfig/fpmake.pp
@@ -54,6 +54,7 @@ begin
     t.Dependencies.AddUnit('compoptsmodes');
     t.Dependencies.AddUnit('coolbaroptions');
     t.Dependencies.AddUnit('diffpatch');
+    t.Dependencies.AddUnit('editdefinetree');
     t.Dependencies.AddUnit('editortoolbaroptions');
     t.Dependencies.AddUnit('environmentopts');
     t.Dependencies.AddUnit('etfpcmsgfilepool');
@@ -76,6 +77,7 @@ begin
     T:=P.Targets.AddUnit('compoptsmodes.pas');
     T:=P.Targets.AddUnit('coolbaroptions.pas');
     T:=P.Targets.AddUnit('diffpatch.pas');
+    P.Targets.AddImplicitUnit('editdefinetree.pas');
     T:=P.Targets.AddUnit('editortoolbaroptions.pas');
     T:=P.Targets.AddUnit('environmentopts.pp');
     T:=P.Targets.AddUnit('etfpcmsgfilepool.pas');
diff --git a/ide/packages/ideconfig/ideconfig.lpk b/ide/packages/ideconfig/ideconfig.lpk
index 328e651e0b..e64aee5a4a 100644
--- a/ide/packages/ideconfig/ideconfig.lpk
+++ b/ide/packages/ideconfig/ideconfig.lpk
@@ -39,6 +39,10 @@ Files in this package are for the main configuration of the IDE."/>
         <Filename Value="diffpatch.pas"/>
         <UnitName Value="DiffPatch"/>
       </Item>
+      <Item>
+        <Filename Value="editdefinetree.pas"/>
+        <UnitName Value="EditDefineTree"/>
+      </Item>
       <Item>
         <Filename Value="editortoolbaroptions.pas"/>
         <UnitName Value="EditorToolBarOptions"/>
diff --git a/ide/packages/ideconfig/ideconfig.pas b/ide/packages/ideconfig/ideconfig.pas
index b38956809c..66ef6978c9 100644
--- a/ide/packages/ideconfig/ideconfig.pas
+++ b/ide/packages/ideconfig/ideconfig.pas
@@ -8,7 +8,7 @@ unit IdeConfig;
 interface
 
 uses
-  CompilerOptions, CompOptsModes, CoolBarOptions, DiffPatch, 
+  CompilerOptions, CompOptsModes, CoolBarOptions, DiffPatch, EditDefineTree, 
   EditorToolBarOptions, EnvironmentOpts, etFPCMsgFilePool, etMakeMsgParser, 
   IDECmdLine, IdeConfStrConsts, IDEGuiCmdLine, IDEOptionDefs, IDEProcs, 
   IdeXmlConfigProcs, LazConf, ModeMatrixOpts, ParsedCompilerOpts, 
diff --git a/ide/packages/ideconfig/ideconfstrconsts.pas b/ide/packages/ideconfig/ideconfstrconsts.pas
index 4dd8768f47..452a041727 100644
--- a/ide/packages/ideconfig/ideconfstrconsts.pas
+++ b/ide/packages/ideconfig/ideconfstrconsts.pas
@@ -22,9 +22,23 @@ resourcestring
   lisTMFunctionAppendPathDelimiter = 'Function: append path delimiter';
   lisTMFunctionChompPathDelimiter = 'Function: remove trailing path delimiter';
   lisTMunknownMacro = '(unknown macro: %s)';
+  lisEndlessLoopInMacros = 'Endless loop in macros';
+  // Component Name Validity
   lisComponentNameIsNotAValidIdentifier = 'Component name "%s" is not a valid identifier';
   lisComponentNameIsAPascalKeyword = 'Component name "%s" is a Pascal keyword.';
-  lisEndlessLoopInMacros = 'Endless loop in macros';
+  // edit define tree
+  lisEdtDefAllPackages = 'All packages';
+  lisEdtDefsAllProjects = 'All projects';
+  lisEdtDefsetFPCModeToDELPHI = 'set FPC mode to DELPHI';
+  lisEdtDefsetFPCModeToTP = 'set FPC mode to TP';
+  lisEdtDefsetFPCModeToGPC = 'set FPC mode to GPC';
+  lisEdtDefsetFPCModeToMacPas = 'set FPC mode to MacPas';
+  lisEdtDefsetFPCModeToFPC = 'set FPC mode to FPC';
+  lisEdtDefsetIOCHECKSOn = 'set IOCHECKS on';
+  lisEdtDefsetRANGECHECKSOn = 'set RANGECHECKS on';
+  lisEdtDefsetOVERFLOWCHECKSOn = 'set OVERFLOWCHECKS on';
+  lisEdtDefuseLineInfoUnit = 'use LineInfo unit';
+  lisEdtDefuseHeapTrcUnit = 'use HeapTrc unit';
 
 
 implementation