#include <config.h>
-#include "ControlTabular.h"
-#include "xformsBC.h"
-#include "ButtonController.h"
-#include "insets/insettabular.h"
-
#include "FormTabular.h"
+#include "ControlTabular.h"
#include "forms/form_tabular.h"
-#include "debug.h"
+
#include "xforms_helpers.h"
-#include "gettext.h"
-#include "lyxrc.h"
-#include "helper_funcs.h"
-#include "input_validators.h"
+#include "xformsBC.h"
+
+#include "controllers/ButtonController.h"
+#include "controllers/helper_funcs.h"
+
#include "support/lstrings.h"
#include "lyx_forms.h"
-#include <vector>
-#include <algorithm>
-
-using namespace lyx::support;
+using lyx::support::contains_functor;
+using lyx::support::getStringFromVector;
+using lyx::support::isStrDbl;
-using std::vector;
using std::bind2nd;
+using std::string;
+using std::vector;
namespace {