#include <config.h>
-#include "xformsBC.h"
-#include "ControlRef.h"
#include "FormRef.h"
-#include "Tooltips.h"
+#include "ControlRef.h"
#include "forms/form_ref.h"
+
+#include "Tooltips.h"
#include "xforms_helpers.h"
+#include "xformsBC.h"
+
#include "insets/insetref.h"
-#include "helper_funcs.h" // getStringFromVector
+
#include "support/lstrings.h" // trim
-#include "lyx_forms.h"
-#include <algorithm>
+#include "lyx_forms.h"
-using namespace lyx::support;
+using lyx::support::getStringFromVector;
using std::find;
using std::max;
using std::sort;
+using std::string;
using std::vector;
+
typedef FormController<ControlRef, FormView<FD_ref> > base_class;
FormRef::FormRef(Dialog & parent)