diff --git a/IDEAS/Airflow/AHU/Examples/Adsolair58.mo b/IDEAS/Airflow/AHU/Examples/Adsolair58.mo
index 2cfc117baf..6c17800152 100644
--- a/IDEAS/Airflow/AHU/Examples/Adsolair58.mo
+++ b/IDEAS/Airflow/AHU/Examples/Adsolair58.mo
@@ -7,7 +7,7 @@ model Adsolair58 "Adsolair58 example model"
   replaceable package Medium = IDEAS.Media.Air;
   replaceable package MediumWater = IDEAS.Media.Water "Heating medium";
   parameter Modelica.Units.SI.Pressure dp_nominal=100 "Constant output value";
-  parameter SI.MassFlowRate m_flow_nominal=0.3 "Nominal air mass flow rate";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.3 "Nominal air mass flow rate";
   Adsolair58HeaCoi             adsolair58(
     redeclare package MediumAir = Medium,
     redeclare BaseClasses.Adsolair14200 per,
@@ -361,6 +361,11 @@ A PI controller is used to track the set point temperature.
 </html>", revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 October 30, 2024, by Lucas Verleyen:<br/>
 Updates according to <a href=\"https://github.com/ibpsa/modelica-ibpsa/tree/8ed71caee72b911a1d9b5a76e6cb7ed809875e1e\">IBPSA</a>.<br/>
 See <a href=\"https://github.com/open-ideas/IDEAS/pull/1383\">#1383</a> 
diff --git a/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo b/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo
index a3529e2e38..4ebe39e621 100644
--- a/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo
+++ b/IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo
@@ -35,9 +35,9 @@ model CrackOrOperableDoor
   parameter Modelica.Units.SI.Length h_a1 = 0 "Height at port a1(hasCavity=false)";
   parameter Modelica.Units.SI.Length h_a2  "Height at port a2(hasCavity=false)";
 
-  parameter SI.Length hA=(h_a1 + h_b2)/2
+  parameter Modelica.Units.SI.Length hA=(h_a1 + h_b2)/2
     "Height of reference pressure at port a1 for opening (hasCavity=true) model";
-  parameter SI.Length hB=(h_a2 + h_b1)/2
+  parameter Modelica.Units.SI.Length hB=(h_a2 + h_b1)/2
     "Height of reference pressure at port b1 for opening (hasCavity=true) model";
 
   final parameter Real CDCloRat(min=0, max=1)=1
@@ -165,7 +165,7 @@ model CrackOrOperableDoor
    "Door constantly opened" annotation (
     Placement(visible = true, transformation(origin = {-54, -14}, extent = {{-6, -6}, {6, 6}}, rotation = 0)));
 
-  parameter SI.Angle inc=Modelica.Constants.pi/2
+  parameter Modelica.Units.SI.Angle inc=Modelica.Constants.pi/2
     "inclination angle (vertical=pi/2)";
 initial equation
   assert( not (interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts and useDoor and use_y),
@@ -223,6 +223,11 @@ There is no support for open doors when using only a single fluid port.
 revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 January 30, 2025, by Klaas De Jonge:<br/>
 Changed wrong parameter declaration <code>doo.vZer</code> to have compatible units.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1402\">#1402</a>.
diff --git a/IDEAS/BoundaryConditions/Examples/StrobeInfoManager_offset.mo b/IDEAS/BoundaryConditions/Examples/StrobeInfoManager_offset.mo
index 78bfb1b40e..983d7d3ce0 100644
--- a/IDEAS/BoundaryConditions/Examples/StrobeInfoManager_offset.mo
+++ b/IDEAS/BoundaryConditions/Examples/StrobeInfoManager_offset.mo
@@ -1,7 +1,6 @@
 within IDEAS.BoundaryConditions.Examples;
 model StrobeInfoManager_offset
   "Unit test for SimInfoManager with time offset on read data"
-  import IDEAS;
   extends Modelica.Icons.Example;
   inner IDEAS.BoundaryConditions.Occupants.Extern.StrobeInfoManager strobe(
     nOcc=10,
@@ -26,6 +25,11 @@ model StrobeInfoManager_offset
     Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+<li>
 December 20, 2017 by Bram van der Heijde:<br/>
 First implementation.
 </li>
diff --git a/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MonoLayer.mo b/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MonoLayer.mo
index a7f710ebab..24a4be9707 100644
--- a/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MonoLayer.mo
+++ b/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MonoLayer.mo
@@ -73,7 +73,7 @@ protected
     "True when a convection + radiation equation should be used to model the layer instead of conduction";
 
 public
-  parameter SI.TemperatureDifference dT_nom_air=1
+  parameter Modelica.Units.SI.TemperatureDifference dT_nom_air=1
     "Nominal temperature difference for air layers, used for linearising Rayleigh number";
 equation
   connect(E_internal, monLayDyn.E);
@@ -150,6 +150,11 @@ equation
 </html>", revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 September 9, 2019, by Kristoff Six:<br/>
 Updated with <code>checkCoating</code> for issue
 <a href=\"https://github.com/open-ideas/IDEAS/issues/1038\">#1038</a>.
diff --git a/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MultiLayer.mo b/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MultiLayer.mo
index 5035dc6d53..a0232b465f 100644
--- a/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MultiLayer.mo
+++ b/IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MultiLayer.mo
@@ -27,7 +27,7 @@ model MultiLayer "multiple material layers in series"
   parameter Boolean disableInitPortB= false
     "Remove initial equation at port b"
     annotation(Evaluate=true, Dialog(group="Dynamics"));
-  parameter SI.TemperatureDifference dT_nom_air=1
+  parameter Modelica.Units.SI.TemperatureDifference dT_nom_air=1
     "Nominal temperature difference for air layers, used for linearising Rayleigh number"
     annotation(Dialog(enable=linIntCon));
   parameter Boolean checkCoatings = false
@@ -176,6 +176,11 @@ equation
 </html>", revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 August 9, 2022, by Filip Jorissen:<br/>
 Updated documentation and added parameters for issue
 <a href=\"https://github.com/open-ideas/IDEAS/issues/1270\">#1270</a>.
diff --git a/IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/Examples/ZoneLwGainDistribution.mo b/IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/Examples/ZoneLwGainDistribution.mo
index daacc2e399..f64cfd1220 100644
--- a/IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/Examples/ZoneLwGainDistribution.mo
+++ b/IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/Examples/ZoneLwGainDistribution.mo
@@ -1,6 +1,5 @@
 within IDEAS.Buildings.Components.BaseClasses.RadiativeHeatTransfer.Examples;
 model ZoneLwGainDistribution
-  import IDEAS;
   extends Modelica.Icons.Example;
   Modelica.Blocks.Sources.Ramp ramDir(
     duration=1,
@@ -90,6 +89,11 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+<li>
 January 19, 2017 by Filip Jorissen:<br/>
 First implementation
 </li>
diff --git a/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo b/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo
index b5c9e66543..1ee38bc9ba 100644
--- a/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo
+++ b/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo
@@ -202,7 +202,7 @@ partial model RectangularZoneTemplateInterface
   parameter Interfaces.WindowDynamicsType windowDynamicsType=IDEAS.Buildings.Components.Interfaces.WindowDynamicsType.Two
     "Type of dynamics for glazings and frames: using zero, one combined or two states"
     annotation(Dialog(group="Windows", tab="Advanced"));
-  parameter SI.TemperatureDifference dT_nominal_win=-3
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal_win=-3
     "Nominal temperature difference used for linearisation, negative temperatures indicate the solid is colder"
     annotation(Dialog(group="Convective heat transfer", tab="Advanced"));
   parameter Boolean linExtCon=sim.linExtCon
@@ -215,35 +215,35 @@ partial model RectangularZoneTemplateInterface
     "= true, if exterior radiative heat transfer for windows should be linearised"
     annotation(Dialog(tab="Advanced", group="Radiative heat exchange"));
 
-  parameter SI.TemperatureDifference dT_nominal_bou=-1
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal_bou=-1
     "Nominal temperature difference for boundary walls, used for linearisation, negative temperatures indicate the solid is colder"
     annotation(Dialog(tab="Advanced", group="Convective heat transfer"));
-  parameter SI.TemperatureDifference dT_nominal_out=-3
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal_out=-3
     "Nominal temperature difference for outer walls, used for linearisation, negative temperatures indicate the solid is colder"
     annotation(Dialog(tab="Advanced", group="Convective heat transfer"));
-  parameter SI.TemperatureDifference dT_nominal_sla=-3
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal_sla=-3
     "Nominal temperature difference of slab on ground, used for linearisation, negative temperatures indicate the solid is colder"
     annotation(Dialog(tab="Advanced", group="Convective heat transfer"));
-  parameter SI.Temperature TeAvg=273.15 + 10.8
+  parameter Modelica.Units.SI.Temperature TeAvg=273.15 + 10.8
     "Annual average outdoor temperature"
     annotation(Dialog(tab="Floor", group="Slab on ground", enable=(bouTypFlo == IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround)));
-  parameter SI.Temperature TiAvg=273.15 + 22
+  parameter Modelica.Units.SI.Temperature TiAvg=273.15 + 22
     "Annual average indoor temperature"
     annotation(Dialog(tab="Floor", group="Slab on ground", enable=(bouTypFlo == IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround)));
-  parameter SI.TemperatureDifference dTeAvg=4
+  parameter Modelica.Units.SI.TemperatureDifference dTeAvg=4
     "Amplitude of variation of monthly average outdoor temperature"
     annotation(Dialog(tab="Floor", group="Slab on ground", enable=(bouTypFlo == IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround)));
-  parameter SI.TemperatureDifference dTiAvg=2
+  parameter Modelica.Units.SI.TemperatureDifference dTiAvg=2
     "Amplitude of variation of monthly average indoor temperature"
     annotation(Dialog(tab="Floor", group="Slab on ground", enable=(bouTypFlo == IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround)));
   parameter Modelica.Units.SI.Temperature T_start_gro[3]=fill(TeAvg, 3)
     "Initial temperatures of the ground layers (with first value = deepest layer
     and last value = shallowest layer"
     annotation(Evaluate=true,Dialog(tab="Floor", group="Slab on ground", enable=(bouTypFlo == IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround)));
-  parameter SI.TemperatureDifference dT_nominal_intA=1
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal_intA=1
     "Nominal temperature difference between zone air and interior walls, used for linearisation"
     annotation(Dialog(tab="Advanced", group="Convective heat transfer"));
-  parameter SI.TemperatureDifference dT_nominal_intB=1
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal_intB=1
     "Nominal temperature difference between interior walls exterior connection, used for linearisation"
     annotation(Dialog(tab="Advanced", group="Convective heat transfer"));
   replaceable parameter IDEAS.Buildings.Data.Constructions.CavityWall conTypA
@@ -496,40 +496,40 @@ partial model RectangularZoneTemplateInterface
   parameter Boolean hasBuildingShadeA=false
     "=true, to enable computation of shade cast by opposite building or object on OuterWall"
     annotation(Dialog(tab="Face A", group="Building shade", enable=(bouTypA==IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall)));
-  parameter SI.Length LShaA=0
+  parameter Modelica.Units.SI.Length LShaA=0
     "Distance between shading object and wall, perpendicular to wall"
     annotation(Dialog(enable=hasBuildingShadeA,tab="Face A", group="Building shade"));
-  parameter SI.Length dhShaA=0
+  parameter Modelica.Units.SI.Length dhShaA=0
     "Height difference between top of shading object and top of wall A"
     annotation(Dialog(enable=hasBuildingShadeA,tab="Face A", group="Building shade"));
   parameter Boolean hasBuildingShadeB=false
     "=true, to enable computation of shade cast by opposite building or object on OuterWall"
     annotation(Dialog(tab="Face B", group="Building shade", enable=(bouTypB==IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall)));
-  parameter SI.Length LShaB=0
+  parameter Modelica.Units.SI.Length LShaB=0
     "Distance between shading object and wall, perpendicular to wall"
     annotation(Dialog(enable=hasBuildingShadeB,tab="Face B", group="Building shade"));
-  parameter SI.Length dhShaB=0
+  parameter Modelica.Units.SI.Length dhShaB=0
     "Height difference between top of shading object and top of wall B"
     annotation(Dialog(enable=hasBuildingShadeB,tab="Face B", group="Building shade"));
   parameter Boolean hasBuildingShadeC=false
     "=true, to enable computation of shade cast by opposite building or object on OuterWall"
     annotation(Dialog(tab="Face C", group="Building shade", enable=(bouTypC==IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall)));
-  parameter SI.Length LShaC=0
+  parameter Modelica.Units.SI.Length LShaC=0
     "Distance between shading object and wall, perpendicular to wall"
     annotation(Dialog(enable=hasBuildingShadeC,tab="Face C", group="Building shade"));
-  parameter SI.Length dhShaC=0
+  parameter Modelica.Units.SI.Length dhShaC=0
     "Height difference between top of shading object and top of wall C"
     annotation(Dialog(enable=hasBuildingShadeC,tab="Face C", group="Building shade"));
   parameter Boolean hasBuildingShadeD=false
     "=true, to enable computation of shade cast by opposite building or object on OuterWall"
     annotation(Dialog(tab="Face D", group="Building shade", enable=(bouTypD==IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall)));
-  parameter SI.Length LShaD=0
+  parameter Modelica.Units.SI.Length LShaD=0
     "Distance between shading object and wall, perpendicular to wall"
     annotation(Dialog(enable=hasBuildingShadeD,tab="Face D", group="Building shade"));
-  parameter SI.Length dhShaD=0
+  parameter Modelica.Units.SI.Length dhShaD=0
     "Height difference between top of shading object and top of wall D"
     annotation(Dialog(enable=hasBuildingShadeD,tab="Face D", group="Building shade"));
-  parameter SI.Length PWall = (if hasOutA then lA else 0) + (if hasOutB then lB else 0) + (if hasOutC then lC else 0) + (if hasOutD then lD else 0)
+  parameter Modelica.Units.SI.Length PWall = (if hasOutA then lA else 0) + (if hasOutB then lB else 0) + (if hasOutC then lC else 0) + (if hasOutD then lD else 0)
     "Total floor slab perimeter length" annotation(Dialog(tab="Advanced", group="SlabOnGround", enable=(bouTypFlo == IDEAS.Buildings.Components.Interfaces.BoundaryType.SlabOnGround)));
 
 
@@ -1546,6 +1546,11 @@ components cannot be propagated.
 </html>", revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 January 30, 2025, by Jelger Jansen:<br/>
 Updated default window glazing type to avoid obsolete type warning.
 See <a href=https://github.com/open-ideas/IDEAS/issues/1402>#1402</a>
diff --git a/IDEAS/Buildings/Components/Validations/WindowEN673.mo b/IDEAS/Buildings/Components/Validations/WindowEN673.mo
index 87d6115b43..2fb3fc3929 100644
--- a/IDEAS/Buildings/Components/Validations/WindowEN673.mo
+++ b/IDEAS/Buildings/Components/Validations/WindowEN673.mo
@@ -6,9 +6,9 @@ model WindowEN673 "Verifies U value of a glazing record"
     annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
 
   replaceable package Medium = IDEAS.Media.Air "Air medium";
-  parameter SI.Temperature TZone=273.15 + 20
+  parameter Modelica.Units.SI.Temperature TZone=273.15 + 20
     "Fixed interior temperature";
-  parameter SI.Temperature TOut=273.15
+  parameter Modelica.Units.SI.Temperature TOut=273.15
     "Fixed exterior temperature";
 
   Modelica.Units.SI.CoefficientOfHeatTransfer U_EN673=windowEN673.layMul.port_a.Q_flow
@@ -107,7 +107,7 @@ protected
         TBlaSkySou=IDEAS.BoundaryConditions.Types.DataSource.Parameter,
         TBlaSky=TDryBulFixed));
 
-    parameter SI.Temperature TDryBulFixed=293.15
+    parameter Modelica.Units.SI.Temperature TDryBulFixed=293.15
       "Dry bulb temperature (used if TDryBul=Parameter)";
   end SimInfoManagerFixedBC;
 initial equation
@@ -148,6 +148,11 @@ equation
       __Dymola_Algorithm="Lsodar"),        Documentation(revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 November 6, 2023, by Filip Jorissen:<br/>
 Set frame fraction to zero in normal window.
 </li>
diff --git a/IDEAS/Buildings/Components/Window.mo b/IDEAS/Buildings/Components/Window.mo
index ae6744b172..8f618ef314 100644
--- a/IDEAS/Buildings/Components/Window.mo
+++ b/IDEAS/Buildings/Components/Window.mo
@@ -124,16 +124,16 @@ model Window "Multipane window"
   parameter Boolean use_trickle_vent = false
     "= true, to enable trickle vent"
     annotation(Dialog(group="Trickle vent", tab="Airflow"));
-  parameter SI.MassFlowRate m_flow_nominal = 0
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0
     "Nominal mass flow rate of trickle vent"
     annotation(Dialog(group="Trickle vent", tab="Airflow", enable=use_trickle_vent));
-  parameter SI.PressureDifference dp_nominal(displayUnit="Pa") = 5
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa") = 5
     "Pressure drop at nominal mass flow rate of trickle vent"
     annotation(Dialog(group="Trickle vent", tab="Airflow", enable=use_trickle_vent));
   parameter Boolean use_trickle_vent_control = false
     "=true, to enable trickle vent control input"
     annotation(Dialog(group="Trickle vent", tab="Airflow", enable=use_trickle_vent));
-  parameter SI.Length hTrickleVent= hVertical+hRelSurfBot_a
+  parameter Modelica.Units.SI.Length hTrickleVent= hVertical+hRelSurfBot_a
     "vertical distance between the floor of the zone (top) and the trickle vent"
     annotation(Dialog(group="Trickle vent", tab="Airflow", enable=use_trickle_vent));
 
@@ -467,6 +467,11 @@ IDEAS.Buildings.Components.Validations.WindowEN673</a>
 </html>", revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 November 7, 2024, by Anna Dell'Isola and Jelger Jansen:<br/>
 Update calculation of transmission design losses.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1337\">#1337</a>
diff --git a/IDEAS/Buildings/Examples/ScreenComparison.mo b/IDEAS/Buildings/Examples/ScreenComparison.mo
index 1f59a66bce..93b07d7d9f 100644
--- a/IDEAS/Buildings/Examples/ScreenComparison.mo
+++ b/IDEAS/Buildings/Examples/ScreenComparison.mo
@@ -4,7 +4,7 @@ model ScreenComparison "Comparison between a model with and without screen"
   inner BoundaryConditions.SimInfoManager sim(interZonalAirFlowType=IDEAS.BoundaryConditions.Types.InterZonalAirFlow.OnePort)
     annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
    replaceable package Medium = IDEAS.Media.Air;
-  parameter SI.MassFlowRate m_flow_nominal = zoneWithScreen.V*1.2*ACH/3600
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = zoneWithScreen.V*1.2*ACH/3600
     "Nominal mass flow rate of trickle vent";
   parameter Real ACH = 1
     "Ventilation air change rate";
@@ -88,6 +88,11 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 October 30, 2024, by Lucas Verleyen:<br/>
 Updates according to <a href=\"https://github.com/ibpsa/modelica-ibpsa/tree/8ed71caee72b911a1d9b5a76e6cb7ed809875e1e\">IBPSA</a>.<br/>
 See <a href=\"https://github.com/open-ideas/IDEAS/pull/1383\">#1383</a> 
diff --git a/IDEAS/Controls/ControlHeating/Interfaces/Partial_Ctrl_Heating.mo b/IDEAS/Controls/ControlHeating/Interfaces/Partial_Ctrl_Heating.mo
index 11f305c7a3..8db089db1b 100644
--- a/IDEAS/Controls/ControlHeating/Interfaces/Partial_Ctrl_Heating.mo
+++ b/IDEAS/Controls/ControlHeating/Interfaces/Partial_Ctrl_Heating.mo
@@ -7,21 +7,21 @@ partial model Partial_Ctrl_Heating
   in order to be complete controller.  
   */
 
-  parameter SI.Temperature TRoo_nominal = 273.15 + 21
+  parameter Modelica.Units.SI.Temperature TRoo_nominal = 273.15 + 21
     "Room temperature at nominal condition";
-  parameter SI.Temperature TSupNom "Nominal heating curve supply temperature";
+  parameter Modelica.Units.SI.Temperature TSupNom "Nominal heating curve supply temperature";
   parameter Modelica.Units.SI.TemperatureDifference dTSupRetNom=10
     "Nominal difference between supply and return water temperatures";
   parameter Modelica.Units.SI.TemperatureDifference dTHeaterSet(min=0) = 2
     "Difference between heating curve setpoint and heater setpoint";
   parameter Modelica.Units.SI.Time timeFilter=43200
     "Time constant for filter on ambient temperature";
-  parameter SI.Temperature TSupMin=273.15 + 30
+  parameter Modelica.Units.SI.Temperature TSupMin=273.15 + 30
     "Minimum supply temperature if enabled";
   parameter Boolean minSup=true
     "true to limit the supply temperature on the lower side";
-  parameter SI.TemperatureDifference dTOutHeaBal=0 "Offset for heating curve";
-  parameter SI.Temperature TOut_nominal=273.15 - 8 "Outside temperature";
+  parameter Modelica.Units.SI.TemperatureDifference dTOutHeaBal=0 "Offset for heating curve";
+  parameter Modelica.Units.SI.Temperature TOut_nominal=273.15 - 8 "Outside temperature";
   parameter Modelica.Units.SI.TemperatureDifference corFac_val=0
     "correction term for TSet of the heating curve";
 
@@ -90,5 +90,14 @@ equation
           lineColor={135,135,135})}),
                                Diagram(coordinateSystem(extent={{-100,-100},{
             100,100}},
-                  preserveAspectRatio=false), graphics));
+                  preserveAspectRatio=false), graphics),
+    Documentation(revisions="<html>
+<ul>
+<li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+</ul>
+</html>"));
 end Partial_Ctrl_Heating;
diff --git a/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Cooling.mo b/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Cooling.mo
index b9f658da8d..cab6a86749 100644
--- a/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Cooling.mo
+++ b/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Cooling.mo
@@ -1,7 +1,6 @@
 within IDEAS.Controls.Discrete.Examples;
 model HysteresisRelease_Cooling
   "Example model for hysteresis with variable uLow and uHigh"
-  import IDEAS;
   extends Modelica.Icons.Example;
   IDEAS.Controls.Discrete.HysteresisRelease con(revert=false)
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
@@ -94,7 +93,15 @@ This example can be simulated with the \"simulate and plot\" command in the Comm
 </p>
 </html>", revisions="<html>
 <ul>
-<li>November 2014, Roel De Coninck and Damien Picard</li>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+<li>
+November, 2014, by Roel De Coninck and Damien Picard:<br/>
+First implementation.
+</li>
 </ul>
 </html>"));
 end HysteresisRelease_Cooling;
diff --git a/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Heating.mo b/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Heating.mo
index ca5e25775b..438ca174dc 100644
--- a/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Heating.mo
+++ b/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Heating.mo
@@ -1,7 +1,6 @@
 within IDEAS.Controls.Discrete.Examples;
 model HysteresisRelease_Heating
   "Example model for hysteresis with variable uLow and uHigh"
-  import IDEAS;
   extends Modelica.Icons.Example;
   IDEAS.Controls.Discrete.HysteresisRelease con(revert=true)
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
@@ -94,7 +93,15 @@ temperature of the capacity between uLow and uHigh. This example can be simulate
 </p>
 </html>", revisions="<html>
 <ul>
-<li>November 2014, Roel De Coninck and Damien Picard</li>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+<li>
+November, 2014, by Roel De Coninck and Damien Picard:<br/>
+First implementation.
+</li>
 </ul>
 </html>"));
 end HysteresisRelease_Heating;
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Components/Grid_3P.mo b/IDEAS/Experimental/Electric/Distribution/AC/Components/Grid_3P.mo
index a77878f7a6..38d1aa0ccb 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Components/Grid_3P.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Components/Grid_3P.mo
@@ -41,7 +41,7 @@ protected
       Z) for i in 1:3};
   parameter Modelica.Units.SI.Reactance[3,Nodes] X3={Modelica.ComplexMath.imag(
       Z) for i in 1:3};
