diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/string
--- a/epoc32/include/stdapis/stlportv5/string	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/stdapis/stlportv5/string	Wed Mar 31 12:33:34 2010 +0100
@@ -2,13 +2,13 @@
  * Copyright (c) 1997-1999
  * Silicon Graphics Computer Systems, Inc.
  *
- * Copyright (c) 1999 
+ * Copyright (c) 1999
  * Boris Fomitchev
  *
  * This material is provided "as is", with absolutely no warranty expressed
  * or implied. Any use is at your own risk.
  *
- * Permission to use or copy this software for any purpose is hereby granted 
+ * Permission to use or copy this software for any purpose is hereby granted
  * without fee, provided the above notices are retained on all copies.
  * Permission to modify the code and to distribute modified code is granted,
  * provided the above notices are retained, and a notice that the code was
@@ -19,40 +19,29 @@
 #ifndef _STLP_STRING
 # define _STLP_STRING
 
-# ifndef _STLP_OUTERMOST_HEADER_ID
+#ifndef _STLP_OUTERMOST_HEADER_ID
 #  define _STLP_OUTERMOST_HEADER_ID 0x68
 #  include <stl/_prolog.h>
-# endif
+#endif
 
-# ifdef _STLP_PRAGMA_ONCE
+#ifdef _STLP_PRAGMA_ONCE
 #  pragma once
-# endif
+#endif
 
-#if defined (_STLP_USE_NATIVE_STRING)
+#if defined (_STLP_USE_OWN_NAMESPACE)
+#  include <stl/_string.h>
+#endif
 
-// as part of compiled runtime library depends on it.
+#include <stl/_string_hash.h>
 
-# if defined (_STLP_MSVC)
-#  include <streambuf>
-#  include <istream>
-# endif
+#if !defined (_STLP_USE_NO_IOSTREAMS)
+#  include <stl/_string_io.h>
+#endif
 
-#  include _STLP_NATIVE_HEADER(string)
-
-# endif /* _STLP_USE_NATIVE_STRING */
-
-# if !defined (_STLP_USE_NATIVE_STRING) || defined (_STLP_USE_OWN_NAMESPACE)
-# include <stl/_string.h>
-# else
-# include <stl/_string_hash.h>
-# endif /*_STLP_USE_NATIVE_STRING */
-
-// cleanup
-
-# if (_STLP_OUTERMOST_HEADER_ID == 0x68)
+#if (_STLP_OUTERMOST_HEADER_ID == 0x68)
 #  include <stl/_epilog.h>
 #  undef _STLP_OUTERMOST_HEADER_ID
-# endif
+#endif
 
 #endif /* _STLP_STRING */