diff --git a/src/frontends/gtk/GGraphics.C b/src/frontends/gtk/GGraphics.C
index 5728c9af2c..a3c3931f53 100644
--- a/src/frontends/gtk/GGraphics.C
+++ b/src/frontends/gtk/GGraphics.C
@@ -28,7 +28,7 @@
 
 #include "support/lyxlib.h"  // for float_equal
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "debug.h"
 
diff --git a/src/frontends/gtk/GPrint.C b/src/frontends/gtk/GPrint.C
index 079cbf5a5d..54ec6849a0 100644
--- a/src/frontends/gtk/GPrint.C
+++ b/src/frontends/gtk/GPrint.C
@@ -22,7 +22,7 @@
 #include "PrinterParams.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <libglademm.h>
 
diff --git a/src/frontends/gtk/GSpellchecker.C b/src/frontends/gtk/GSpellchecker.C
index 685542e49c..7646e5734b 100644
--- a/src/frontends/gtk/GSpellchecker.C
+++ b/src/frontends/gtk/GSpellchecker.C
@@ -20,7 +20,7 @@
 
 #include "ghelpers.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 
 using std::string;
 
diff --git a/src/frontends/qt2/QExternal.C b/src/frontends/qt2/QExternal.C
index 4d8fd2d6e6..9c2a3b1aaa 100644
--- a/src/frontends/qt2/QExternal.C
+++ b/src/frontends/qt2/QExternal.C
@@ -22,7 +22,7 @@
 #include "insets/insetexternal.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "QExternal.h"
 #include "QExternalDialog.h"
diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C
index 45d44e3880..f54d459695 100644
--- a/src/frontends/qt2/QGraphics.C
+++ b/src/frontends/qt2/QGraphics.C
@@ -29,7 +29,7 @@
 #include "insets/insetgraphicsParams.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/lyxlib.h"
 
 #include <qlineedit.h>
diff --git a/src/frontends/qt2/QTabular.C b/src/frontends/qt2/QTabular.C
index bc25e7b897..8001bea846 100644
--- a/src/frontends/qt2/QTabular.C
+++ b/src/frontends/qt2/QTabular.C
@@ -23,7 +23,7 @@
 #include "controllers/ButtonController.h"
 #include "controllers/ControlTabular.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <qcheckbox.h>
 #include <qlineedit.h>
diff --git a/src/frontends/qt2/QWrap.C b/src/frontends/qt2/QWrap.C
index 413dd043c8..64f1d2ad0e 100644
--- a/src/frontends/qt2/QWrap.C
+++ b/src/frontends/qt2/QWrap.C
@@ -21,7 +21,7 @@
 
 #include "insets/insetwrap.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/lstrings.h"
 
 #include <qlineedit.h>
diff --git a/src/frontends/qt2/qt_helpers.C b/src/frontends/qt2/qt_helpers.C
index d12e3fc134..1eadd8e1d4 100644
--- a/src/frontends/qt2/qt_helpers.C
+++ b/src/frontends/qt2/qt_helpers.C
@@ -18,7 +18,7 @@
 #include "gettext.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <qcombobox.h>
 #include <qlineedit.h>
diff --git a/src/support/convert.h b/src/support/convert.h
index ead674b99c..22d5f12a8b 100644
--- a/src/support/convert.h
+++ b/src/support/convert.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file tostr.h
+ * \file convert.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,8 +13,8 @@
  * Some of these would certainly benefit from a rewrite/optimization.
  */
 
-#ifndef TOSTR_H
-#define TOSTR_H
+#ifndef CONVERT_H
+#define CONVERT_H
 
 #include <boost/static_assert.hpp>