-  //  parameter SI.ComplexVoltage[3] Vsource3={Vsource*(cos(c.pi*2*i/3)+MCM.j*sin(c.pi*2*i/6)) for i in 1:3};
+  //  parameter Modelica.Units.SI.ComplexVoltage[3] Vsource3={Vsource*(cos(c.pi*2*i/3)+Modelica.ComplexMath.j*sin(c.pi*2*i/6)) for i in 1:3};
 
   //Absolute voltages at the nodes
   output Modelica.Units.SI.Voltage Vabs[3,Nodes];
@@ -162,5 +162,15 @@ equation
           points={{-100,-60},{-42,20},{0,44}},
           color={85,170,255},
           smooth=Smooth.Bezier,
-          pattern=LinePattern.Dash)}));
+          pattern=LinePattern.Dash)}),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+</ul>
+</html>"));
 end Grid_3P;
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_1P.mo b/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_1P.mo
index 9743b8aff2..fa1c459b3f 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_1P.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_1P.mo
@@ -15,12 +15,12 @@ model MvLvTransformer_1P
     "Grid frequency: should normally not be changed when simulating belgian grids!";
   parameter Modelica.Units.SI.ComplexVoltage VSource=230 + 0*Modelica.ComplexMath.j
     "Voltage" annotation (choices(
-      choice=(230*1) + 0*MCM.j "100% at HVpin of transformer",
-      choice=(230*1.02) + 0*MCM.j "102% at HVpin of transformer",
-      choice=(230*1.05) + 0*MCM.j "105% at HVpin of transformer",
-      choice=(230*1.1) + 0*MCM.j "110% at HVpin of transformer",
-      choice=(230*0.95) + 0*MCM.j "95% at HVpin of transformer",
-      choice=(230*0.9) + 0*MCM.j "90% at HVpin of transformer"));
+      choice=(230*1) + 0* Modelica.ComplexMath.j "100% at HVpin of transformer",
+      choice=(230*1.02) + 0* Modelica.ComplexMath.j "102% at HVpin of transformer",
+      choice=(230*1.05) + 0* Modelica.ComplexMath.j "105% at HVpin of transformer",
+      choice=(230*1.1) + 0* Modelica.ComplexMath.j "110% at HVpin of transformer",
+      choice=(230*0.95) + 0* Modelica.ComplexMath.j "95% at HVpin of transformer",
+      choice=(230*0.9) + 0* Modelica.ComplexMath.j "90% at HVpin of transformer"));
 
   final parameter Modelica.Units.SI.HeatFlowRate traLosQRef=transformer.P0 +
       Modelica.ComplexMath.real(transformer.Zd)*(transformer.Sn/3/
@@ -212,5 +212,14 @@ equation
           points={{50,-60},{80,-60},{80,40},{140,40}},
           color={85,170,255},
           smooth=Smooth.None,
-          pattern=LinePattern.Dash)}));
+          pattern=LinePattern.Dash)}),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+</ul>
+</html>"));
 end MvLvTransformer_1P;
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_3P.mo b/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_3P.mo
index 6484791dd1..d9feedf706 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_3P.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_3P.mo
@@ -15,12 +15,12 @@ model MvLvTransformer_3P
     "Grid frequency: should normally not be changed when simulating belgian grids!";
   parameter Modelica.Units.SI.ComplexVoltage VSource=230 + 0*Modelica.ComplexMath.j
     "Voltage" annotation (choices(
-      choice=(230*1) + 0*MCM.j "100% at HVpin of transformer",
-      choice=(230*1.02) + 0*MCM.j "102% at HVpin of transformer",
-      choice=(230*1.05) + 0*MCM.j "105% at HVpin of transformer",
-      choice=(230*1.1) + 0*MCM.j "110% at HVpin of transformer",
-      choice=(230*0.95) + 0*MCM.j "95% at HVpin of transformer",
-      choice=(230*0.9) + 0*MCM.j "90% at HVpin of transformer"));
+      choice=(230*1) + 0* Modelica.ComplexMath.j "100% at HVpin of transformer",
+      choice=(230*1.02) + 0* Modelica.ComplexMath.j "102% at HVpin of transformer",
+      choice=(230*1.05) + 0* Modelica.ComplexMath.j "105% at HVpin of transformer",
+      choice=(230*1.1) + 0* Modelica.ComplexMath.j "110% at HVpin of transformer",
+      choice=(230*0.95) + 0* Modelica.ComplexMath.j "95% at HVpin of transformer",
+      choice=(230*0.9) + 0* Modelica.ComplexMath.j "90% at HVpin of transformer"));
 
   final parameter Modelica.Units.SI.HeatFlowRate traLosQRef=transformer.P0 +
       Modelica.ComplexMath.real(transformer.Zd)*(transformer.Sn/3/
@@ -316,5 +316,14 @@ Small changes.
         Line(
           points={{-60,-2},{-64,-10},{-68,-10},{-74,10}},
           color={0,0,0},
-          smooth=Smooth.None)}));
+          smooth=Smooth.None)})),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+</ul>
+</html>"));
 end MvLvTransformer_3P;
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Examples/Components/Transformer.mo b/IDEAS/Experimental/Electric/Distribution/AC/Examples/Components/Transformer.mo
index 5d146d3bdc..f2e2d10b0c 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Examples/Components/Transformer.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Examples/Components/Transformer.mo
@@ -1,6 +1,5 @@
 within IDEAS.Experimental.Electric.Distribution.AC.Examples.Components;
 model Transformer
