diff --git a/.travis.yml b/.travis.yml
index 37ba21e0de..b05915497c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,8 +33,8 @@ env:
     - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.{Examples,Experimental}\""
     - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.Fluid.{Actuators,BaseClasses,Chillers,Delays,Geothermal,Examples,FMI,FixedResistances}\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.Fluid.{Actuators,BaseClasses,Chillers,Delays,Geothermal,Examples,FMI,FixedResistances}\""
-    - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.Fluid.{HeatExchangers,HeatPumps,Humidifiers,Interfaces,MassExchangers,MixingVolumes,Movers,Sensors,Sources,Storage}\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.Fluid.{HeatExchangers,HeatPumps,Humidifiers,Interfaces,MassExchangers,MixingVolumes,Movers,Sensors,Sources,Storage}\""
+    - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.Fluid.{HeatExchangers,HeatPumps,Humidifiers,Interfaces,MassExchangers,MixingVolumes,Movers,SolarCollectors,Sensors,Sources,Storage}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.Fluid.{HeatExchangers,HeatPumps,Humidifiers,Interfaces,MassExchangers,MixingVolumes,Movers,SolarCollectors,Sensors,Sources,Storage}\""
     - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.ThermalZones\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.ThermalZones\""
     - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.{Airflow,BoundaryConditions,Controls,Electrical}\""
diff --git a/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo b/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo
index 5dd03fecbe..0a5337ff56 100644
--- a/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo
+++ b/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo
@@ -1,7 +1,6 @@
 within IBPSA.BoundaryConditions.SolarIrradiation.BaseClasses;
 block BrighteningCoefficient "Circumsolar and horizon brightening coefficients"
   extends Modelica.Blocks.Icons.Block;
