--- a/epoc32/include/stdapis/stlportv5/queue	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/stdapis/stlportv5/queue	Wed Mar 31 12:33:34 2010 +0100
@@ -9,13 +9,13 @@
  * Copyright (c) 1997
  * Moscow Center for SPARC Technology
  *
- * 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
@@ -26,27 +26,31 @@
 #ifndef _STLP_QUEUE
 #define _STLP_QUEUE
 
-# ifndef _STLP_OUTERMOST_HEADER_ID
+#ifndef _STLP_OUTERMOST_HEADER_ID
 #  define _STLP_OUTERMOST_HEADER_ID 0x53
 #  include <stl/_prolog.h>
-# endif
+#endif
 
-# ifdef _STLP_PRAGMA_ONCE
+#ifdef _STLP_PRAGMA_ONCE
 #  pragma once
-# endif
+#endif
 
 #ifndef _STLP_INTERNAL_QUEUE_H
-# include <stl/_queue.h>
+#  include <stl/_queue.h>
+#endif
+
+#ifndef _STLP_FUNCTIONAL
+#  include <functional>
 #endif
 
-#ifndef _STLP_INTERNAL_FUNCTION_H
-# include <functional>
+#if defined (_STLP_IMPORT_VENDOR_STD)
+#  include _STLP_NATIVE_HEADER(queue)
 #endif
 
-# if (_STLP_OUTERMOST_HEADER_ID == 0x53)
+#if (_STLP_OUTERMOST_HEADER_ID == 0x53)
 #  include <stl/_epilog.h>
 #  undef _STLP_OUTERMOST_HEADER_ID
-# endif
+#endif
 
 #endif /* _STLP_QUEUE */