diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76c777ed..98159863 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,8 @@ This is the second major release of the SenseGlove Unreal Engine Plugin adding s
 - Allow the C++ compiler the opportunity to perform RVO/NRVO if applicable.
 - Fix the modules' order inside the .uplugin file.
 - Fix a build issue inside FSGArrayUtils::FromStdVector introduced by newer MVSC updates due to stricter implicit uint64 to int32 conversions.
+- Fix a build issues inside FSGArrayUtils when performing non-Unity builds due to the missing <string> header.
+- Fix other build issues in USGDevice, USGNovaGloveSensorData, FSGDeviceImpl, and FSGSenseGloveVarsImpl when performing non-Unity builds due to the missing relevant headers.
 - Fix changelog formatting.
 
 ### Changed
diff --git a/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp b/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp
index 42de8b5c..234f918e 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp
@@ -39,12 +39,18 @@
 #include "Engine/Engine.h"
 
 #include "SGCore/SGBetaDevice.h"
+#include "SGCore/SGHapticChannelInfo.h"
 #include "SGCore/SGHapticGlove.h"
-#include "SGCore/SGNovaGlove.h"
 #include "SGCore/SGNova2Glove.h"
+#include "SGCore/SGNovaGlove.h"
 #include "SGCore/SGSenseGlove.h"
 #include "SGCoreImpl/SGBetaDeviceImpl.h"
 #include "SGCoreImpl/SGDeviceImpl.h"
+#include "SGCoreImpl/SGHapticChannelInfoImpl.h"
+#include "SGCoreImpl/SGHapticGloveImpl.h"
+#include "SGCoreImpl/SGNova2GloveImpl.h"
+#include "SGCoreImpl/SGNovaGloveImpl.h"
+#include "SGCoreImpl/SGSenseGloveImpl.h"
 #include "SGCoreImpl/SGExportedFunctions.h"
 #include "SGInterop/SGIC_ESGConnectionType.h"
 #include "SGInterop/SGIC_ESGDeviceType.h"
diff --git a/Source/SenseGloveCore/Public/SGCore/SGNovaGloveSensorData.h b/Source/SenseGloveCore/Public/SGCore/SGNovaGloveSensorData.h
index 82240094..2e9f1282 100644
--- a/Source/SenseGloveCore/Public/SGCore/SGNovaGloveSensorData.h
+++ b/Source/SenseGloveCore/Public/SGCore/SGNovaGloveSensorData.h
@@ -43,6 +43,8 @@
 #include "UObject/Object.h"
 #include "UObject/ObjectMacros.h"
 
+#include "SGTypes/SGCoreTypes.h"
+
 #include "SGNovaGloveSensorData.generated.h"
 
 class FSGNovaGloveSensorDataImpl;
diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp
index c7ea9e2d..5f64e356 100644
--- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp
+++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp
@@ -40,7 +40,13 @@
 #include "Containers/StringConv.h"
 #include "Misc/AssertionMacros.h"
 
+#include "SGBuildHacks/SGInclude_Core_BetaDevice.h"
 #include "SGBuildHacks/SGInclude_Core_SGDevice.h"
+#include "SGBuildHacks/SGInclude_Core_HapticChannelInfo.h"
+#include "SGBuildHacks/SGInclude_Core_HapticGlove.h"
+#include "SGBuildHacks/SGInclude_Core_Nova2Glove.h"
+#include "SGBuildHacks/SGInclude_Core_NovaGlove.h"
+#include "SGBuildHacks/SGInclude_Core_SenseGlove.h"
 #include "SGCoreImpl/SGBetaDeviceImpl.h"
 #include "SGCoreImpl/SGCoreEnumCast.h"
 #include "SGCoreImpl/SGHapticChannelInfoImpl.h"
diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveVarsImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveVarsImpl.cpp
index efa1216b..c0716d82 100644
--- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveVarsImpl.cpp
+++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveVarsImpl.cpp
@@ -40,6 +40,7 @@
 #include "Containers/StringConv.h"
 
 #include "SGBuildHacks/SGInclude_Core_Quat.h"
+#include "SGBuildHacks/SGInclude_Core_SenseGloveInfo.h"
 #include "SGBuildHacks/SGInclude_Core_SenseGloveVars.h"
 #include "SGBuildHacks/SGInclude_Core_Vect3D.h"
 #include "SGCoreImpl/SGQuatImpl.h"