-  import H = IBPSA.Utilities.Math.Functions.regStep;
   Modelica.Blocks.Interfaces.RealInput zen(
     quantity="Angle",
     unit="rad",
@@ -42,43 +41,42 @@ protected
   Real b7;
   Real b8;
 equation
-  b1 = H(
+  b1 = IBPSA.Utilities.Math.Functions.regStep(
     y1=1,
     y2=0,
     x=1.065 - skyCle,
     x_small=d);
-  b2 = H(
+  b2 = IBPSA.Utilities.Math.Functions.regStep(
     y1=1,
     y2=0,
     x=1.23 - skyCle,
     x_small=d);
-  b3 = H(
+  b3 = IBPSA.Utilities.Math.Functions.regStep(
     y1=1,
     y2=0,
     x=1.50 - skyCle,
     x_small=d);
-  b4 = H(
+  b4 = IBPSA.Utilities.Math.Functions.regStep(
     y1=1,
     y2=0,
     x=1.95 - skyCle,
     x_small=d);
-  b5 = H(
+  b5 = IBPSA.Utilities.Math.Functions.regStep(
     y1=1,
     y2=0,
     x=2.80 - skyCle,
     x_small=d);
-
-  b6 = H(
+  b6 = IBPSA.Utilities.Math.Functions.regStep(
     y1=1,
     y2=0,
     x=4.50 - skyCle,
     x_small=d);
-  b7 = H(
+  b7 = IBPSA.Utilities.Math.Functions.regStep(
     y1=1,
     y2=0,
     x=6.20 - skyCle,
     x_small=d);
-  b8 = H(
+  b8 = IBPSA.Utilities.Math.Functions.regStep(
     y1=1,
     y2=0,
     x=skyCle - 6.20,
@@ -119,6 +117,12 @@ This component computes the circumsolar and horizon brightening coefficients.
 </html>", revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import</code> statement.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+</li>
+<li>
 April 27, 2018, by Michael Wetter:<br/>
 Corrected <code>displayUnit</code>.<br/>
 This is for
diff --git a/IBPSA/Controls/OBC/CDL/Logical/TrueFalseHold.mo b/IBPSA/Controls/OBC/CDL/Logical/TrueFalseHold.mo
index 5365adb62d..2f1d576285 100644
--- a/IBPSA/Controls/OBC/CDL/Logical/TrueFalseHold.mo
+++ b/IBPSA/Controls/OBC/CDL/Logical/TrueFalseHold.mo
@@ -22,7 +22,7 @@ block TrueFalseHold
 protected
   /* The following parameter is required solely as a warkaround for a bug in OCT [Modelon - 1263].
   Both Dymola and OMC can handle the initial equation pre(u)=u, which complies with MLS. */
-  parameter Boolean pre_u_start=false
+ parameter Boolean pre_u_start=false
     "Value of pre(u) at initial time"
     annotation (Evaluate=true);
   Boolean not_u = not u
@@ -49,21 +49,15 @@ equation
     y = u;
     entryTimeTrue = if y then time else pre(entryTimeTrue);
     entryTimeFalse = if not y then time else pre(entryTimeFalse);
-  /*
-  The two elsewhen clauses below are kept separate to address an issue
-  with event handling in the CVODE solver.
-  */
-  elsewhen {edge(u), edge(not_u)} then
-    y = if time >= pre(entryTimeFalse) + falseHoldDuration and
-      time >= pre(entryTimeTrue) + trueHoldDuration then u
+  elsewhen {edge(u),
+            edge(not_u),
+            time >= pre(entryTimeFalse) + falseHoldDuration and
+            time >= pre(entryTimeTrue) + trueHoldDuration} then
+    y=if time >= pre(entryTimeFalse) + falseHoldDuration and
+         time >= pre(entryTimeTrue) + trueHoldDuration then u
       else pre(y);
     entryTimeTrue = if edge(y) then time else pre(entryTimeTrue);
     entryTimeFalse = if edge(not_y) then time else pre(entryTimeFalse);
-  elsewhen time >= pre(entryTimeFalse) + falseHoldDuration and
-    time >= pre(entryTimeTrue) + trueHoldDuration then
-    y = u;
-    entryTimeTrue = if edge(y) then time else pre(entryTimeTrue);
-    entryTimeFalse = if edge(not_y) then time else pre(entryTimeFalse);
   end when;
   annotation (
     defaultComponentName="truFalHol",
@@ -145,6 +139,12 @@ alt=\"Input and output of the block\"/>
       revisions="<html>
 <ul>
 <li>
+January 13, 2025, by Antoine Gautier:<br/>
+Merge <code>elsewhen</code> clauses.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4082\">Buildings, issue 4082</a>.
+</li>
+<li>
 August 26, 2024, by Antoine Gautier:<br/>
 Resolved an issue with unit impulse signals.<br/>
 This is for
diff --git a/IBPSA/Controls/SetPoints/OccupancySchedule.mo b/IBPSA/Controls/SetPoints/OccupancySchedule.mo
index ea48314c81..c4be8a96ea 100644
--- a/IBPSA/Controls/SetPoints/OccupancySchedule.mo
+++ b/IBPSA/Controls/SetPoints/OccupancySchedule.mo
@@ -95,8 +95,6 @@ protected
   end getOutput;
 
 encapsulated function switchInteger "Switch two Integer arguments"
-  import Modelica;
-  extends Modelica.Icons.Function;
   input Integer x1 "First argument";
   input Integer x2 "Second argument";
   output Integer y1 "Output = x2";
@@ -107,8 +105,6 @@ algorithm
 end switchInteger;
 
 encapsulated function switchReal "Switch two Real arguments"
-  import Modelica;
-  extends Modelica.Icons.Function;
   input Real x1 "First argument";
   input Real x2 "Second argument";
   output Real y1 "Output = x2";
@@ -197,6 +193,12 @@ The period always starts at <i>t=0</i> seconds.
 </html>", revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import</code> statement.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+</li>
+<li>
 March 25, 2021, by Michael Wetter:<br/>
 Integrated changes from Buildings for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1454\">IBPSA, #1454</a>.
diff --git a/IBPSA/Electrical/PhaseSystems/ThreePhase_d.mo b/IBPSA/Electrical/PhaseSystems/ThreePhase_d.mo
index a39764423e..88c9715ba0 100644
--- a/IBPSA/Electrical/PhaseSystems/ThreePhase_d.mo
+++ b/IBPSA/Electrical/PhaseSystems/ThreePhase_d.mo
@@ -5,9 +5,9 @@ package ThreePhase_d "AC system covering only resistive loads with three symmetr
 
   redeclare function phaseVoltages "Return phase to neutral voltages"
     extends Modelica.Icons.Function;
-    input SI.Voltage V "system voltage";
-    input SI.Angle phi = 0 "phase angle";
-    output SI.Voltage v[n] "phase to neutral voltages";
+    input Modelica.Units.SI.Voltage V "system voltage";
+    input Modelica.Units.SI.Angle phi = 0 "phase angle";
+    output Modelica.Units.SI.Voltage v[n] "phase to neutral voltages";
   algorithm
     v := {V}/sqrt(3);
   end phaseVoltages;
@@ -16,8 +16,8 @@ package ThreePhase_d "AC system covering only resistive loads with three symmetr
   redeclare function systemVoltage
   "Return system voltage as function of phase voltages"
     extends Modelica.Icons.Function;
-    input SI.Voltage v[n];
-    output SI.Voltage V;
+    input Modelica.Units.SI.Voltage v[n];
+    output Modelica.Units.SI.Voltage V;
   algorithm
     V := sqrt(3)*v[1];
   end systemVoltage;
@@ -33,5 +33,14 @@ package ThreePhase_d "AC system covering only resistive loads with three symmetr
 This package declares the functions that are used to implement
 the AC three-phase balanced and purely resistive models.
 </p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.Units.</code> to relevant types.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+</li>
+</ul>
 </html>"));
 end ThreePhase_d;
diff --git a/IBPSA/Electrical/PhaseSystems/package.mo b/IBPSA/Electrical/PhaseSystems/package.mo
index 09e5014c65..af15584beb 100644
--- a/IBPSA/Electrical/PhaseSystems/package.mo
+++ b/IBPSA/Electrical/PhaseSystems/package.mo
@@ -1,9 +1,6 @@
 within IBPSA.Electrical;
 package PhaseSystems "Phase systems used in power connectors"
   extends Modelica.Icons.Package;
-  import      Modelica.Units.SI;
-  import Modelica.Constants.pi;
-
 
   annotation (Icon(graphics={Line(
           points={{-70,-52},{50,-52}},
@@ -64,6 +61,12 @@ Proc. of the 10th Modelica Conference, Lund, Sweden, March 2014.
 </html>", revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import</code> statements.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+</li>
+<li>
 May 27, 2014, by Marco Bonvini:<br/>
 Created documentation.
 </li>
diff --git a/IBPSA/Fluid/Actuators/Dampers/MixingBox.mo b/IBPSA/Fluid/Actuators/Dampers/MixingBox.mo
index 2c7c5739c2..19cf158a1e 100644
--- a/IBPSA/Fluid/Actuators/Dampers/MixingBox.mo
+++ b/IBPSA/Fluid/Actuators/Dampers/MixingBox.mo
@@ -6,7 +6,6 @@ model MixingBox "Outside air mixing box with interlocked air dampers"
     Modelica.Media.Interfaces.PartialMedium "Medium in the component"
       annotation (choices(
         choice(redeclare package Medium = IBPSA.Media.Air "Moist air")));
-  import Modelica.Constants;
 
   parameter Boolean allowFlowReversal = true
     "= false to simplify equations, assuming, but not enforcing, no flow reversal"
@@ -83,22 +82,22 @@ model MixingBox "Outside air mixing box with interlocked air dampers"
     annotation(Dialog(tab="Damper coefficients"));
 
   Modelica.Fluid.Interfaces.FluidPort_a port_Out(redeclare package Medium =
-        Medium, m_flow(start=0, min=if allowFlowReversal then -Constants.inf else
+        Medium, m_flow(start=0, min=if allowFlowReversal then -Modelica.Constants.inf else
                 0))
     "Fluid connector a (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_Exh(redeclare package Medium =
-        Medium, m_flow(start=0, max=if allowFlowReversal then +Constants.inf else
+        Medium, m_flow(start=0, max=if allowFlowReversal then +Modelica.Constants.inf else
                 0))
     "Fluid connector b (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{-90,-70},{-110,-50}})));
   Modelica.Fluid.Interfaces.FluidPort_a port_Ret(redeclare package Medium =
-        Medium, m_flow(start=0, min=if allowFlowReversal then -Constants.inf else
+        Medium, m_flow(start=0, min=if allowFlowReversal then -Modelica.Constants.inf else
                 0))
     "Fluid connector a (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{110,-70},{90,-50}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_Sup(redeclare package Medium =
-        Medium, m_flow(start=0, max=if allowFlowReversal then +Constants.inf else
+        Medium, m_flow(start=0, max=if allowFlowReversal then +Modelica.Constants.inf else
                 0))
     "Fluid connector b (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{110,50},{90,70}})));
@@ -298,6 +297,12 @@ defaultComponentName="eco",
 Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import</code> statement.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+</li>
+<li>
 September 21, 2021, by Michael Wetter:<br/>
 Corrected typo in comments.<br/>
 This is for
diff --git a/IBPSA/Fluid/BaseClasses/ActuatorFilter.mo b/IBPSA/Fluid/BaseClasses/ActuatorFilter.mo
index ad3eeef726..9402cd36a3 100644
--- a/IBPSA/Fluid/BaseClasses/ActuatorFilter.mo
+++ b/IBPSA/Fluid/BaseClasses/ActuatorFilter.mo
@@ -1,7 +1,6 @@
 within IBPSA.Fluid.BaseClasses;
 block ActuatorFilter
   "Filter used for actuators of valves, dampers and movers"
-  import Modelica.Blocks.Types.Init;
   extends Modelica.Blocks.Interfaces.SISO;
 
   constant Integer n=2 "Order of filter";
@@ -17,7 +16,7 @@ block ActuatorFilter
     annotation (Dialog(group="Initialization"));
   parameter Real y_start=0.0
     "Initial value of output (remaining states are in steady state)"
-    annotation(Dialog(enable=initType == Init.InitialOutput, group=
+    annotation(Dialog(enable=initType == Modelica.Blocks.Types.Init.InitialOutput, group=
           "Initialization"));
 
   parameter Real u_nominal = 1 "Magnitude of input";
@@ -37,11 +36,11 @@ protected
   Real s[n](start=x_start/u_nom) "Filter states";
 
 initial equation
-  if initType == Init.SteadyState then
+  if initType == Modelica.Blocks.Types.Init.SteadyState then
     der(s) = zeros(n);
-  elseif initType == Init.InitialState then
+  elseif initType == Modelica.Blocks.Types.Init.InitialState then
     s = x_start/u_nom;
-  elseif initType == Init.InitialOutput then
+  elseif initType == Modelica.Blocks.Types.Init.InitialOutput then
     y = y_start;
     der(s[1:n - 1]) = zeros(n - 1);
   end if;
@@ -100,6 +99,12 @@ for a discussion.
 </html>", revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import</code> statement.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+</li>
+<li>
 July 22, 2021, by Michael Wetter:<br/>
 First implementation for
 <a href=\"https://https://github.com/ibpsa/modelica-ibpsa/issues/1498\">IBPSA, #1498</a>
diff --git a/IBPSA/Fluid/HeatExchangers/BaseClasses/PartialEffectivenessNTU.mo b/IBPSA/Fluid/HeatExchangers/BaseClasses/PartialEffectivenessNTU.mo
index 18eadbbf77..78a45c8e9c 100644
--- a/IBPSA/Fluid/HeatExchangers/BaseClasses/PartialEffectivenessNTU.mo
+++ b/IBPSA/Fluid/HeatExchangers/BaseClasses/PartialEffectivenessNTU.mo
@@ -8,10 +8,8 @@ model PartialEffectivenessNTU
       Q2_flow = -Q1_flow,
       mWat1_flow = 0,
       mWat2_flow = 0);
-  import con = IBPSA.Fluid.Types.HeatExchangerConfiguration;
-  import flo = IBPSA.Fluid.Types.HeatExchangerFlowRegime;
 
-  parameter con configuration "Heat exchanger configuration"
+  parameter IBPSA.Fluid.Types.HeatExchangerConfiguration configuration "Heat exchanger configuration"
     annotation (Evaluate=true);
 
   constant Boolean use_dynamicFlowRegime = false
@@ -85,9 +83,9 @@ protected
     "Nominal temperature at port b1";
   parameter Modelica.Units.SI.Temperature T_b2_nominal(fixed=false)
     "Nominal temperature at port b2";
-  parameter flo flowRegime_nominal(fixed=false)
+  parameter IBPSA.Fluid.Types.HeatExchangerFlowRegime flowRegime_nominal(fixed=false)
     "Heat exchanger flow regime at nominal flow rates";
-  flo flowRegime(fixed=false, start=flowRegime_nominal)
+  IBPSA.Fluid.Types.HeatExchangerFlowRegime flowRegime(fixed=false, start=flowRegime_nominal)
     "Heat exchanger flow regime";
 initial equation
   assert(m1_flow_nominal > Modelica.Constants.eps,
@@ -131,22 +129,22 @@ initial equation
     "\n  CMin_flow_nominal = " + String(CMin_flow_nominal) +
     "\n  CMax_flow_nominal = " + String(CMax_flow_nominal));
   // Assign the flow regime for the given heat exchanger configuration and capacity flow rates
-  if (configuration == con.CrossFlowStream1MixedStream2Unmixed) then
-    flowRegime_nominal = if (C1_flow_nominal < C2_flow_nominal) then flo.CrossFlowCMinMixedCMaxUnmixed
-       else flo.CrossFlowCMinUnmixedCMaxMixed;
-  elseif (configuration == con.CrossFlowStream1UnmixedStream2Mixed) then
-    flowRegime_nominal = if (C1_flow_nominal < C2_flow_nominal) then flo.CrossFlowCMinUnmixedCMaxMixed
-       else flo.CrossFlowCMinMixedCMaxUnmixed;
-  elseif (configuration == con.ParallelFlow) then
-    flowRegime_nominal = flo.ParallelFlow;
-  elseif (configuration == con.CounterFlow) then
-    flowRegime_nominal = flo.CounterFlow;
-  elseif (configuration == con.CrossFlowUnmixed) then
-    flowRegime_nominal = flo.CrossFlowUnmixed;
+  if (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowStream1MixedStream2Unmixed) then
+    flowRegime_nominal = if (C1_flow_nominal < C2_flow_nominal) then IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinMixedCMaxUnmixed
+       else IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinUnmixedCMaxMixed;
+  elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowStream1UnmixedStream2Mixed) then
+    flowRegime_nominal = if (C1_flow_nominal < C2_flow_nominal) then IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinUnmixedCMaxMixed
+       else IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinMixedCMaxUnmixed;
+  elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.ParallelFlow) then
+    flowRegime_nominal = IBPSA.Fluid.Types.HeatExchangerFlowRegime.ParallelFlow;
+  elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CounterFlow) then
+    flowRegime_nominal = IBPSA.Fluid.Types.HeatExchangerFlowRegime.CounterFlow;
+  elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowUnmixed) then
+    flowRegime_nominal = IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowUnmixed;
   else
     // Invalid flow regime. Assign a value to flowRegime_nominal, and stop with an assert
-    flowRegime_nominal = flo.CrossFlowUnmixed;
-    assert(configuration >= con.ParallelFlow and configuration <= con.CrossFlowStream1UnmixedStream2Mixed,
+    flowRegime_nominal = IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowUnmixed;
+    assert(configuration >= IBPSA.Fluid.Types.HeatExchangerConfiguration.ParallelFlow and configuration <= IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowStream1UnmixedStream2Mixed,
       "Invalid heat exchanger configuration.");
   end if;
   // The equation sorter of Dymola 7.3 does not guarantee that the above assert is tested prior to the
@@ -161,19 +159,19 @@ initial equation
 equation
   // Assign the flow regime for the given heat exchanger configuration and capacity flow rates
   if use_dynamicFlowRegime then
-    if (configuration == con.ParallelFlow) then
-      flowRegime = if (C1_flow*C2_flow >= 0) then flo.ParallelFlow else flo.CounterFlow;
-    elseif (configuration == con.CounterFlow) then
-      flowRegime = if (C1_flow*C2_flow >= 0) then flo.CounterFlow else flo.ParallelFlow;
-    elseif (configuration == con.CrossFlowUnmixed) then
-      flowRegime = flo.CrossFlowUnmixed;
-    elseif (configuration == con.CrossFlowStream1MixedStream2Unmixed) then
-      flowRegime = if (C1_flow < C2_flow) then flo.CrossFlowCMinMixedCMaxUnmixed
-         else flo.CrossFlowCMinUnmixedCMaxMixed;
+    if (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.ParallelFlow) then
+      flowRegime = if (C1_flow*C2_flow >= 0) then IBPSA.Fluid.Types.HeatExchangerFlowRegime.ParallelFlow else IBPSA.Fluid.Types.HeatExchangerFlowRegime.CounterFlow;
+    elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CounterFlow) then
+      flowRegime = if (C1_flow*C2_flow >= 0) then IBPSA.Fluid.Types.HeatExchangerFlowRegime.CounterFlow else IBPSA.Fluid.Types.HeatExchangerFlowRegime.ParallelFlow;
+    elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowUnmixed) then
+      flowRegime = IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowUnmixed;
+    elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowStream1MixedStream2Unmixed) then
+      flowRegime = if (C1_flow < C2_flow) then IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinMixedCMaxUnmixed
+         else IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinUnmixedCMaxMixed;
     else
-      // have ( configuration == con.CrossFlowStream1UnmixedStream2Mixed)
-      flowRegime = if (C1_flow < C2_flow) then flo.CrossFlowCMinUnmixedCMaxMixed
-         else flo.CrossFlowCMinMixedCMaxUnmixed;
+      // have ( configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowStream1UnmixedStream2Mixed)
+      flowRegime = if (C1_flow < C2_flow) then IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinUnmixedCMaxMixed
+         else IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinMixedCMaxUnmixed;
     end if;
   else
     flowRegime = flowRegime_nominal;
@@ -253,6 +251,12 @@ for <code>UA</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import</code> statement.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+</li>
+<li>
 February 3, 2023, by Jianjun Hu:<br/>
 Added <code>noEvent()</code> in the assertion function to avoid Optimica to not converge.<br/>
 This is for
diff --git a/IBPSA/Fluid/HeatExchangers/BaseClasses/epsilon_ntuZ.mo b/IBPSA/Fluid/HeatExchangers/BaseClasses/epsilon_ntuZ.mo
index 05ef42a414..4d8658f02d 100644
--- a/IBPSA/Fluid/HeatExchangers/BaseClasses/epsilon_ntuZ.mo
+++ b/IBPSA/Fluid/HeatExchangers/BaseClasses/epsilon_ntuZ.mo
@@ -1,19 +1,18 @@
 within IBPSA.Fluid.HeatExchangers.BaseClasses;
 function epsilon_ntuZ
   "Computes heat exchanger effectiveness for given number of transfer units and heat exchanger flow regime"
-  import f = IBPSA.Fluid.Types.HeatExchangerFlowRegime;
   input Real NTU "Number of transfer units";
   input Real Z(min=0, max=1) "Ratio of capacity flow rate (CMin/CMax)";
   input Integer flowRegime
-    "Heat exchanger flow regime, see  IBPSA.Fluid.Types.HeatExchangerFlowRegime";
+    "Heat exchanger flow regime, see IBPSA.Fluid.Types.HeatExchangerFlowRegime";
   output Real eps(min=0, max=1) "Heat exchanger effectiveness";
 protected
   Real a "Auxiliary variable";
 algorithm
-  if (flowRegime == Integer(f.ParallelFlow)) then // parallel flow
+  if (flowRegime == Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.ParallelFlow)) then // parallel flow
     a := 0;
     eps := (1 - Modelica.Math.exp(-NTU*(1 + Z)))/(1 + Z);
-  elseif (flowRegime == Integer(f.CounterFlow)) then// counter flow
+  elseif (flowRegime == Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.CounterFlow)) then// counter flow
    // a is constraining Z since eps is not defined for Z=1.
     a := smooth(1, if Z < 0.97 then Z else
       IBPSA.Utilities.Math.Functions.smoothMin(
@@ -22,18 +21,18 @@ algorithm
       deltaX=0.01));
     eps := (1 - Modelica.Math.exp(-NTU*(1 - a)))/(1 - a*Modelica.Math.exp(-NTU*(
       1 - a)));
-  elseif (flowRegime == Integer(f.CrossFlowUnmixed)) then
+  elseif (flowRegime == Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowUnmixed)) then
    a := NTU^(-0.22);
     eps := 1 - Modelica.Math.exp( ( Modelica.Math.exp( - NTU * Z * a)  - 1)  / (Z * a));
-  elseif (flowRegime == Integer(f.CrossFlowCMinUnmixedCMaxMixed)) then
+  elseif (flowRegime == Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinUnmixedCMaxMixed)) then
     // cross flow, (single pass), CMax mixed, CMin unmixed. (Coil with one row.)
     a := 0;
     eps := (1 - Modelica.Math.exp(-Z*(1 - Modelica.Math.exp(-NTU))))/Z;
-  elseif (flowRegime == Integer(f.CrossFlowCMinMixedCMaxUnmixed)) then
+  elseif (flowRegime == Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinMixedCMaxUnmixed)) then
     // cross flow, (single pass), CMin mixed, CMax unmixed.
     a := 0;
     eps := 1 - Modelica.Math.exp(-(1 - Modelica.Math.exp(-Z*NTU))/Z);
-  elseif (flowRegime == Integer(f.ConstantTemperaturePhaseChange)) then
+  elseif (flowRegime == Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.ConstantTemperaturePhaseChange)) then
     // one side is experiencing constant temperature phase change
     // Z is unused
     a := 0;
@@ -41,8 +40,8 @@ algorithm
   else
     a := 0;
     eps := 0;
-    assert(Integer(f.ParallelFlow) <= flowRegime and
-           flowRegime <= Integer(f.ConstantTemperaturePhaseChange),
+    assert(Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.ParallelFlow) <= flowRegime and
+           flowRegime <= Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.ConstantTemperaturePhaseChange),
            "Flow regime is not implemented.");
   end if;
   annotation(preferredView="info",
@@ -59,6 +58,12 @@ IBPSA.Fluid.Types.HeatExchangerFlowRegime</a>.
 revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import</code> statement.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+</li>
+<li>
 September 28, 2016, by Massimo Cimmino:<br/>
 Added case for constant temperature phase change on one side of
 the heat exchanger.
diff --git a/IBPSA/Fluid/HeatExchangers/BaseClasses/ntu_epsilonZ.mo b/IBPSA/Fluid/HeatExchangers/BaseClasses/ntu_epsilonZ.mo
index ecff8f9806..6ecfb45645 100644
--- a/IBPSA/Fluid/HeatExchangers/BaseClasses/ntu_epsilonZ.mo
+++ b/IBPSA/Fluid/HeatExchangers/BaseClasses/ntu_epsilonZ.mo
@@ -1,7 +1,6 @@
 within IBPSA.Fluid.HeatExchangers.BaseClasses;
 function ntu_epsilonZ
   "Computes number of transfer units for given heat exchanger effectiveness and heat exchanger flow regime"
-  import f = IBPSA.Fluid.Types.HeatExchangerFlowRegime;
   input Real eps(min=0, max=0.999) "Heat exchanger effectiveness";
   input Real Z(min=0, max=1) "Ratio of capacity flow rate (CMin/CMax)";
   input Integer flowRegime
@@ -27,7 +26,7 @@ protected
   end epsilon_ntuZ_crossFlowUnmixed;
 
 algorithm
-  if (flowRegime == Integer(f.ParallelFlow)) then // parallel flow
+  if (flowRegime == Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.ParallelFlow)) then // parallel flow
     a := Z+1;
     assert(eps < 1/a,
       "Invalid input data. eps > 1/(1+Z) is physically not possible for parallel flow.
@@ -35,7 +34,7 @@ algorithm
              Z = " + String(Z) + "
        1/(Z+1) = " + String(1/a));
     NTU := -(Modelica.Math.log(1-eps*a))/(a);
-  elseif (flowRegime == Integer(f.CounterFlow)) then// counter flow
+  elseif (flowRegime == Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.CounterFlow)) then// counter flow
    // a is constraining Z since eps is not defined for Z=1.
     a := smooth(1, if Z < 0.97 then Z else
       IBPSA.Utilities.Math.Functions.smoothMin(
@@ -44,7 +43,7 @@ algorithm
       deltaX=0.01));
     NTU := Modelica.Math.log((1-eps)/(1-eps*a)) / (a-1);
 
-  elseif (flowRegime == Integer(f.CrossFlowUnmixed)) then
+  elseif (flowRegime == Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowUnmixed)) then
     a := 0;
     // The function Internal.solve evaluates epsilon_ntuZ at NTU=x_min-1e-10 and NTU=x_max+1e-10
     // when it solves iteratively epsilon_ntuZ for ntu
@@ -53,7 +52,7 @@ algorithm
       f=function epsilon_ntuZ_crossFlowUnmixed(eps=eps, Z=Z),
       u_min=1.5*1e-10,
       u_max=1e6);
-  elseif (flowRegime == Integer(f.CrossFlowCMinUnmixedCMaxMixed)) then
+  elseif (flowRegime == Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinUnmixedCMaxMixed)) then
     // cross flow, (single pass), CMax mixed, CMin unmixed. (Coil with one row.)
    a := smooth(1, if Z > 0.03 then Z else
       IBPSA.Utilities.Math.Functions.smoothMin(
@@ -61,7 +60,7 @@ algorithm
       x2=Z,
       deltaX=0.01));
     NTU := -Modelica.Math.log(1+(Modelica.Math.log(1-eps*a)/a));
-  elseif (flowRegime == Integer(f.CrossFlowCMinMixedCMaxUnmixed)) then
+  elseif (flowRegime == Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinMixedCMaxUnmixed)) then
     // cross flow, (single pass), CMin mixed, CMax unmixed.
    a := smooth(1, if Z > 0.03 then Z else
       IBPSA.Utilities.Math.Functions.smoothMin(
@@ -69,7 +68,7 @@ algorithm
       x2=Z,
       deltaX=0.01));
     NTU := -Modelica.Math.log(1+Z*Modelica.Math.log(1-eps))/Z;
-  elseif (flowRegime == Integer(f.ConstantTemperaturePhaseChange)) then
+  elseif (flowRegime == Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.ConstantTemperaturePhaseChange)) then
     // one side is experiencing constant temperature phase change
     // Z is unused
     a := 0;
