diff --git a/lib_com/options.h b/lib_com/options.h
index 804c5d2643198f8dd8526bb4ae480f3005959b2f..f595af53409a22ca5fd443f75ce70784f90d851c 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -165,6 +165,7 @@
 #define FIX_575_LOW_OVERLAP_PLC_RECOVERY                /* FhG: Issue 575 fix for PLC and transistion to TCX5*/
 #define ISM_FB_16k4                                     /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */
 #define FIX_580_PARAMMC_ENER_BURSTS                     /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */
+#define FIX_593_STL_INCLUDE                             /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */
 
 
 /* ################## End BE DEVELOPMENT switches ######################### */
diff --git a/lib_enc/ivas_stereo_eclvq_enc.c b/lib_enc/ivas_stereo_eclvq_enc.c
index fc622b53211efc8ee744f8a5ac3dba69815ba764..71f0bc805fd910a6fc96fe3994022d08a590d8c2 100644
--- a/lib_enc/ivas_stereo_eclvq_enc.c
+++ b/lib_enc/ivas_stereo_eclvq_enc.c
@@ -41,7 +41,11 @@
 #include "prot.h"
 #include "wmc_auto.h"
 /* used only for norm_s in the code_length_from_count function */
+#ifdef FIX_593_STL_INCLUDE
+#include "stl.h"
+#else
 #include "basop32.h"
+#endif
 
 
 /*---------------------------------------------------------------