#include "lyx_forms.h"
-using lyx::support::bformat;
-using lyx::support::LibFileSearch;
-
using std::string;
+namespace lyx {
+
+using support::bformat;
+using support::LibFileSearch;
+
+namespace frontend {
extern "C" {
}
} // extern "C"
+
+} // namespace frontend
+} // namespace lyx