diff --git a/lib_com/env_stab.c b/lib_com/env_stab.c
index e1acf8e9526e3a253526a9129db5f48f6ad0f79b..a7817428bf64a5df7f3b5bed92e3d3e8da42c5fb 100644
--- a/lib_com/env_stab.c
+++ b/lib_com/env_stab.c
@@ -44,6 +44,9 @@
 #include "prot.h"
 #include "rom_com.h"
 #include "wmc_auto.h"
+#ifdef FIX_594_STL_INCLUDE
+#include "stl.h"
+#endif
 #ifdef DEBUGGING
 #include "assert.h"
 #endif
diff --git a/lib_com/options.h b/lib_com/options.h
index 3a42a2319c79eeb97a7f8abe6adc99221b8bcf48..41cea169a1264265dcba2859cb461278e91148e7 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -197,8 +197,8 @@
 #define TD_TDREND_FIX_NULLPTR_ACCESS                    /* FhG: avoid nullptr access in ivas_rend_TDObjRendOpen */
 #define TD_REND_FIX_DIV_BY_ZERO                         /* FhG: avoid division by zero in sincResample fn */
 #define RENAME_GWLPR                                    /* FhG: Rename clashing symbol */
-
 #define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */
+#define FIX_594_STL_INCLUDE                             /* FhG: issue 594: Missing include of stl.h */
 
 #define FIX_619_ADD_UNDEF_VAL_FOR_CONCEALMENT_MODE      /* FhG: fix usan error */
 #define FIX_622_SILENCE_USAN_WARNING                    /* FhG: silenceusan warning in ifft code */
@@ -211,7 +211,6 @@
 /* all switches in this category should start with "CR_" */
 #define CR_FIX_585_MASA_2TC_DTX_EXT                     /* Nokia: issue 585: fixes transition artifacts in MASA 2TC DTX by applying correct condition */
 
-
 /* ##################### End NON-BE CR switches ########################### */