@@ -77,8 +76,8 @@ algorithm
   else
     a := 0;
     NTU := 0;
-    assert(Integer(f.ParallelFlow) <= flowRegime and
-           flowRegime <= Integer(f.ConstantTemperaturePhaseChange),
+    assert(Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.ParallelFlow) <= flowRegime and
+           flowRegime <= Integer(IBPSA.Fluid.Types.HeatExchangerFlowRegime.ConstantTemperaturePhaseChange),
            "Flow regime is not implemented.");
   end if;
 
@@ -102,6 +101,12 @@ This is handled internally and not exposed to the global solver.
 revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import</code> statement.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+</li>
+<li>
 February 28, 2020, by Michael Wetter:<br/>
 Replaced call to <code>Media.Common.OneNonLinearEquation</code> to use
 <a href=\"modelica://Modelica.Math.Nonlinear.solveOneNonlinearEquation\">
diff --git a/IBPSA/Fluid/HeatExchangers/WetCoilEffectivenessNTU.mo b/IBPSA/Fluid/HeatExchangers/WetCoilEffectivenessNTU.mo
index 9f57a1abad..172b614719 100644
--- a/IBPSA/Fluid/HeatExchangers/WetCoilEffectivenessNTU.mo
+++ b/IBPSA/Fluid/HeatExchangers/WetCoilEffectivenessNTU.mo
@@ -7,9 +7,6 @@ model WetCoilEffectivenessNTU
     final computeFlowResistance1=true,
     final computeFlowResistance2=true);
 
