Index: base/shell/explorer/utility/utility.h
===================================================================
--- base/shell/explorer/utility/utility.h	(revision 36842)
+++ base/shell/explorer/utility/utility.h	(working copy)
@@ -25,20 +25,6 @@
  // Martin Fuchs, 23.07.2003
  //
 
-#ifdef __cplusplus
-
-#ifdef _MSC_VER
-#pragma warning(disable: 4786)	// disable warnings about too long debug information symbols
-#endif
-
- // STL headers for strings and streams
-#include <string>
-#include <iostream>
-using namespace std;
-
-#endif /* __cplusplus */
-
-
  // standard windows headers
 #define WIN32_LEAN_AND_MEAN
 #define WIN32_EXTRA_LEAN
@@ -64,6 +50,19 @@
 #include <stdio.h>		// for sprintf()
 #include <time.h>
 
+#ifdef __cplusplus
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4786)	// disable warnings about too long debug information symbols
+#endif
+
+ // STL headers for strings and streams
+#include <string>
+#include <iostream>
+using namespace std;
+
+#endif /* __cplusplus */
+
 #ifndef _MAX_PATH
 #define _MAX_DRIVE	3
 #define _MAX_FNAME	256