Fluid: last incremental chage, restructuring

5 files changed, 12 insertions, 3 deletions

diff --git a/fluid/tools/ExternalCodeEditor_UNIX.cxx b/fluid/tools/ExternalCodeEditor_UNIX.cxx
index 09d7e6178..bf472d896 100644
--- a/fluid/tools/ExternalCodeEditor_UNIX.cxx
+++ b/fluid/tools/ExternalCodeEditor_UNIX.cxx
@@ -6,6 +6,7 @@
 #include "ExternalCodeEditor_UNIX.h"
 
 #include "app/fluid.h"
+#include "app/project.h"
 
 #include <FL/Fl.H>      /* Fl_Timeout_Handler.. */
 #include <FL/fl_ask.H>  /* fl_alert() */
diff --git a/fluid/tools/ExternalCodeEditor_WIN32.cxx b/fluid/tools/ExternalCodeEditor_WIN32.cxx
index c58f22a30..09688d16a 100644
--- a/fluid/tools/ExternalCodeEditor_WIN32.cxx
+++ b/fluid/tools/ExternalCodeEditor_WIN32.cxx
@@ -18,6 +18,7 @@
 
 #include "tools/ExternalCodeEditor_WIN32.h"
 #include "app/fluid.h"
+#include "app/project.h"
 
 #include <FL/Fl.H>      // Fl_Timeout_Handler..
 #include <FL/fl_ask.H>  // fl_alert()
diff --git a/fluid/tools/autodoc.cxx b/fluid/tools/autodoc.cxx
index 857c5c12b..295ab8d2f 100644
--- a/fluid/tools/autodoc.cxx
+++ b/fluid/tools/autodoc.cxx
@@ -19,6 +19,7 @@
 #include "tools/autodoc.h"
 
 #include "app/fluid.h"
+#include "app/project.h"
 #include "nodes/factory.h"
 #include "nodes/Fl_Widget_Type.h"
 #include "nodes/Fl_Window_Type.h"
diff --git a/fluid/tools/filename.cxx b/fluid/tools/filename.cxx
index 655d90543..bbd749ce1 100644
--- a/fluid/tools/filename.cxx
+++ b/fluid/tools/filename.cxx
@@ -14,7 +14,7 @@
 //     https://www.fltk.org/bugs.php
 //
 
-/** \file fluid/fluid_filename.cxx
+/** \file fluid/filename.cxx
 
   \brief File names and URI utility functions for FLUID only.
 
@@ -29,7 +29,7 @@
         the next release after 1.4.x will be. We'll use std::string instead!
 */
 
-#include "tools/fluid_filename.h"
+#include "tools/filename.h"
 
 #include <FL/filename.H>
 #include <FL/Fl.H>
diff --git a/fluid/tools/filename.h b/fluid/tools/filename.h
index 4544a0534..13488d399 100644
--- a/fluid/tools/filename.h
+++ b/fluid/tools/filename.h
@@ -14,7 +14,7 @@
  *     https://www.fltk.org/bugs.php
  */
 
-/** \file fluid/fluid_filename.h
+/** \file fluid/filename.h
   \brief Handling file names operations that are not in the core library.
 */
 
@@ -25,4 +25,10 @@
 
 std::string fl_filename_shortened(const std::string &filename, int maxchars);
 
+namespace fld {
+
+using filename = std::string;
+
+} // namespace fld
+
 #endif // FLUID_TOOLS_FILENAME_H