-  import con = IBPSA.Fluid.Types.HeatExchangerConfiguration;
-  import flo = IBPSA.Fluid.Types.HeatExchangerFlowRegime;
-
   constant Boolean use_dynamicFlowRegime = false
     "If true, flow regime is determined using actual flow rates";
   // This switch is declared as a constant instead of a parameter
@@ -18,7 +15,7 @@ model WetCoilEffectivenessNTU
   //   See discussions in https://github.com/ibpsa/modelica-ibpsa/pull/1683
 
   parameter IBPSA.Fluid.Types.HeatExchangerConfiguration configuration=
-    con.CounterFlow
+    IBPSA.Fluid.Types.HeatExchangerConfiguration.CounterFlow
     "Heat exchanger configuration";
   parameter Real r_nominal=2/3
     "Ratio between air-side and water-side convective heat transfer coefficient";
@@ -220,9 +217,9 @@ protected
     IBPSA.Fluid.HeatExchangers.BaseClasses.determineWaterIndex(
       Medium2.substanceNames)
     "Index of water";
-  parameter flo flowRegime_nominal(fixed=false)
+  parameter IBPSA.Fluid.Types.HeatExchangerFlowRegime flowRegime_nominal(fixed=false)
     "Heat exchanger flow regime at nominal flow rates";