-  import IDEAS;
 
   parameter Modelica.Units.SI.Temperature THsRef=326.6;
   parameter Modelica.Units.SI.Temperature TToRef=314.44;
@@ -36,5 +35,14 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}}), graphics));
+            -100},{100,100}}), graphics),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+</ul>
+</html>"));
 end Transformer;
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Examples/TestGridGeneral1PEq.mo b/IDEAS/Experimental/Electric/Distribution/AC/Examples/TestGridGeneral1PEq.mo
index 74288e1a62..0eae639d5d 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Examples/TestGridGeneral1PEq.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Examples/TestGridGeneral1PEq.mo
@@ -1,7 +1,6 @@
 within IDEAS.Experimental.Electric.Distribution.AC.Examples;
 model TestGridGeneral1PEq
-  import IDEAS;
-    extends Modelica.Icons.Example;
+  extends Modelica.Icons.Example;
   IDEAS.Experimental.Electric.Distribution.AC.Examples.Components.SinePower
     risingflankSingle1(amplitude=12000)
     annotation (Placement(transformation(extent={{40,0},{60,20}})));
@@ -27,6 +26,11 @@ equation
             graphics), Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+<li>
 May 22, 2022, by Filip Jorissen:<br/>
 Removed experiment annotation to avoid failing OMC tests.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1254\">
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Grid_1PEq.mo b/IDEAS/Experimental/Electric/Distribution/AC/Grid_1PEq.mo
index 873494567a..0ed94a0c98 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Grid_1PEq.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Grid_1PEq.mo
@@ -13,12 +13,12 @@ public
 
   parameter Modelica.Units.SI.ComplexVoltage VSource=230 + 0*Modelica.ComplexMath.j
     "Voltage" annotation (choices(
-      choice=(230*1) + 0*MCM.j "100% at HVpin of transformer",
-      choice=(230*1.02) + 0*MCM.j "102% at HVpin of transformer",
-      choice=(230*1.05) + 0*MCM.j "105% at HVpin of transformer",
-      choice=(230*1.1) + 0*MCM.j "110% at HVpin of transformer",
-      choice=(230*0.95) + 0*MCM.j "95% at HVpin of transformer",
-      choice=(230*0.9) + 0*MCM.j "90% at HVpin of transformer"));
+      choice=(230*1) + 0* Modelica.ComplexMath.j "100% at HVpin of transformer",
+      choice=(230*1.02) + 0* Modelica.ComplexMath.j "102% at HVpin of transformer",
+      choice=(230*1.05) + 0* Modelica.ComplexMath.j "105% at HVpin of transformer",
+      choice=(230*1.1) + 0* Modelica.ComplexMath.j "110% at HVpin of transformer",
+      choice=(230*0.95) + 0* Modelica.ComplexMath.j "95% at HVpin of transformer",
+      choice=(230*0.9) + 0* Modelica.ComplexMath.j "90% at HVpin of transformer"));
 
 Components.MvLvTransformer_1P transformer_MvLv(transformer=transformer, traTCal=
         traTCal)
