diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index ce088b438269f251e060e0a9b00182ad00a30201..e0c04bb3f733a1e856c944d630289201f1d320dd 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -54,6 +54,9 @@ static inline std::istream& operator >> (std::istream &in, std::map<T1, T2> &map
 
 #if JVET_O0756_CALCULATE_HDRMETRICS
 #include "HDRLib/inc/DistortionMetric.H"
+#ifdef UNDEFINED
+#undef UNDEFINED
+#endif
 #endif
 namespace po = df::program_options_lite;
 
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index b8bfe7eef45bcc7ea39cd2c84381964a8e05e7d6..24270071f824600106bbfa59abbb7e761221745a 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -49,6 +49,9 @@
 
 #if JVET_O0756_CALCULATE_HDRMETRICS
 #include "HDRLib/inc/DistortionMetric.H"
+#ifdef UNDEFINED
+#undef UNDEFINED
+#endif
 #endif
 
 struct GOPEntry
diff --git a/source/Lib/EncoderLib/EncGOP.h b/source/Lib/EncoderLib/EncGOP.h
index 2d791af1d4dc2c184604e4ceed512cc53146ea9c..10def3589f81bf2d67394c180f6cdf4a3454ba47 100644
--- a/source/Lib/EncoderLib/EncGOP.h
+++ b/source/Lib/EncoderLib/EncGOP.h
@@ -69,6 +69,9 @@
 #include "HDRLib/inc/ColorTransform.H"
 #include "HDRLib/inc/TransferFunction.H"
 #include "HDRLib/inc/DistortionMetricDeltaE.H"
+#ifdef UNDEFINED
+#undef UNDEFINED
+#endif
 #include <chrono>
 #endif