-  flo flowRegime(fixed=false, start=flowRegime_nominal)
+  IBPSA.Fluid.Types.HeatExchangerFlowRegime flowRegime(fixed=false, start=flowRegime_nominal)
     "Heat exchanger flow regime";
 
   Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHea
@@ -296,29 +293,29 @@ initial equation
   cp2_nominal = Medium2.specificHeatCapacityCp(sta2_default);
   C1_flow_nominal = m1_flow_nominal*cp1_nominal;
   C2_flow_nominal = m2_flow_nominal*cp2_nominal;
-  if (configuration == con.CrossFlowStream1MixedStream2Unmixed) then
+  if (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowStream1MixedStream2Unmixed) then
     flowRegime_nominal = if (C1_flow_nominal < C2_flow_nominal)
       then
-        flo.CrossFlowCMinMixedCMaxUnmixed
+        IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinMixedCMaxUnmixed
       else
-        flo.CrossFlowCMinUnmixedCMaxMixed;
-  elseif (configuration == con.CrossFlowStream1UnmixedStream2Mixed) then
+        IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinUnmixedCMaxMixed;
+  elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowStream1UnmixedStream2Mixed) then
     flowRegime_nominal = if (C1_flow_nominal < C2_flow_nominal)
       then
-        flo.CrossFlowCMinUnmixedCMaxMixed
+        IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinUnmixedCMaxMixed
       else
-        flo.CrossFlowCMinMixedCMaxUnmixed;
-  elseif (configuration == con.ParallelFlow) then
-    flowRegime_nominal = flo.ParallelFlow;
-  elseif (configuration == con.CounterFlow) then
-    flowRegime_nominal = flo.CounterFlow;
-  elseif (configuration == con.CrossFlowUnmixed) then
-    flowRegime_nominal = flo.CrossFlowUnmixed;
+        IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinMixedCMaxUnmixed;
+  elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.ParallelFlow) then
+    flowRegime_nominal = IBPSA.Fluid.Types.HeatExchangerFlowRegime.ParallelFlow;
+  elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CounterFlow) then
+    flowRegime_nominal = IBPSA.Fluid.Types.HeatExchangerFlowRegime.CounterFlow;
+  elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowUnmixed) then
+    flowRegime_nominal = IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowUnmixed;
   else
     // Invalid flow regime. Assign a value to flowRegime_nominal, and stop with an assert