@@ -108,5 +108,14 @@ equation
         Line(
           points={{-100,-60},{-42,20},{0,44}},
           color={85,170,255},
-          smooth=Smooth.Bezier)}));
+          smooth=Smooth.Bezier)})),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+</ul>
+</html>"));
 end Grid_1PEq;
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Grid_3P.mo b/IDEAS/Experimental/Electric/Distribution/AC/Grid_3P.mo
index 10b1f7da72..5e40b45388 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Grid_3P.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Grid_3P.mo
@@ -13,12 +13,12 @@ public
 
   parameter Modelica.Units.SI.ComplexVoltage VSource=230 + 0*Modelica.ComplexMath.j
     "Voltage" annotation (choices(
-      choice=(230*1) + 0*MCM.j "100% at HVpin of transformer",
-      choice=(230*1.02) + 0*MCM.j "102% at HVpin of transformer",
-      choice=(230*1.05) + 0*MCM.j "105% at HVpin of transformer",
-      choice=(230*1.1) + 0*MCM.j "110% at HVpin of transformer",
-      choice=(230*0.95) + 0*MCM.j "95% at HVpin of transformer",
-      choice=(230*0.9) + 0*MCM.j "90% at HVpin of transformer"));
+      choice=(230*1) + 0* Modelica.ComplexMath.j "100% at HVpin of transformer",
+      choice=(230*1.02) + 0* Modelica.ComplexMath.j "102% at HVpin of transformer",
+      choice=(230*1.05) + 0* Modelica.ComplexMath.j "105% at HVpin of transformer",
+      choice=(230*1.1) + 0* Modelica.ComplexMath.j "110% at HVpin of transformer",
+      choice=(230*0.95) + 0* Modelica.ComplexMath.j "95% at HVpin of transformer",
+      choice=(230*0.9) + 0* Modelica.ComplexMath.j "90% at HVpin of transformer"));
 
   /***Everything related to the transfomer***/
     Components.MvLvTransformer_3P transformer_MvLv(transformer=transformer, traTCal=
@@ -129,5 +129,14 @@ equation
         Line(
           points={{-100,60},{-42,12},{0,36}},
           color={0,0,0},
-          smooth=Smooth.Bezier)}));
+          smooth=Smooth.Bezier)})),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+</ul>
+</html>"));
 end Grid_3P;
