get rid of broken_header.h and some unneeded tests

[lyx.git] / src / frontends / xforms / FormWrap.C

diff --git a/src/frontends/xforms/FormWrap.C b/src/frontends/xforms/FormWrap.C
index aaae3fbb1dd861cb40c710f7bc54f97f48717625..37788f02026d9c819649869f947be8d485c44de9 100644 (file)
--- a/src/frontends/xforms/FormWrap.C
+++ b/src/frontends/xforms/FormWrap.C
@@ -5,7 +5,7 @@
  *
  * \author Dekel Tsur
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -22,7 +22,17 @@
 
 #include "insets/insetwrap.h"
 #include "support/lstrings.h"
-#include FORMS_H_LOCATION
+#include "lyx_forms.h"
+#include "support/tostr.h"
+
+using std::string;
+
+namespace lyx {
+
+using support::getStringFromVector;
+using support::subst;
+
+namespace frontend {
 
 typedef FormController<ControlWrap, FormView<FD_wrap> > base_class;
 
@@ -106,3 +116,6 @@ void FormWrap::update()
        else
                placement_.set(params.placement.c_str()[0]);
 }
+
+} // namespace frontend
+} // namespace lyx