X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLsstream.h;h=548f971589d5bf971ea00f201f681a08e7847a5a;hb=1bb197b5d4821404cfe11509c71d1f8de7cee711;hp=89676b8a4ed6f446dc8287928333efe24d28790a;hpb=160dc67127a88201dec6ec4d98e28ff260af3ccc;p=lyx.git

diff --git a/src/Lsstream.h b/src/Lsstream.h
index 89676b8a4e..548f971589 100644
--- a/src/Lsstream.h
+++ b/src/Lsstream.h
@@ -1,23 +1,29 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #ifndef LSSTREAM_H
-#define LSSTREAM_H 
+#define LSSTREAM_H
+
+// Since we will include a string header anyway, we'd better do it
+// right now so that <string> is not loaded before lyxstring.h. (JMarc)
+#include "LString.h"
 
 #ifdef HAVE_SSTREAM
 #include <sstream>
-using std::istringstream;
-using std::ostringstream;
 #else
 #include "support/sstream.h"
 #endif
 
+using std::istringstream;
+using std::ostringstream;
+using std::stringstream;
+
 #endif