diff --git a/IDEAS/Experimental/Electric/Distribution/DC/Examples/TestGridDC.mo b/IDEAS/Experimental/Electric/Distribution/DC/Examples/TestGridDC.mo
index 80974692f2..32c70518d0 100644
--- a/IDEAS/Experimental/Electric/Distribution/DC/Examples/TestGridDC.mo
+++ b/IDEAS/Experimental/Electric/Distribution/DC/Examples/TestGridDC.mo
@@ -1,6 +1,5 @@
 within IDEAS.Experimental.Electric.Distribution.DC.Examples;
 model TestGridDC
-  import IDEAS;
 extends Modelica.Icons.Example;
   IDEAS.Experimental.Electric.Distribution.DC.GridDCGeneral gridGeneralDC(
       redeclare
@@ -33,5 +32,14 @@ equation
       color={0,0,255},
       smooth=Smooth.None));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}})));
+            -100},{100,100}})),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+</ul>
+</html>"));
 end TestGridDC;
diff --git a/IDEAS/Experimental/Electric/Distribution/DC/GridDCGeneral.mo b/IDEAS/Experimental/Electric/Distribution/DC/GridDCGeneral.mo
index c8f3fa79c0..4cb48c0afd 100644
--- a/IDEAS/Experimental/Electric/Distribution/DC/GridDCGeneral.mo
+++ b/IDEAS/Experimental/Electric/Distribution/DC/GridDCGeneral.mo
@@ -1,6 +1,5 @@
 within IDEAS.Experimental.Electric.Distribution.DC;
 model GridDCGeneral
