diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 1af3d82048..580e1023b6 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -43,7 +43,6 @@
 #include "LyX.h"
 #include "LyXRC.h"
 #include "LyXVC.h"
-#include "Messages.h"
 #include "output_docbook.h"
 #include "output.h"
 #include "output_latex.h"
diff --git a/src/Messages.cpp b/src/Messages.cpp
index 66b974cfa1..3332cd8b96 100644
--- a/src/Messages.cpp
+++ b/src/Messages.cpp
@@ -24,10 +24,6 @@
 
 #include <cerrno>
 
-namespace {
-boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$");
-};
-
 #ifdef ENABLE_NLS
 
 #ifdef HAVE_LOCALE_H
@@ -47,6 +43,8 @@ using std::string;
 
 namespace lyx {
 
+static boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$");
+
 using support::package;
 using support::getEnv;
 using support::setEnv;