#include "lyx_forms.h"
-using namespace lyx::support;
+using lyx::support::lowercase;
+using lyx::support::trim;
+using lyx::support::uppercase;
#ifndef CXX_GLOBAL_CSTD
-using std::isupper;
using std::islower;
+using std::isupper;
#endif
using std::vector;
+using std::string;
typedef FormController<ControlThesaurus, FormView<FD_thesaurus> > base_class;