-  import IDEAS;
 
 replaceable parameter Data.Interfaces.DirectCurrent.GridType grid
     "Choose a grid Layout" annotation (choicesAllMatching=true);
@@ -92,5 +91,14 @@ annotation(Icon(graphics={
           points={{48,20},{48,0},{96,0}},
           color={0,0,255},
           smooth=Smooth.None)}),                                    Diagram(
-        graphics));
+        graphics),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+</ul>
+</html>"));
 end GridDCGeneral;
diff --git a/IDEAS/Experimental/Electric/Distribution/Examples/Components/Transformer.mo b/IDEAS/Experimental/Electric/Distribution/Examples/Components/Transformer.mo
index eda347326f..889b905b07 100644
--- a/IDEAS/Experimental/Electric/Distribution/Examples/Components/Transformer.mo
+++ b/IDEAS/Experimental/Electric/Distribution/Examples/Components/Transformer.mo
@@ -1,6 +1,5 @@
 within IDEAS.Experimental.Electric.Distribution.Examples.Components;
 model Transformer
-  import IDEAS;
 
   parameter Modelica.Units.SI.Temperature THsRef=326.6;
   parameter Modelica.Units.SI.Temperature TToRef=314.44;
@@ -36,5 +35,14 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}}), graphics));
+            -100},{100,100}}), graphics),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+</ul>
+</html>"));
 end Transformer;
diff --git a/IDEAS/Experimental/Electric/Examples/TestGridAndPVFromFile.mo b/IDEAS/Experimental/Electric/Examples/TestGridAndPVFromFile.mo
index 3fcaab090d..b4c03a6d66 100644
--- a/IDEAS/Experimental/Electric/Examples/TestGridAndPVFromFile.mo
+++ b/IDEAS/Experimental/Electric/Examples/TestGridAndPVFromFile.mo
@@ -10,7 +10,7 @@ extends Modelica.Icons.Example;
   Photovoltaics.PvSystemGeneralFromFile pVFromFilePQ(numPha=3, PNom=5000)
     annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
   IDEAS.Experimental.Electric.Distribution.AC.Grid_3P gridGeneral(
-    VSource=(230*1.02) + 0*MCM.j,
+    VSource=(230*1.02) + 0*Modelica.ComplexMath.j,
     redeclare Data.Grids.Ieee34_AL120                grid,
     redeclare Data.TransformerImp.Transfo_100kVA transformer,
     traTCal=true)
