diff --git a/src/ChangeLog b/src/ChangeLog
index 37e9d51dfa..a135964a78 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-02  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* text2.C, CutAndPaste.C: use BoostFormat.h not boost/format.hpp
+
 2002-12-01  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* several files: ws changes
diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 430927e37e..5dca9f0cc4 100644
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -29,7 +29,7 @@
 
 #include "insets/inseterror.h"
 
-#include <boost/format.hpp>
+#include "BoostFormat.h"
 
 using std::pair;
 using lyx::pos_type;
diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index bde30a5305..8665b2c666 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-02  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* ControlDocument.C: use BoostFormat.h instead of boost/format.hpp
+
 2002-12-01  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* several files: ws changes
diff --git a/src/frontends/controllers/ControlDocument.C b/src/frontends/controllers/ControlDocument.C
index a8d5d90b14..d7d5fb659f 100644
--- a/src/frontends/controllers/ControlDocument.C
+++ b/src/frontends/controllers/ControlDocument.C
@@ -35,7 +35,7 @@
 #include "support/lstrings.h"
 #include "support/filetools.h"
 
-#include <boost/format.hpp>
+#include "BoostFormat.h"
 
 using std::endl;
 
diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index df23851244..d3dec8129e 100644
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -178,7 +178,7 @@ string const InsetQuotes::dispString(Language const * loclang) const
 		if (side_ == LeftQ)
 			disp += ' ';
 		else
-			disp.insert(0u, 1, ' ');
+			disp.insert(string::size_type(0), 1, ' ');
 	}
 
 	return disp;
diff --git a/src/text2.C b/src/text2.C
index dea60ba448..bc1f0d6af5 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -45,7 +45,7 @@
 #include "support/textutils.h"
 #include "support/lstrings.h"
 
-#include <boost/format.hpp>
+#include "BoostFormat.h"
 
 using std::vector;
 using std::copy;