diff --git a/setup.h_vms b/setup.h_vms
index 16249ecc31..0ea6caf75c 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
- * Date : 18 March 2011                                                      *
+ * Date : 31 March 2011                                                      *
  *                                                                           *
  *****************************************************************************/
 
@@ -216,8 +216,6 @@ typedef pid_t GPid;
 
 #define wxUSE_EXTENDED_RTTI 0
 
-#define wxUSE_STL 0
-
 #define wxUSE_LOG 1
 
 #define wxUSE_LOGWINDOW 1
@@ -232,6 +230,10 @@ typedef pid_t GPid;
 
 #define wxUSE_STREAMS       1
 
+#define wxUSE_PRINTF_POS_PARAMS      0
+
+#define wxUSE_STL 0
+
 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)
     #define wxUSE_STD_DEFAULT  0
@@ -239,11 +241,15 @@ typedef pid_t GPid;
     #define wxUSE_STD_DEFAULT  1
 #endif
 
+#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+
 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
 
 #define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
 
-#define wxUSE_PRINTF_POS_PARAMS 0
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
+
+#define wxUSE_IOSTREAMH     1
 
 #define wxUSE_LONGLONG      1
 
@@ -594,10 +600,6 @@ typedef pid_t GPid;
 
 #define wxUSE_SVG 1
 
-#define wxUSE_IOSTREAMH     1
-
-
-
 #define wxUSE_IMAGE         1
 
 #define wxUSE_LIBPNG        1