#include <config.h>
#include "vspace.h"
-#include "lengthcommon.h"
#include "buffer.h"
+#include "bufferparams.h"
#include "BufferView.h"
+#include "lengthcommon.h"
#include "lyxtext.h"
#include "support/lstrings.h"
-using namespace lyx::support;
+using lyx::support::compare;
+using lyx::support::isStrDbl;
+using lyx::support::ltrim;
+using lyx::support::prefixIs;
+using lyx::support::rtrim;
+using lyx::support::strToDbl;
+
+using std::string;
namespace {