diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index 8923a97cb..965afeeaa 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1445,7 +1445,7 @@ int isdeclare(const char *c) {
 
 void Fl_Widget_Type::write_static() {
   const char* t = subclassname(this);
-  if (!subclass()) write_declare("#include <FL/%s.H>", t);
+  if (!subclass() || is_class()) write_declare("#include <FL/%s.H>", t);
   for (int n=0; n < NUM_EXTRA_CODE; n++) {
     if (extra_code(n) && isdeclare(extra_code(n)))
       write_declare("%s", extra_code(n));
diff --git a/fluid/Fl_Window_Type.cxx b/fluid/Fl_Window_Type.cxx
index beb526ceb..18d37d283 100644
--- a/fluid/Fl_Window_Type.cxx
+++ b/fluid/Fl_Window_Type.cxx
@@ -1350,7 +1350,7 @@ void Fl_Widget_Class_Type::write_code1() {
 
     write_c("%s::%s(int W, int H, const char *L)\n", name(), name());
     write_c("  : %s(0, 0, W, H, L) {\n", c);
-    write_c("  clear_flag(FL_FORCE_POSITION);\n");
+    write_c("  clear_flag(16);\n");
     write_c("  _%s();\n", name());
     write_c("}\n\n");