11 files changed, 15 insertions, 15 deletions
diff --git a/src/Fl_Cairo.cxx b/src/Fl_Cairo.cxx
index d35546a16..61a4a2d60 100644
--- a/src/Fl_Cairo.cxx
+++ b/src/Fl_Cairo.cxx
@@ -196,7 +196,7 @@ cairo_t *Fl_Private_cairo_make_current(void *gc, int W, int H) {
   \see Fl::cairo_autolink_context(bool)
   \see Fl::cairo_make_current(Fl_Window*);
 */
-FL_EXPORT extern void Fl::cairo_flush(cairo_t *c) {
+void Fl::cairo_flush(cairo_t *c) {
   // flush Cairo drawings
   cairo_surface_t *s = cairo_get_target(c);
   cairo_surface_flush(s);
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index acddc4e91..996cb3acd 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -1594,7 +1594,8 @@ const Fl_Menu_Item* Fl_Menu_Item::popup(
  */
 const Fl_Menu_Item* Fl_Menu_Item::find_shortcut(int* ip, const bool require_alt) const {
   const Fl_Menu_Item* m = this;
-  if (m) for (int ii = 0; m->text; m = next_visible_or_not(m), ii++) {
+  int ii;
+  if (m) for (ii = 0; m->text; m = next_visible_or_not(m), ii++) {
     if (m->active()) {
       if (Fl::test_shortcut(m->shortcut_)
           || (!is_special_labeltype(m->labeltype_) && Fl_Widget::test_shortcut(m->text, require_alt))
diff --git a/src/Fl_Private.H b/src/Fl_Private.H
index c4cfdcef5..a4ba9d6e6 100644
--- a/src/Fl_Private.H
+++ b/src/Fl_Private.H
@@ -26,7 +26,7 @@
 
 /*
  FLTK private global variables and functions.
- All prefixed with Fl_Private_ instead of using namespace.
+ All prefixed with Fl_Private_ to keep them separate from the Fl class.
  */
 
 FL_EXPORT extern int Fl_Private_use_high_res_GL_;
diff --git a/src/Fl_Text_Buffer.cxx b/src/Fl_Text_Buffer.cxx
index 8411342d1..3924fbbac 100644
--- a/src/Fl_Text_Buffer.cxx
+++ b/src/Fl_Text_Buffer.cxx
@@ -2058,7 +2058,8 @@ int Fl_Text_Buffer::outputfile(const char *file,
   FILE *fp;
   if (!(fp = fl_fopen(file, "w")))
     return 1;
-  for (int n; (n = min(end - start, buflen)); start += n) {
+  int n;
+  for (; (n = min(end - start, buflen)); start += n) {
     const char *p = text_range(start, start + n);
     int r = (int) fwrite(p, 1, n, fp);
     free((void *) p);
diff --git a/src/Fl_Widget.cxx b/src/Fl_Widget.cxx
index aba540802..94dd2f9b5 100644
--- a/src/Fl_Widget.cxx
+++ b/src/Fl_Widget.cxx
@@ -165,7 +165,7 @@ Fl_Widget *Fl::readqueue() {
     specific widget from the default callback queue (Fl::readqueue()).
     It is only called from Fl_Widget's destructor if the widget
     doesn't have an own callback.
-    Note: There's no need to have this in the Fl:: namespace.
+    Note: There's no need to have this in the Fl class.
 */
 static void cleanup_readqueue(Fl_Widget *w) {
 
diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
index 62f89c38c..1f5607a6b 100644
--- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
+++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
@@ -653,7 +653,8 @@ void Fl_Cairo_Graphics_Driver::draw_image(Fl_Draw_Image_Cb call, void *data, int
   int l;
   for (l = 0; l < ih; l++) {
     call(data, 0, l, iw, array + l*D*iw);
-    if (D%2 == 0) for (int i = 0; i < iw; i++) {
+    int i;
+    if (D%2 == 0) for (i = 0; i < iw; i++) {
       *(array + l*D*iw + i*D + D-1) = 0xff;
     }
   }
diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
index 92b0e0ef6..f87a438d8 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
@@ -962,7 +962,8 @@ Fl_Xlib_Font_Descriptor::~Fl_Xlib_Font_Descriptor() {
   if (this == fl_graphics_driver->font_descriptor()) fl_graphics_driver->font_descriptor(NULL);
   //  XftFontClose(fl_display, font);
 #if USE_PANGO
-  if (width) for (int i = 0; i < 64; i++) delete[] width[i];
+  int i;
+  if (width) for (i = 0; i < 64; i++) delete[] width[i];
   delete[] width;
 #endif
 }
diff --git a/src/filename_absolute.cxx b/src/filename_absolute.cxx
index 4573a34c1..b02df25f0 100644
--- a/src/filename_absolute.cxx
+++ b/src/filename_absolute.cxx
@@ -125,7 +125,7 @@ int Fl_System_Driver::filename_absolute(char *to, int tolen, const char *from, c
 /** Makes a filename relative to the current working directory.
 
   Return the \a from path made relative to the working directory, similar to
-  C++17 `std::filesystem::path::lexically_relative`. This function can also be
+  This function makes a path relative to the working directory. It can also be
   called with a fourth argument for a user supplied \a base directory path
 
   These conversions are purely lexical. They do not check that the paths exist,
@@ -164,10 +164,6 @@ int Fl_System_Driver::filename_absolute(char *to, int tolen, const char *from, c
   \param[in]  from absolute filename
   \return 0 if no change, non zero otherwise
   \see fl_filename_relative(char *to, int tolen, const char *from, const char *base)
-  <!-- FIXME: added in 1.5 or higher ...
-    \see fl_filename_relative(const std::string &from, const std::string &base)
-    \see fl_filename_relative(const std::string &from)
-  -->
  */
 int fl_filename_relative(char *to, int tolen, const char *from)
 {
diff --git a/src/filename_ext.cxx b/src/filename_ext.cxx
index a4d86937b..3f5ffa0cb 100644
--- a/src/filename_ext.cxx
+++ b/src/filename_ext.cxx
@@ -29,7 +29,6 @@
    \return a pointer to the extension (including '.') if one was found,
             or a pointer to the terminating NUL character (effectively a pointer
             to an empty string) if no extension was found.
-    \see fl_filename_ext_str(const std::string &filename)
  */
 const char *fl_filename_ext(const char *buf) {
   return Fl::system_driver()->filename_ext(buf);
diff --git a/src/fl_boxtype.cxx b/src/fl_boxtype.cxx
index fe2dba385..d179aa2a3 100644
--- a/src/fl_boxtype.cxx
+++ b/src/fl_boxtype.cxx
@@ -542,7 +542,7 @@ int Fl::box_dh(Fl_Boxtype t) {return fl_box_table[t].dh;}
               false if it is at least partially transparent.
   \since 1.5.0
 */
-extern bool Fl::box_bg(Fl_Boxtype bt) {
+bool Fl::box_bg(Fl_Boxtype bt) {
   return fl_box_table[bt].bg();
 }
 
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx
index 95436a610..931847da6 100644
--- a/src/gl_draw.cxx
+++ b/src/gl_draw.cxx
@@ -523,7 +523,8 @@ void Fl_Gl_Window_Driver::draw_string_with_texture(const char* str, int n)
   gl_scale = (gwin ? gwin->pixels_per_unit() : 1);
   if (!gl_fifo) gl_fifo = new gl_texture_fifo();
   if (!gl_fifo->textures_generated) {
-    if (has_texture_rectangle) for (int i = 0; i < gl_fifo->size_; i++) glGenTextures(1, &(gl_fifo->fifo[i].texName));
+    int i;
+    if (has_texture_rectangle) for (i = 0; i < gl_fifo->size_; i++) glGenTextures(1, &(gl_fifo->fifo[i].texName));
     gl_fifo->textures_generated = 1;
   }
   int index = gl_fifo->already_known(str, n);