#include "author.h"
-#include "support/std_istream.h"
#include "support/lstrings.h"
#include <boost/assert.hpp>
+#include "support/std_istream.h"
+
+using lyx::support::token;
+using lyx::support::trim;
+
+using std::string;
-using namespace lyx::support;
bool operator==(Author const & l, Author const & r)
{