-    flowRegime_nominal = flo.CrossFlowUnmixed;
-    assert(configuration >= con.ParallelFlow and
-      configuration <= con.CrossFlowStream1UnmixedStream2Mixed,
+    flowRegime_nominal = IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowUnmixed;
+    assert(configuration >= IBPSA.Fluid.Types.HeatExchangerConfiguration.ParallelFlow and
+      configuration <= IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowStream1UnmixedStream2Mixed,
       "Invalid heat exchanger configuration.");
   end if;
 
@@ -326,33 +323,33 @@ equation
   // Assign the flow regime for the given heat exchanger configuration and
   // mass flow rates
   if use_dynamicFlowRegime then
-    if (configuration == con.ParallelFlow) then
+    if (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.ParallelFlow) then
       flowRegime = if (C1_flow*C2_flow >= 0)
         then
-          flo.ParallelFlow
+          IBPSA.Fluid.Types.HeatExchangerFlowRegime.ParallelFlow
         else
-          flo.CounterFlow;
-    elseif (configuration == con.CounterFlow) then
+          IBPSA.Fluid.Types.HeatExchangerFlowRegime.CounterFlow;
+    elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CounterFlow) then
       flowRegime = if (C1_flow*C2_flow >= 0)
         then
-          flo.CounterFlow
+          IBPSA.Fluid.Types.HeatExchangerFlowRegime.CounterFlow
         else
-          flo.ParallelFlow;
-    elseif (configuration == con.CrossFlowUnmixed) then
-      flowRegime = flo.CrossFlowUnmixed;
-    elseif (configuration == con.CrossFlowStream1MixedStream2Unmixed) then
+          IBPSA.Fluid.Types.HeatExchangerFlowRegime.ParallelFlow;
+    elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowUnmixed) then
+      flowRegime = IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowUnmixed;
+    elseif (configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowStream1MixedStream2Unmixed) then
       flowRegime = if (C1_flow < C2_flow)
         then
-          flo.CrossFlowCMinMixedCMaxUnmixed
+          IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinMixedCMaxUnmixed
         else
-          flo.CrossFlowCMinUnmixedCMaxMixed;
+          IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinUnmixedCMaxMixed;
     else
-      // have ( configuration == con.CrossFlowStream1UnmixedStream2Mixed)
+      // have ( configuration == IBPSA.Fluid.Types.HeatExchangerConfiguration.CrossFlowStream1UnmixedStream2Mixed)
       flowRegime = if (C1_flow < C2_flow)
         then
-          flo.CrossFlowCMinUnmixedCMaxMixed
+          IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinUnmixedCMaxMixed
         else
-          flo.CrossFlowCMinMixedCMaxUnmixed;
+          IBPSA.Fluid.Types.HeatExchangerFlowRegime.CrossFlowCMinMixedCMaxUnmixed;
     end if;
   else
     flowRegime = flowRegime_nominal;
@@ -653,6 +650,12 @@ Fuzzy identification of systems and its applications to modeling and control.
 </html>",                    revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import</code> statement.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+</li>
+<li>
 February 3, 2023, by Jianjun Hu:<br/>
 Added <code>noEvent()</code> in the assertion function to avoid Optimica to not converge.<br/>
 This is for
diff --git a/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo b/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
index 1114cfb886..f39daf124b 100644
--- a/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
+++ b/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
@@ -3,8 +3,6 @@ model FlowMachineInterface
   "Partial model with performance curves for fans or pumps"
   extends Modelica.Blocks.Icons.Block;
 
-  import cha = IBPSA.Fluid.Movers.BaseClasses.Characteristics;
-
   constant Boolean homotopyInitialization = true "= true, use homotopy method"
     annotation(HideResult=true);
 
@@ -469,28 +467,28 @@ equation
   // pCur1, pCur2 or pCur3, and preDer1, preDer2 or preDer3
   if (curve == 1) then
     if homotopyInitialization then
