diff --git a/src/EnergyPlus/ExtendedHI.cc b/src/EnergyPlus/ExtendedHI.cc
index e2ac01610ce..5aea944b603 100644
--- a/src/EnergyPlus/ExtendedHI.cc
+++ b/src/EnergyPlus/ExtendedHI.cc
@@ -62,9 +62,9 @@
 #include <cmath>
 
 #include <EnergyPlus/Data/EnergyPlusData.hh>
+#include <EnergyPlus/ExtendedHI.hh>
 #include <EnergyPlus/General.hh>
 #include <EnergyPlus/HVACSystemRootFindingAlgorithm.hh>
-#include <EnergyPlus/ExtendedHI.hh>
 
 namespace EnergyPlus {
 
diff --git a/src/EnergyPlus/HeatBalanceSurfaceManager.cc b/src/EnergyPlus/HeatBalanceSurfaceManager.cc
index 8b1ba3f0893..e199405c87a 100644
--- a/src/EnergyPlus/HeatBalanceSurfaceManager.cc
+++ b/src/EnergyPlus/HeatBalanceSurfaceManager.cc
@@ -87,6 +87,7 @@
 #include <EnergyPlus/DisplayRoutines.hh>
 #include <EnergyPlus/EcoRoofManager.hh>
 #include <EnergyPlus/ElectricBaseboardRadiator.hh>
+#include <EnergyPlus/ExtendedHI.hh>
 #include <EnergyPlus/FileSystem.hh>
 #include <EnergyPlus/General.hh>
 #include <EnergyPlus/HWBaseboardRadiator.hh>
@@ -119,7 +120,6 @@
 #include <EnergyPlus/WindowManagerExteriorData.hh>
 #include <EnergyPlus/WindowManagerExteriorThermal.hh>
 #include <EnergyPlus/ZoneTempPredictorCorrector.hh>
-#include <EnergyPlus/ExtendedHI.hh>
 #include <WCECommon.hpp>
 #include <WCEMultiLayerOptics.hpp>
 #include <WCESingleLayerOptics.hpp>
diff --git a/tst/EnergyPlus/unit/ExtendedHI.unit.cc b/tst/EnergyPlus/unit/ExtendedHI.unit.cc
index 22a96d59a50..f6d9ca57694 100644
--- a/tst/EnergyPlus/unit/ExtendedHI.unit.cc
+++ b/tst/EnergyPlus/unit/ExtendedHI.unit.cc
@@ -56,8 +56,8 @@
 // EnergyPlus Headers
 #include "Fixtures/EnergyPlusFixture.hh"
 #include <EnergyPlus/Data/EnergyPlusData.hh>
-#include <EnergyPlus/HVACSystemRootFindingAlgorithm.hh>
 #include <EnergyPlus/ExtendedHI.hh>
+#include <EnergyPlus/HVACSystemRootFindingAlgorithm.hh>
 
 using namespace EnergyPlus;
 using namespace ExtendedHI;