@@ -23,6 +23,11 @@ equation
   annotation (Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 May 22, 2022, by Filip Jorissen:<br/>
 Removed experiment annotation to avoid failing OMC tests.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1254\">
diff --git a/IDEAS/Experimental/Electric/Examples/TestGridAndPVSystemGeneral.mo b/IDEAS/Experimental/Electric/Examples/TestGridAndPVSystemGeneral.mo
index b31214a254..ce8cfdc5ae 100644
--- a/IDEAS/Experimental/Electric/Examples/TestGridAndPVSystemGeneral.mo
+++ b/IDEAS/Experimental/Electric/Examples/TestGridAndPVSystemGeneral.mo
@@ -8,7 +8,7 @@ extends Modelica.Icons.Example;
   inner IDEAS.BoundaryConditions.SimInfoManager sim
     annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
   Distribution.AC.Grid_3P                             gridGeneral(
-    VSource=(230*1.02) + 0*MCM.j,
+    VSource=(230*1.02) + 0*Modelica.ComplexMath.j,
     redeclare Data.Grids.Ieee34_AL120                grid,
     redeclare Data.TransformerImp.Transfo_100kVA transformer,
     traTCal=true)
@@ -21,6 +21,11 @@ equation
   annotation (Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 May 22, 2022, by Filip Jorissen:<br/>
 Removed experiment annotation to avoid failing OMC tests.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1254\">
diff --git a/IDEAS/Experimental/Electric/Photovoltaics/Components/DCgen.mo b/IDEAS/Experimental/Electric/Photovoltaics/Components/DCgen.mo
index 4adf0e0bb5..c0ffb0eb4c 100644
--- a/IDEAS/Experimental/Electric/Photovoltaics/Components/DCgen.mo
+++ b/IDEAS/Experimental/Electric/Photovoltaics/Components/DCgen.mo
@@ -1,12 +1,16 @@
 within IDEAS.Experimental.Electric.Photovoltaics.Components;
 model DCgen
 
-  import Modelica.Electrical.Analog.Interfaces;
-  extends Interfaces.OnePort;
+  extends Modelica.Electrical.Analog.Interfaces.OnePort;
 
   annotation (Documentation(revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 October 21, 2015 by Filip Jorissen:<br/>
 Changed class declaration to model declaration for issue 398.
 </li>
diff --git a/IDEAS/Experimental/Electric/Photovoltaics/Components/PvVoltageCtrlGeneral_InputVGrid_MovAvg.mo b/IDEAS/Experimental/Electric/Photovoltaics/Components/PvVoltageCtrlGeneral_InputVGrid_MovAvg.mo
index ad98a48493..33b1bde9fa 100644
--- a/IDEAS/Experimental/Electric/Photovoltaics/Components/PvVoltageCtrlGeneral_InputVGrid_MovAvg.mo
+++ b/IDEAS/Experimental/Electric/Photovoltaics/Components/PvVoltageCtrlGeneral_InputVGrid_MovAvg.mo
@@ -1,7 +1,6 @@
 within IDEAS.Experimental.Electric.Photovoltaics.Components;
 model PvVoltageCtrlGeneral_InputVGrid_MovAvg
   "Basic controller based on moving average, with fixed shut down time, with RealInput for grid voltage"
-  import IDEAS;
 
   extends Modelica.Blocks.Icons.Block;
 
@@ -61,5 +60,14 @@ equation
       points={{-100,-60},{-64,-60},{-64,-42},{-26,-42}},
       color={0,0,127},
       smooth=Smooth.None));
-  annotation (Diagram(graphics));
+  annotation (Diagram(graphics),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+</ul>
+</html>"));
 end PvVoltageCtrlGeneral_InputVGrid_MovAvg;
diff --git a/IDEAS/Experimental/Electric/Photovoltaics/Examples/PVSystem.mo b/IDEAS/Experimental/Electric/Photovoltaics/Examples/PVSystem.mo
index 80bf7ea4b3..dca6189b67 100644
--- a/IDEAS/Experimental/Electric/Photovoltaics/Examples/PVSystem.mo
+++ b/IDEAS/Experimental/Electric/Photovoltaics/Examples/PVSystem.mo
@@ -2,9 +2,9 @@ within IDEAS.Experimental.Electric.Photovoltaics.Examples;
 model PVSystem
   "Only a PV system, see python script for generating profiles from this model"
   extends Modelica.Icons.Example;
-  parameter SI.Angle inc=40/180*Modelica.Constants.pi
+  parameter Modelica.Units.SI.Angle inc=40/180*Modelica.Constants.pi
     annotation (evaluate=False);
-  parameter SI.Angle azi=45/180*Modelica.Constants.pi
+  parameter Modelica.Units.SI.Angle azi=45/180*Modelica.Constants.pi
     annotation (evaluate=False);
 
   IDEAS.Experimental.Electric.Photovoltaics.PVSystemGeneral pVSystemGeneral(
@@ -29,5 +29,14 @@ equation
       points={{40,-10},{40,-30}},
       color={85,170,255},
       smooth=Smooth.None));
-  annotation (Diagram(graphics));
+  annotation (Diagram(graphics),
+    Documentation(revisions="<html>
+<ul>
+<li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+</ul>
+</html>"));
 end PVSystem;
diff --git a/IDEAS/Experimental/Electric/package.mo b/IDEAS/Experimental/Electric/package.mo
index da9dba0947..c36972b39c 100644
--- a/IDEAS/Experimental/Electric/package.mo
+++ b/IDEAS/Experimental/Electric/package.mo
@@ -1,7 +1,5 @@
 within IDEAS.Experimental;
 package Electric "Electrical in-home and feeder systems"
-import MCM = Modelica.ComplexMath;
-
 
 extends Modelica.Icons.Package;
 
diff --git a/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/Thermostatic3WayValve.mo b/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/Thermostatic3WayValve.mo
index 0b32b01a6b..3377785b7b 100644
--- a/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/Thermostatic3WayValve.mo
+++ b/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/Thermostatic3WayValve.mo
@@ -9,7 +9,7 @@ model Thermostatic3WayValve "Example of a thermostatic three way valve"
                         annotation (Placement(transformation(extent={{8,8},{28,28}})));
   package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater;
 
-  parameter SI.MassFlowRate m_flow_nominal=2 "Nominal mass flow rate";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2 "Nominal mass flow rate";
 
   IDEAS.Fluid.Movers.FlowControlled_m_flow pump(
     redeclare package Medium = Medium,
@@ -89,6 +89,11 @@ equation
             -100},{100,100}})),     Documentation(revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 October 30, 2024, by Lucas Verleyen:<br/>
 Updates according to <a href=\"https://github.com/ibpsa/modelica-ibpsa/tree/8ed71caee72b911a1d9b5a76e6cb7ed809875e1e\">IBPSA</a>.<br/>
 See <a href=\"https://github.com/open-ideas/IDEAS/pull/1383\">#1383</a> 
diff --git a/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/ThreeWayValveSwitch.mo b/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/ThreeWayValveSwitch.mo
index c18b377e9a..f6f498c609 100644
--- a/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/ThreeWayValveSwitch.mo
+++ b/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/ThreeWayValveSwitch.mo
@@ -1,6 +1,5 @@
 within IDEAS.Fluid.Actuators.Valves.Simplified.Examples;
 model ThreeWayValveSwitch "Test the new component ThreeWayValveSwitch"
-  import IDEAS;
   extends Modelica.Icons.Example;
   package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater;
 
@@ -85,6 +84,11 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+<li>
 October 30, 2024, by Lucas Verleyen:<br/>
 Updates according to <a href=\"https://github.com/ibpsa/modelica-ibpsa/tree/8ed71caee72b911a1d9b5a76e6cb7ed809875e1e\">IBPSA</a>.<br/>
 See <a href=\"https://github.com/open-ideas/IDEAS/pull/1383\">#1383</a> 
diff --git a/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWater.mo b/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWater.mo
index a3a5db922e..d48d92727f 100644
--- a/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWater.mo
+++ b/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWater.mo
@@ -6,7 +6,7 @@ model HeatPump_WaterWater
 
   package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater
     annotation (choicesAllMatching=true);
-  constant SI.MassFlowRate m_flow_nominal=0.3 "Nominal mass flow rate";
+  constant Modelica.Units.SI.MassFlowRate m_flow_nominal=0.3 "Nominal mass flow rate";
   IDEAS.Fluid.Movers.FlowControlled_m_flow pump(
     redeclare package Medium = Medium,
     tau=30,
@@ -363,6 +363,11 @@ equation
 </html>", revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 October 30, 2024, by Lucas Verleyen:<br/>
 Updates according to <a href=\"https://github.com/ibpsa/modelica-ibpsa/tree/8ed71caee72b911a1d9b5a76e6cb7ed809875e1e\">IBPSA</a>.<br/>
 See <a href=\"https://github.com/open-ideas/IDEAS/pull/1383\">#1383</a> 
diff --git a/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWaterTSet.mo b/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWaterTSet.mo
index fa19706f73..b3d368bfab 100644
--- a/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWaterTSet.mo
+++ b/IDEAS/Fluid/HeatPumps/Examples/HeatPump_WaterWaterTSet.mo
@@ -4,7 +4,7 @@ model HeatPump_WaterWaterTSet
   extends Modelica.Icons.Example;
     package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater
     annotation (choicesAllMatching=true);
-  constant SI.MassFlowRate m_flow_nominal=0.3 "Nominal mass flow rate";
+  constant Modelica.Units.SI.MassFlowRate m_flow_nominal=0.3 "Nominal mass flow rate";
 
   Modelica.Blocks.Sources.Constant const(k=273.15 + 35)
     annotation (Placement(transformation(extent={{8,24},{-10,42}})));
@@ -129,12 +129,18 @@ equation
         "Simulate and plot"),  Documentation(revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 October 30, 2024, by Lucas Verleyen:<br/>
 Updates according to <a href=\"https://github.com/ibpsa/modelica-ibpsa/tree/8ed71caee72b911a1d9b5a76e6cb7ed809875e1e\">IBPSA</a>.<br/>
 See <a href=\"https://github.com/open-ideas/IDEAS/pull/1383\">#1383</a> 
 (and <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1926\">IBPSA, #1926</a>).
 </li>
-<li>March 2014 by Filip Jorissen:<br/> 
+<li>
+March 2014 by Filip Jorissen:<br/> 
 Initial version
 </li>
 </ul>
diff --git a/IDEAS/Fluid/HeatPumps/Examples/HeatPump_perfFromTout.mo b/IDEAS/Fluid/HeatPumps/Examples/HeatPump_perfFromTout.mo
index e47d0437ec..e1dacedda6 100644
--- a/IDEAS/Fluid/HeatPumps/Examples/HeatPump_perfFromTout.mo
+++ b/IDEAS/Fluid/HeatPumps/Examples/HeatPump_perfFromTout.mo
@@ -6,7 +6,7 @@ model HeatPump_perfFromTout
 
   package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater
     annotation (choicesAllMatching=true);
-  constant SI.MassFlowRate m_flow_nominal=0.3 "Nominal mass flow rate";
+  constant Modelica.Units.SI.MassFlowRate m_flow_nominal=0.3 "Nominal mass flow rate";
   IDEAS.Fluid.Movers.FlowControlled_m_flow pump(
     redeclare package Medium = Medium,
     use_riseTime=false,
@@ -339,6 +339,11 @@ This example demonstrates the difference in results when using the parameter per
 </html>", revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 October 30, 2024, by Lucas Verleyen:<br/>
 Updates according to <a href=\"https://github.com/ibpsa/modelica-ibpsa/tree/8ed71caee72b911a1d9b5a76e6cb7ed809875e1e\">IBPSA</a>.<br/>
 See <a href=\"https://github.com/open-ideas/IDEAS/pull/1383\">#1383</a> 
diff --git a/IDEAS/Fluid/HeatPumps/HP_AirWater_TSet.mo b/IDEAS/Fluid/HeatPumps/HP_AirWater_TSet.mo
index ccc9524f79..57c348c552 100644
--- a/IDEAS/Fluid/HeatPumps/HP_AirWater_TSet.mo
+++ b/IDEAS/Fluid/HeatPumps/HP_AirWater_TSet.mo
@@ -12,7 +12,7 @@ model HP_AirWater_TSet "Air-to-water heat pump with temperature set point"
   parameter Real fraLosDesNom=0.68
     "Ratio of power at design conditions over power at 2/35degC";
   parameter Real betaFactor=0.8 "Relative sizing compared to design heat load";
-  final parameter SI.Power QNomFinal=if abs(QDesign) < Modelica.Constants.small then QNom else QDesign/
+  final parameter Modelica.Units.SI.Power QNomFinal=if abs(QDesign) < Modelica.Constants.small then QNom else QDesign/
       fraLosDesNom*betaFactor "Used nominal power in the heatSource model";
   parameter Real modulation_min=20 "Minimal modulation percentage";
   parameter Real modulation_start=35
@@ -219,6 +219,11 @@ equation
 </html>", revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 September 10, 2020 by Filip Jorissen:<br/>
 Fixed real equality comparison for
 <a href=\"https://github.com/open-ideas/IDEAS/issues/1172\">#1172</a>.
@@ -228,9 +233,18 @@ June 5, 2018 by Filip Jorissen:<br/>
 Cleaned up implementation for
 <a href=\"https://github.com/open-ideas/IDEAS/issues/821\">#821</a>.
 </li>
-<li>2014 March, Filip Jorissen, Annex60 compatibility</li>
-<li>2013 May, Roel De Coninck: propagation of heatSource parameters and better definition of QNom used.  Documentation and example added</li>
-<li>2011 Roel De Coninck: first version</li>
+<li>
+March, 2014, by Filip Jorissen:<br/>
+Annex60 compatibility
+</li>
+<li>
+May, 2013, by Roel De Coninck:<br/>
+Propagation of heatSource parameters and better definition of QNom used.  Documentation and example added
+</li>
+<li>
+2011, by Roel De Coninck:<br/>
+First version
+</li>
 </ul>
 </html>"));
 end HP_AirWater_TSet;
diff --git a/IDEAS/Fluid/HeatPumps/Interfaces/PartialDynamicHeaterWithLosses.mo b/IDEAS/Fluid/HeatPumps/Interfaces/PartialDynamicHeaterWithLosses.mo
index 9e62f533a0..c25086ec16 100644
--- a/IDEAS/Fluid/HeatPumps/Interfaces/PartialDynamicHeaterWithLosses.mo
+++ b/IDEAS/Fluid/HeatPumps/Interfaces/PartialDynamicHeaterWithLosses.mo
@@ -14,8 +14,8 @@ partial model PartialDynamicHeaterWithLosses
   parameter Modelica.Units.SI.Mass mWater=5 "Mass of water in the condensor";
   parameter Modelica.Units.SI.HeatCapacity cDry=4800
     "Capacity of dry material lumped to condensor";
-  parameter SI.MassFlowRate m_flow_nominal "Nominal mass flow rate";
-  parameter SI.Pressure dp_nominal=0 "Pressure";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate";
+  parameter Modelica.Units.SI.Pressure dp_nominal=0 "Pressure";
   parameter Boolean dynamicBalance=true
     "Set to true to use a dynamic balance, which often leads to smaller systems of equations"
     annotation (Dialog(tab="Flow resistance"));
@@ -152,11 +152,19 @@ equation
 </html>", revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 June 5, 2018 by Filip Jorissen:<br/>
 Cleaned up implementation for
 <a href=\"https://github.com/open-ideas/IDEAS/issues/821\">#821</a>.
 </li>
-<li>2014 March, Filip Jorissen, Annex60 compatibility</li>
+<li>
+March, 2014, by Filip Jorissen:<br/>
+Annex60 compatibility
+</li>
 </ul>
 </html>"));
 end PartialDynamicHeaterWithLosses;
diff --git a/IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo b/IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo
index 7bc5b99c65..37d2a42e5e 100644
--- a/IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo
+++ b/IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo
@@ -1,7 +1,6 @@
 within IDEAS.Fluid.Taps.Interfaces;
 partial model BalancedTap "partial DHW model"
   extends Modelica.Icons.ObsoleteModel;
-  import IDEAS;
 
   parameter Modelica.Units.SI.Temperature TDHWSet(max=273.15 + 60) = 273.15 +
     45 "DHW temperature setpoint";
@@ -9,7 +8,7 @@ partial model BalancedTap "partial DHW model"
     "Nominal cold water temperature";
   parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
-  parameter SI.Time tau=30
+  parameter Modelica.Units.SI.Time tau=30
     "Tin time constant of temperature sensor at nominal flow rate";
 protected
   Modelica.Units.SI.MassFlowRate mFlo60C "DHW flow rate at 60 degC";
@@ -191,14 +190,29 @@ An example of this model is given in
 </html>", revisions="<html>
 <ul>
 <li>
+February 4, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 May 22, 2022, by Filip Jorissen:<br/>
 Fixed Modelica specification compatibility issue.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1254\">
 #1254</a>
 </li>
-<li>2013 June, Roel De Coninck: documentation.</li>
-<li>2012 September, Roel De Coninck, simplification of equations.</li>
-<li>2012 August, Roel De Coninck, first implementation.</li>
+<li>
+June, 2013, by Roel De Coninck:<br/>
+Add documentation.
+</li>
+<li>
+September, 2012, by Roel De Coninck:<br/>
+Simplification of equations.
+</li>
+<li>
+August, 2012, by Roel De Coninck:<br/>
+First implementation.
+</li>
 </ul>
 </html>"));
 end BalancedTap;
diff --git a/IDEAS/Templates/Interfaces/package.mo b/IDEAS/Templates/Interfaces/package.mo
index 6f3e4e47a1..c8437675a4 100644
--- a/IDEAS/Templates/Interfaces/package.mo
+++ b/IDEAS/Templates/Interfaces/package.mo
@@ -1,8 +1,6 @@
 within IDEAS.Templates;
 package Interfaces "Partials"
 
-
 extends Modelica.Icons.InterfacesPackage;
-import      Modelica.Units.SI;
 
 end Interfaces;
diff --git a/IDEAS/Utilities/File/test.mo b/IDEAS/Utilities/File/test.mo
index 13053df587..da774cb4aa 100644
--- a/IDEAS/Utilities/File/test.mo
+++ b/IDEAS/Utilities/File/test.mo
@@ -1,6 +1,5 @@
 within IDEAS.Utilities.File;
 model test
-  import IDEAS;
   parameter String name = "example.mo";
   parameter String savePath=Modelica.Utilities.Files.loadResource("modelica://IDEAS/Fluid/HeatExchangers/GroundHeatExchangers/Borefield/Data/BorefieldData/");
   parameter String sha1=IDEAS.Utilities.File.sha1(savePath + name);
diff --git a/IDEAS/package.mo b/IDEAS/package.mo
index 9fd6d3f272..a1b7fc1df0 100644
--- a/IDEAS/package.mo
+++ b/IDEAS/package.mo
@@ -2,7 +2,6 @@ within ;
 package IDEAS "Integrated District Energy Assessment Simulation"
 
 extends Modelica.Icons.Package;
-import      Modelica.Units.SI;
 
 annotation (
   uses(Modelica(version="4.0.0")),
