#include <config.h>
-#include "xformsBC.h"
-#include "ButtonController.h"
-#include "ControlCharacter.h"
#include "FormCharacter.h"
#include "forms/form_character.h"
-#include "gettext.h"
-#include "helper_funcs.h"
+
#include "xforms_helpers.h"
-#include "lyx_forms.h"
-#include "combox.h"
+#include "xformsBC.h"
+
+#include "controllers/frnt_lang.h"
+#include "controllers/helper_funcs.h"
-#include "frnt_lang.h"
+#include "LColor.h"
#include "support/lstrings.h"
-#include <vector>
+#include "lyx_forms.h"
+#include "combox.h"
-using namespace lyx::support;
+using frnt::BarPair;
+using frnt::ColorPair;
+using frnt::FamilyPair;
+using frnt::getBarData;
+using frnt::getColorData;
+using frnt::getFamilyData;
+using frnt::getLanguageData;
+using frnt::getSeriesData;
+using frnt::getShapeData;
+using frnt::getSizeData;
+using frnt::LanguagePair;
+using frnt::SeriesPair;
+using frnt::ShapePair;
+using frnt::SizePair;
+
+using lyx::support::getStringFromVector;
using std::vector;
-using std::find;
+using std::string;
-using namespace frnt;
typedef FormController<ControlCharacter, FormView<FD_character> > base_class;