diff --git a/openstudiocore/src/model/CMakeLists.txt b/openstudiocore/src/model/CMakeLists.txt
index 8f0dda90c20..ff87b69eeeb 100644
--- a/openstudiocore/src/model/CMakeLists.txt
+++ b/openstudiocore/src/model/CMakeLists.txt
@@ -2080,7 +2080,7 @@ list(APPEND OpenStudioModelSwigs OpenStudioModelAvailabilityManager)
 MAKE_SWIG_TARGET(OpenStudioModelPlantEquipmentOperationScheme model "${CMAKE_CURRENT_SOURCE_DIR}/ModelPlantEquipmentOperationScheme.i" "${${target_name}_swig_src}" ${swig_target_name} OpenStudioModelHVAC)
 list(APPEND OpenStudioModelSwigs OpenStudioModelPlantEquipmentOperationScheme)
 
-MAKE_SWIG_TARGET(OpenStudioModelStraightComponent model "${CMAKE_CURRENT_SOURCE_DIR}/ModelStraightComponent.i" "${${target_name}_swig_src}" ${swig_target_name} OpenStudioModelHVAC)
+MAKE_SWIG_TARGET(OpenStudioModelStraightComponent model "${CMAKE_CURRENT_SOURCE_DIR}/ModelStraightComponent.i" "${${target_name}_swig_src}" ${swig_target_name} OpenStudioModelZoneHVAC)
 list(APPEND OpenStudioModelSwigs OpenStudioModelStraightComponent)
 
 MAKE_SWIG_TARGET(OpenStudioModelAirflow model "${CMAKE_CURRENT_SOURCE_DIR}/ModelAirflow.i" "${${target_name}_swig_src}" ${swig_target_name} OpenStudioModelHVAC)
diff --git a/openstudiocore/src/model/ModelStraightComponent.i b/openstudiocore/src/model/ModelStraightComponent.i
index b5391a2b135..65fe15505a2 100644
--- a/openstudiocore/src/model/ModelStraightComponent.i
+++ b/openstudiocore/src/model/ModelStraightComponent.i
@@ -12,6 +12,7 @@
 %import <model/ModelResources.i>
 %import <model/ModelGeometry.i>
 %import <model/ModelHVAC.i>
+%import <model/ModelZoneHVAC.i>
 
 #if defined SWIGCSHARP
   #undef _csharp_module_name