-       V_flow*kRes + dp_internal = homotopy(actual=cha.pressure(
+       V_flow*kRes + dp_internal = homotopy(actual=IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(
                                                      V_flow=V_flow,
                                                      r_N=r_N,
                                                      dpMax=dpMax,
                                                      V_flow_max=V_flow_max,
                                                      d=preDer1,
                                                      per=pCur1),
-                                           simplified=r_N * (cha.pressure(
+                                           simplified=r_N * (IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(
                                                      V_flow=V_flow_nominal,
                                                      r_N=1,
                                                      dpMax=dpMax,
                                                      V_flow_max=V_flow_max,
                                                      d=preDer1,
                                                      per=pCur1)
-                               +(V_flow-V_flow_nominal) * (cha.pressure(
+                               +(V_flow-V_flow_nominal) * (IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(
                                                      V_flow=(1+delta)*V_flow_nominal,
                                                      r_N=1,
                                                      dpMax=dpMax,
                                                      V_flow_max=V_flow_max,
                                                      d=preDer1,
                                                      per=pCur1)
-                                       -cha.pressure(V_flow=(1-delta)*V_flow_nominal,
+                                       -IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(V_flow=(1-delta)*V_flow_nominal,
                                                      r_N=1,
                                                      dpMax=dpMax,
                                                      V_flow_max=V_flow_max,
@@ -499,7 +497,7 @@ equation
                                                     /(2*delta*V_flow_nominal)));
 
     else
-       V_flow*kRes + dp_internal= cha.pressure(V_flow=V_flow,
+       V_flow*kRes + dp_internal= IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(V_flow=V_flow,
                                                r_N=r_N,
                                                dpMax=dpMax,
                                                      V_flow_max=V_flow_max,
@@ -508,28 +506,28 @@ equation
     end if;     // end of computation for this branch
    elseif (curve == 2) then
     if homotopyInitialization then
-       V_flow*kRes + dp_internal = homotopy(actual=cha.pressure(
+       V_flow*kRes + dp_internal = homotopy(actual=IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(
                                                      V_flow=V_flow,
                                                      r_N=r_N,
                                                      dpMax=dpMax,
                                                      V_flow_max=V_flow_max,
                                                      d=preDer2,
                                                      per=pCur2),
-                                            simplified=r_N * (cha.pressure(
+                                            simplified=r_N * (IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(
                                                      V_flow=V_flow_nominal,
                                                      r_N=1,
                                                      dpMax=dpMax,
                                                      V_flow_max=V_flow_max,
                                                      d=preDer2,
                                                      per=pCur2)
-                               +(V_flow-V_flow_nominal) * (cha.pressure(
+                               +(V_flow-V_flow_nominal) * (IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(
                                                      V_flow=(1+delta)*V_flow_nominal,
                                                      r_N=1,
                                                      dpMax=dpMax,
                                                      V_flow_max=V_flow_max,
                                                      d=preDer2,
                                                      per=pCur2)
-                                       -cha.pressure(V_flow=(1-delta)*V_flow_nominal,
+                                       -IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(V_flow=(1-delta)*V_flow_nominal,
                                                      r_N=1,
                                                      dpMax=dpMax,
                                                      V_flow_max=V_flow_max,
@@ -538,7 +536,7 @@ equation
                                                     /(2*delta*V_flow_nominal)));
 
     else
-       V_flow*kRes + dp_internal= cha.pressure(V_flow=V_flow,
+       V_flow*kRes + dp_internal= IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(V_flow=V_flow,
                                                       r_N=r_N,
                                                       dpMax=dpMax,
                                                       V_flow_max=V_flow_max,
@@ -547,14 +545,14 @@ equation
     end if;     // end of computation for this branch
   else
     if homotopyInitialization then
-       V_flow*kRes + dp_internal = homotopy(actual=cha.pressure(
+       V_flow*kRes + dp_internal = homotopy(actual=IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(
                                                      V_flow=V_flow,
                                                      r_N=r_N,
                                                      dpMax=dpMax,
                                                      V_flow_max=V_flow_max,
                                                      d=preDer3,
                                                      per=pCur3),
-                          simplified=r_N * (cha.pressure(
+                          simplified=r_N * (IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(
                                                      V_flow=V_flow_nominal,
                                                      r_N=1,
                                                      dpMax=dpMax,
@@ -562,13 +560,13 @@ equation
                                                      d=preDer3,
                                                      per=pCur3)
                                +(V_flow-V_flow_nominal)*
-                                       (cha.pressure(V_flow=(1+delta)*V_flow_nominal,
+                                       (IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(V_flow=(1+delta)*V_flow_nominal,
                                                      r_N=1,
                                                      dpMax=dpMax,
                                                      V_flow_max=V_flow_max,
                                                      d=preDer3,
                                                      per=pCur3)
-                                       -cha.pressure(V_flow=(1-delta)*V_flow_nominal,
+                                       -IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(V_flow=(1-delta)*V_flow_nominal,
                                                      r_N=1,
                                                      dpMax=dpMax,
                                                      V_flow_max=V_flow_max,
@@ -577,7 +575,7 @@ equation
                                                     /(2*delta*V_flow_nominal)));
 
     else
-       V_flow*kRes + dp_internal= cha.pressure(V_flow=V_flow,
+       V_flow*kRes + dp_internal= IBPSA.Fluid.Movers.BaseClasses.Characteristics.pressure(V_flow=V_flow,
                                                       r_N=r_N,
                                                       dpMax=dpMax,
                                                       V_flow_max=V_flow_max,
@@ -618,31 +616,31 @@ equation
   if per.etaHydMet==
        IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate then
     if homotopyInitialization then
-      P_internal = homotopy(actual=cha.power(per=per.power, V_flow=V_flow, r_N=r_N, d=powDer, delta=delta),
+      P_internal = homotopy(actual=IBPSA.Fluid.Movers.BaseClasses.Characteristics.power(per=per.power, V_flow=V_flow, r_N=r_N, d=powDer, delta=delta),
                       simplified=V_flow/V_flow_nominal*
-                            cha.power(per=per.power, V_flow=V_flow_nominal, r_N=1, d=powDer, delta=delta));
+                            IBPSA.Fluid.Movers.BaseClasses.Characteristics.power(per=per.power, V_flow=V_flow_nominal, r_N=1, d=powDer, delta=delta));
     else
-      P_internal = (rho/rho_default)*cha.power(per=per.power, V_flow=V_flow, r_N=r_N, d=powDer, delta=delta);
+      P_internal = (rho/rho_default)*IBPSA.Fluid.Movers.BaseClasses.Characteristics.power(per=per.power, V_flow=V_flow, r_N=r_N, d=powDer, delta=delta);
     end if;
     eta_internal = WFlo/IBPSA.Utilities.Math.Functions.smoothMax(
                      x1=P_internal, x2=deltaP, deltaX=deltaP/2);
   elseif per.etaHydMet==
        IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber then
     if homotopyInitialization then
-      P_internal = homotopy(actual=cha.power(per=powEu, V_flow=V_flow, r_N=r_N, d=powEuDer, delta=delta),
+      P_internal = homotopy(actual=IBPSA.Fluid.Movers.BaseClasses.Characteristics.power(per=powEu, V_flow=V_flow, r_N=r_N, d=powEuDer, delta=delta),
                       simplified=V_flow/V_flow_nominal*
-                            cha.power(per=powEu, V_flow=V_flow_nominal, r_N=1, d=powEuDer, delta=delta));
+                            IBPSA.Fluid.Movers.BaseClasses.Characteristics.power(per=powEu, V_flow=V_flow_nominal, r_N=1, d=powEuDer, delta=delta));
     else
-      P_internal = (rho/rho_default)*cha.power(per=powEu, V_flow=V_flow, r_N=r_N, d=powEuDer, delta=delta);
+      P_internal = (rho/rho_default)*IBPSA.Fluid.Movers.BaseClasses.Characteristics.power(per=powEu, V_flow=V_flow, r_N=r_N, d=powEuDer, delta=delta);
     end if;
     eta_internal = WFlo / IBPSA.Utilities.Math.Functions.smoothMax(
                             x1=P_internal, x2=deltaP, deltaX=deltaP/2);
   elseif per.etaHydMet == IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Efficiency_VolumeFlowRate then
     if homotopyInitialization then
-      eta_internal = homotopy(actual=cha.efficiency(per=per.efficiency,     V_flow=V_flow, d=etaDer, r_N=r_N, delta=delta),
-                        simplified=cha.efficiency(per=per.efficiency, V_flow=V_flow_max,   d=etaDer, r_N=r_N, delta=delta));
+      eta_internal = homotopy(actual=IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency(per=per.efficiency,     V_flow=V_flow, d=etaDer, r_N=r_N, delta=delta),
+                        simplified=IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency(per=per.efficiency, V_flow=V_flow_max,   d=etaDer, r_N=r_N, delta=delta));
     else
-      eta_internal = cha.efficiency(per=per.efficiency, V_flow=V_flow, d=etaDer, r_N=r_N, delta=delta);
+      eta_internal = IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency(per=per.efficiency, V_flow=V_flow, d=etaDer, r_N=r_N, delta=delta);
     end if;
     P_internal=WFlo/IBPSA.Utilities.Math.Functions.smoothMax(
                       x1=eta_internal, x2=1E-2, deltaX=1E-3);
@@ -658,23 +656,23 @@ equation
   // Motor efficiency etaMot
   if per.etaMotMet == IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_VolumeFlowRate then
     if homotopyInitialization then
-      etaMot = homotopy(actual=cha.efficiency(per=per.motorEfficiency,     V_flow=V_flow, d=motDer, r_N=r_N, delta=delta),
-                        simplified=cha.efficiency(per=per.motorEfficiency, V_flow=V_flow_max,   d=motDer, r_N=r_N, delta=delta));
+      etaMot = homotopy(actual=IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency(per=per.motorEfficiency,     V_flow=V_flow, d=motDer, r_N=r_N, delta=delta),
+                        simplified=IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency(per=per.motorEfficiency, V_flow=V_flow_max,   d=motDer, r_N=r_N, delta=delta));
     else
-      etaMot = cha.efficiency(per=per.motorEfficiency,     V_flow=V_flow, d=motDer, r_N=r_N, delta=delta);
+      etaMot = IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency(per=per.motorEfficiency,     V_flow=V_flow, d=motDer, r_N=r_N, delta=delta);
     end if;
   elseif per.etaMotMet==
        IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio then
     if homotopyInitialization then
-      etaMot =homotopy(actual=cha.efficiency_yMot(
+      etaMot =homotopy(actual=IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency_yMot(
         per=per.motorEfficiency_yMot,
         y=yMot,
-        d=motDer_yMot), simplified=cha.efficiency_yMot(
+        d=motDer_yMot), simplified=IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency_yMot(
         per=per.motorEfficiency_yMot,
         y=1,
         d=motDer_yMot));
     else
-      etaMot =cha.efficiency_yMot(
+      etaMot =IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency_yMot(
         per=per.motorEfficiency_yMot,
         y=yMot,
         d=motDer_yMot);
@@ -682,15 +680,15 @@ equation
   elseif per.etaMotMet==
        IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve then
       if homotopyInitialization then
-        etaMot =homotopy(actual=cha.efficiency_yMot(
+        etaMot =homotopy(actual=IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency_yMot(
           per=per.motorEfficiency_yMot_generic,
           y=yMot,
-          d=motDer_yMot_generic), simplified=cha.efficiency_yMot(
+          d=motDer_yMot_generic), simplified=IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency_yMot(
           per=per.motorEfficiency_yMot_generic,
           y=1,
           d=motDer_yMot_generic));
       else
-        etaMot =cha.efficiency_yMot(
+        etaMot =IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency_yMot(
           per=per.motorEfficiency_yMot_generic,
           y=yMot,
           d=motDer_yMot_generic);
@@ -861,6 +859,12 @@ See discussions and an example of this situation in
 revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import</code> statement.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+</li>
+<li>
 May 15, 2024, by Hongxiang Fu:<br/>
 Corrected efficiency equations if
 <code>powerOrEfficiencyIsHydraulic=false</code>
@@ -935,7 +939,7 @@ for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/404\">#404</a>.
 <li>
 September 2, 2015, by Michael Wetter:<br/>
 Corrected computation of
-<code>etaMot = cha.efficiency(per=per.motorEfficiency, V_flow=V_flow, d=motDer, r_N=r_N, delta=1E-4)</code>
+<code>etaMot = IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiency(per=per.motorEfficiency, V_flow=V_flow, d=motDer, r_N=r_N, delta=1E-4)</code>
 which previously used <code>V_flow_max</code> instead of <code>V_flow</code>.
 </li>
 <li>
diff --git a/IBPSA/Fluid/SolarCollectors/Validation/EN12975_Array.mo b/IBPSA/Fluid/SolarCollectors/Validation/EN12975_Array.mo
index 7bbe133b7a..07304e38c2 100644
--- a/IBPSA/Fluid/SolarCollectors/Validation/EN12975_Array.mo
+++ b/IBPSA/Fluid/SolarCollectors/Validation/EN12975_Array.mo
@@ -28,16 +28,19 @@ model EN12975_Array
     nPanels=4,
     nSeg=3,
     sysConfig=IBPSA.Fluid.SolarCollectors.Types.SystemConfiguration.Array,
-    nPanelsSer=2,
     nPanelsPar=2)
     "Flat plate solar collector model, has been modified for validation purposes"
     annotation (Placement(transformation(extent={{-20,20},{0,40}})));
 
-  Collector solCol1(nSeg=3, nPanels=2)
+  Collector solCol1(
+    nSeg=3,
+    nPanels=2)
     "Flat plate solar collector model, has been modified for validation purposes"
     annotation (Placement(transformation(extent={{-50,-40},{-30,-20}})));
 
-  Collector solCol2(nSeg=3, nPanels=2)
+  Collector solCol2(
+    nSeg=3,
+    nPanels=2)
     "Flat plate solar collector model, has been modified for validation purposes"
     annotation (Placement(transformation(extent={{-50,-80},{-30,-60}})));
 
@@ -147,6 +150,12 @@ Furthermore, the pressure drops over all models should be the same.
 </html>", revisions="<html>
 <ul>
 <li>
+February 11, 2025, by Michael Wetter:<br/>
+Removed parameter assignment for parameter that no longer exists.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1968\">IBPSA, #1968</a>.
+</li>
+<li>
 February 27, 2024, by Jelger Jansen:<br/>
 First implementation.<br/>
 This is for
diff --git a/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo b/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo
index 64ca1eb38c..f41a1c81f1 100644
--- a/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo
+++ b/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo
@@ -3,9 +3,6 @@ model PartialStratified
   "Partial model of a stratified tank for thermal energy storage"
   extends IBPSA.Fluid.Storage.BaseClasses.PartialTwoPortInterface;
 
-  import Modelica.Fluid.Types;
-  import Modelica.Fluid.Types.Dynamics;
-
   parameter Modelica.Units.SI.Volume VTan "Tank volume";
   parameter Modelica.Units.SI.Length hTan "Height of tank (without insulation)";
   parameter Modelica.Units.SI.Length dIns "Thickness of insulation";
@@ -15,7 +12,7 @@ model PartialStratified
 
   ////////////////////////////////////////////////////////////////////
   // Assumptions
-  parameter Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
     "Formulation of energy balance"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Conservation equations"));
 
@@ -207,6 +204,12 @@ IBPSA.Fluid.Storage.BaseClasses.ThirdOrderStratifier</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import</code> statement.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+</li>
+<li>
 March 7, 2022, by Michael Wetter:<br/>
 Set <code>final massDynamics=energyDynamics</code>.<br/>
 This is for
diff --git a/IBPSA/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo b/IBPSA/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo
index 6cb6e67bdd..3c0e41f416 100644
--- a/IBPSA/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo
+++ b/IBPSA/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo
@@ -2,7 +2,6 @@ within IBPSA.ThermalZones.ReducedOrder.SolarGain;
 model CorrectionGDoublePane
   "Double pane window solar correction"
   extends BaseClasses.PartialCorrectionG;
-  import con = Modelica.Units.Conversions;
 
   // Parameters for the transmission correction factor based on VDI 6007 Part 3
   // A0 to A6 are experimental constants VDI 6007 Part 3 page 20
@@ -87,8 +86,8 @@ protected
 
 equation
   for i in 1:n loop
-    Ta_dir[i]= (((((A6*con.to_deg(inc[i])+A5)*con.to_deg(inc[i])+A4)*con.to_deg(inc[i])+A3)*
-    con.to_deg(inc[i])+A2)*con.to_deg(inc[i])+A1)*con.to_deg(inc[i])+A0;
+    Ta_dir[i]= (((((A6*Modelica.Units.Conversions.to_deg(inc[i])+A5)*Modelica.Units.Conversions.to_deg(inc[i])+A4)*Modelica.Units.Conversions.to_deg(inc[i])+A3)*
+    Modelica.Units.Conversions.to_deg(inc[i])+A2)*Modelica.Units.Conversions.to_deg(inc[i])+A1)*Modelica.Units.Conversions.to_deg(inc[i])+A0;
     Tai_dir[i]= 0.907^(1/sqrt(1-(sin(inc[i])/1.515)^2));
     Ta1_dir[i]= Ta_dir[i]*Tai_dir[i];
     rho_T1_dir[i]= 1-Ta_dir[i];
@@ -129,6 +128,12 @@ equation
   revisions="<html>
   <ul>
   <li>
+  February 7, 2025, by Jelger Jansen:<br/>
+  Removed <code>import</code> statement.
+  This is for
+  <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
+  </li>
+  <li>
   September 12, 2015 by Moritz Lauster:<br/>
   Adapted to Annex 60 requirements.
   </li>
