Remove $Id$ tags, update URL's, and more

- remove obsolete svn '$Id$' tags from all source files
- update .fl files and generated files accordingly
- replace 'http://www.fltk.org' URL's with 'https://...'
- replace bug report URL 'str.php' with 'bugs.php'
- remove trailing whitespace
- fix other whitespace errors flagged by Git
- add and/or fix missing or wrong standard headers
- convert tabs to spaces in all source files

The only relevant code changes are in the fluid/ folder where
some .fl files and other source files were used to generate
the '$Id' headers and footers.

12 files changed, 114 insertions, 187 deletions

diff --git a/src/drivers/GDI/Fl_Font.H b/src/drivers/GDI/Fl_Font.H
index b530ec422..f636bb2f4 100644
--- a/src/drivers/GDI/Fl_Font.H
+++ b/src/drivers/GDI/Fl_Font.H
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Font definitions for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 // Two internal fltk data structures:
@@ -42,7 +40,3 @@ public:
 extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table
 
 #endif
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx b/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx
index 7a8f24c6c..9d7591712 100644
--- a/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx
+++ b/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Copy-to-clipboard code for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 #include "../../config_lib.h"
@@ -89,7 +87,7 @@ Fl_GDI_Copy_Surface_Driver::~Fl_GDI_Copy_Surface_Driver() {
       SetClipboardData(CF_BITMAP, surf->offscreen());
       Fl_Surface_Device::pop_current();
       delete surf;
-      
+
       CloseClipboard ();
     }
     DeleteEnhMetaFile(hmf);
@@ -116,7 +114,3 @@ void Fl_GDI_Copy_Surface_Driver::untranslate() {
   ((Fl_GDI_Graphics_Driver*)driver())->untranslate_all();
 }
 #endif // FL_CFG_GFX_GDI
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
index 626049aeb..7dd947f6e 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Definition of classes  Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device
 // for the Fast Light Tool Kit (FLTK).
 //
@@ -10,11 +8,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 /**
@@ -171,7 +169,3 @@ public:
 
 
 #endif // FL_GDI_GRAPHICS_DRIVER_H
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
index 078800e75..1e0b11c82 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Rectangle drawing routines for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 
@@ -294,7 +292,3 @@ Fl_Region Fl_GDI_Graphics_Driver::scale_clip(float f) {
 void Fl_GDI_Graphics_Driver::set_current_() {
   restore_clip();
 }
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx
index 9d4b0b354..6055ab1a5 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Arc (integer) drawing functions for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 /**
@@ -60,7 +58,3 @@ void Fl_GDI_Graphics_Driver::pie_unscaled(float x, float y, float w, float h, do
     } else Pie(gc_, x, y, x+w, y+h, xa, ya, xb, yb);
   } else Pie(gc_, x, y, x+w, y+h, xa, ya, xb, yb);
 }
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx
index 9df0c8a39..9e6466e92 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // MSWidnows' GDI color functions for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 // The fltk "colormap".  This allows ui colors to be stored in 8-bit
@@ -101,11 +99,11 @@ void Fl_GDI_Graphics_Driver::color(Fl_Color i) {
     if (!xmap.pen || xmap.pwidth != tw) {
 #if USE_COLORMAP
       if (fl_palette) {
-	set_xmap(xmap, PALETTEINDEX(i), tw);
+        set_xmap(xmap, PALETTEINDEX(i), tw);
       } else {
 #endif
-	unsigned c = fl_cmap[i];
-	set_xmap(xmap, RGB(uchar(c>>24), uchar(c>>16), uchar(c>>8)), tw);
+        unsigned c = fl_cmap[i];
+        set_xmap(xmap, RGB(uchar(c>>24), uchar(c>>16), uchar(c>>8)), tw);
 #if USE_COLORMAP
       }
 #endif
@@ -158,10 +156,10 @@ HBRUSH fl_brush_action(int action) {
     if (brushes[i].brush == NULL) goto CREATE_BRUSH;
     if ( (++brushes[i].usage) > 32000 ) { // keep a usage statistic
       for (int j=0; j<FL_N_BRUSH; j++) {
-	if (brushes[j].usage>16000)
-	  brushes[j].usage -= 16000;
-	else
-	  brushes[j].usage = 0;
+        if (brushes[j].usage>16000)
+          brushes[j].usage -= 16000;
+        else
+          brushes[j].usage = 0;
       }
     }
     return brushes[i].brush;
@@ -170,8 +168,8 @@ HBRUSH fl_brush_action(int action) {
     for (i=0; i<FL_N_BRUSH; i++) {
       if (brushes[i].brush == NULL) goto CREATE_BRUSH;
       if (brushes[i].usage<umin) {
-	umin = brushes[i].usage;
-	imin = i;
+        umin = brushes[i].usage;
+        imin = i;
       }
     }
     i = imin;
@@ -247,7 +245,3 @@ fl_select_palette(void)
 }
 
 #endif
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx
index 7127682cc..1e2b492f3 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Windows font utilities for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 #ifndef WIN32_LEAN_AND_MEAN
@@ -221,19 +219,19 @@ Fl_GDI_Font_Descriptor::Fl_GDI_Font_Descriptor(const char* name, Fl_Fontsize fsi
   }
   fid = CreateFont(
     -fsize, // negative makes it use "char size"
-    0,	            // logical average character width
-    fl_angle_*10,	            // angle of escapement
-    fl_angle_*10,	            // base-line orientation angle
+    0,              // logical average character width
+    fl_angle_*10,                   // angle of escapement
+    fl_angle_*10,                   // base-line orientation angle
     weight,
     italic,
-    FALSE,	        // underline attribute flag
-    FALSE,	        // strikeout attribute flag
+    FALSE,              // underline attribute flag
+    FALSE,              // strikeout attribute flag
     DEFAULT_CHARSET,    // character set identifier
-    OUT_DEFAULT_PRECIS,	// output precision
+    OUT_DEFAULT_PRECIS, // output precision
     CLIP_DEFAULT_PRECIS,// clipping precision
-    DEFAULT_QUALITY,	// output quality
-    DEFAULT_PITCH,	// pitch and family
-    name	        // pointer to typeface name string
+    DEFAULT_QUALITY,    // output quality
+    DEFAULT_PITCH,      // pitch and family
+    name                // pointer to typeface name string
     );
   angle = fl_angle_;
   HDC gc = (HDC)fl_graphics_driver->gc();
@@ -395,7 +393,7 @@ double Fl_GDI_Graphics_Driver::width_unscaled(unsigned int c) {
     for (int i = 0; i < 0x0400; i++) fl_fontsize->width[r][i] = -1;
   } else {
     if ( fl_fontsize->width[r][c&0x03FF] >= 0 ) { // already cached
-	return (double) fl_fontsize->width[r][c & 0x03FF];
+        return (double) fl_fontsize->width[r][c & 0x03FF];
     }
   }
   unsigned short ii = r * 0x400;
@@ -633,7 +631,3 @@ void Fl_GDI_Graphics_Driver::rtl_draw_unscaled(const char* c, int n, int x, int
   SetTextColor(gc_, oldColor);
 }
 #endif
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
index 0533b3b5f..6bc9ad82d 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Windows image drawing code for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2020 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 // I hope a simple and portable method of drawing color and monochrome
@@ -110,8 +108,8 @@ static void monodither(uchar* to, const uchar* from, int w, int delta) {
 static int fl_abs(int v) { return v<0 ? -v : v; }
 
 static void innards(const uchar *buf, int X, int Y, int W, int H,
-		    int delta, int linedelta, int depth,
-		    Fl_Draw_Image_Cb cb, void* userdata, HDC gc)
+                    int delta, int linedelta, int depth,
+                    Fl_Draw_Image_Cb cb, void* userdata, HDC gc)
 {
   char indexed = 0;
 
@@ -120,7 +118,7 @@ static void innards(const uchar *buf, int X, int Y, int W, int H,
 #endif
 
   if (depth==0) depth = 3;
-  if (indexed || !fl_can_do_alpha_blending()) 
+  if (indexed || !fl_can_do_alpha_blending())
     depth = (depth-1)|1;
 
   if (!linedelta) linedelta = W*fl_abs(delta);
@@ -149,9 +147,9 @@ static void innards(const uchar *buf, int X, int Y, int W, int H,
   } else
 #endif
   if (depth<3) {
-    RGBQUAD *bmi_colors = &bmi.bmiColors[0];	// suppress warning (STR #3199)
+    RGBQUAD *bmi_colors = &bmi.bmiColors[0];    // suppress warning (STR #3199)
     for (int i=0; i<256; i++) {
-      bmi_colors[i].rgbBlue = (uchar)i;		// bmi.bmiColors[i]...
+      bmi_colors[i].rgbBlue = (uchar)i;         // bmi.bmiColors[i]...
       bmi_colors[i].rgbGreen = (uchar)i;
       bmi_colors[i].rgbRed = (uchar)i;
       bmi_colors[i].rgbReserved = (uchar)0; // must be zero
@@ -170,7 +168,7 @@ static void innards(const uchar *buf, int X, int Y, int W, int H,
     pixelsize = 4;
   }
   int linesize = (pixelsize*w+3)&~3;
-  
+
   static U32* buffer;
   static long buffer_size;
   int blocking = h;
@@ -201,85 +199,85 @@ static void innards(const uchar *buf, int X, int Y, int W, int H,
     for (k = 0; j<h && k<blocking; k++, j++) {
       const uchar* from;
       if (!buf) { // run the converter:
-	cb(userdata, x-X, y-Y+j, w, (uchar*)line_buffer);
-	from = (uchar*)line_buffer;
+        cb(userdata, x-X, y-Y+j, w, (uchar*)line_buffer);
+        from = (uchar*)line_buffer;
       } else {
-	from = buf;
-	buf += linedelta;
+        from = buf;
+        buf += linedelta;
       }
       uchar *to = (uchar*)buffer+(blocking-k-1)*linesize;
 #if USE_COLORMAP
       if (indexed) {
-	if (depth<3)
-	  monodither(to, from, w, delta);
-	else 
-	  dither(to, from, w, delta);
-	to += w;
+        if (depth<3)
+          monodither(to, from, w, delta);
+        else
+          dither(to, from, w, delta);
+        to += w;
       } else
 #endif
       {
         int i;
         switch (depth) {
-          case 1: 
+          case 1:
             for (i=w; i--; from += delta) *to++ = *from;
             break;
           case 2:
-	    for (i=w; i--; from += delta, to += 4) {
-	      uchar a = from[1];
-	      uchar gray = (from[0]*a)>>8;
-	      to[0] = gray;
-	      to[1] = gray;
-	      to[2] = gray;
-	      to[3] = a;
+            for (i=w; i--; from += delta, to += 4) {
+              uchar a = from[1];
+              uchar gray = (from[0]*a)>>8;
+              to[0] = gray;
+              to[1] = gray;
+              to[2] = gray;
+              to[3] = a;
             }
             break;
           case 3:
-	    for (i=w; i--; from += delta, to += 3) {
-	      uchar r = from[0];
-	      to[0] = from[2];
-	      to[1] = from[1];
-	      to[2] = r;
+            for (i=w; i--; from += delta, to += 3) {
+              uchar r = from[0];
+              to[0] = from[2];
+              to[1] = from[1];
+              to[2] = r;
             }
-            break;          
+            break;
           case 4:
-	    for (i=w; i--; from += delta, to += 4) {
+            for (i=w; i--; from += delta, to += 4) {
               uchar a = from[3];
-	      uchar r = from[0];
-	      to[0] = (from[2]*a)>>8;
-	      to[1] = (from[1]*a)>>8;
-	      to[2] = (r*a)>>8;
-	      to[3] = from[3];
+              uchar r = from[0];
+              to[0] = (from[2]*a)>>8;
+              to[1] = (from[1]*a)>>8;
+              to[2] = (r*a)>>8;
+              to[3] = from[3];
             }
-            break;          
-        }            
+            break;
+        }
       }
     }
     if (fl_graphics_driver->has_feature(Fl_Graphics_Driver::PRINTER)) {
       // if print context, device and logical units are not equal, so SetDIBitsToDevice
       // does not do the expected job, whereas StretchDIBits does it.
       StretchDIBits(gc, x, y+j-k, w, k, 0, 0, w, k,
-		    (LPSTR)((uchar*)buffer+(blocking-k)*linesize),
-		    &bmi,
+                    (LPSTR)((uchar*)buffer+(blocking-k)*linesize),
+                    &bmi,
 #if USE_COLORMAP
-		    indexed ? DIB_PAL_COLORS : DIB_RGB_COLORS
+                    indexed ? DIB_PAL_COLORS : DIB_RGB_COLORS
 #else
-		    DIB_RGB_COLORS
+                    DIB_RGB_COLORS
 #endif
-		    , SRCCOPY );
+                    , SRCCOPY );
       delete[] buffer;
       buffer = NULL;
       buffer_size = 0;
     }
     else {
       SetDIBitsToDevice(gc, x, y+j-k, w, k, 0, 0, 0, k,
-			(LPSTR)((uchar*)buffer+(blocking-k)*linesize),
-			&bmi,
+                        (LPSTR)((uchar*)buffer+(blocking-k)*linesize),
+                        &bmi,
 #if USE_COLORMAP
-			indexed ? DIB_PAL_COLORS : DIB_RGB_COLORS
+                        indexed ? DIB_PAL_COLORS : DIB_RGB_COLORS
 #else
-			DIB_RGB_COLORS
+                        DIB_RGB_COLORS
 #endif
-			);
+                        );
       }
   }
 }
@@ -294,7 +292,7 @@ void Fl_GDI_Graphics_Driver::draw_image_unscaled(const uchar* buf, int x, int y,
 }
 
 void Fl_GDI_Graphics_Driver::draw_image_unscaled(Fl_Draw_Image_Cb cb, void* data,
-		   int x, int y, int w, int h,int d) {
+                   int x, int y, int w, int h,int d) {
   if (fl_abs(d)&FL_IMAGE_WITH_ALPHA) {
     d ^= FL_IMAGE_WITH_ALPHA;
     innards(0,x,y,w,h,d,0,(d<3&&d>-3),cb,data, gc_);
@@ -313,7 +311,7 @@ void Fl_GDI_Graphics_Driver::draw_image_mono_unscaled(const uchar* buf, int x, i
 }
 
 void Fl_GDI_Graphics_Driver::draw_image_mono_unscaled(Fl_Draw_Image_Cb cb, void* data,
-		   int x, int y, int w, int h,int d) {
+                   int x, int y, int w, int h,int d) {
   if (fl_abs(d)&FL_IMAGE_WITH_ALPHA) {
     d ^= FL_IMAGE_WITH_ALPHA;
     innards(0,x,y,w,h,d,0,1,cb,data, gc_);
@@ -347,9 +345,9 @@ Fl_Bitmask Fl_GDI_Graphics_Driver::create_bitmask(int w, int h, const uchar *dat
   static uchar loNibble[16] =
   { 0x00, 0x08, 0x04, 0x0c, 0x02, 0x0a, 0x06, 0x0e,
     0x01, 0x09, 0x05, 0x0d, 0x03, 0x0b, 0x07, 0x0f };
-  int np  = GetDeviceCaps(gc_, PLANES);	//: was always one on sample machines
+  int np  = GetDeviceCaps(gc_, PLANES); //: was always one on sample machines
   int bpp = GetDeviceCaps(gc_, BITSPIXEL);//: 1,4,8,16,24,32 and more odd stuff?
-  int Bpr = (bpp*w+7)/8;			//: bytes per row
+  int Bpr = (bpp*w+7)/8;                        //: bytes per row
   int pad = Bpr&1, w1 = (w+7)/8, shr = ((w-1)&7)+1;
   if (bpp==4) shr = (shr+1)/2;
   uchar *newarray = new uchar[(Bpr+pad)*h];
@@ -391,7 +389,7 @@ Fl_Bitmask Fl_GDI_Graphics_Driver::create_bitmask(int w, int h, const uchar *dat
 
   bm = CreateBitmap(w, h, np, bpp, newarray);
   delete[] newarray;
-  
+
   return bm;
 }
 
@@ -601,7 +599,7 @@ static Fl_Bitmask fl_create_bitmap(int w, int h, const uchar *data) {
   const uchar* src = data;
   uchar* dest = newarray;
   Fl_Bitmask bm;
-  static uchar reverse[16] =	/* Bit reversal lookup table */
+  static uchar reverse[16] =    /* Bit reversal lookup table */
   { 0x00, 0x88, 0x44, 0xcc, 0x22, 0xaa, 0x66, 0xee,
     0x11, 0x99, 0x55, 0xdd, 0x33, 0xbb, 0x77, 0xff };
 
@@ -613,9 +611,9 @@ static Fl_Bitmask fl_create_bitmap(int w, int h, const uchar *data) {
   }
 
   bm = CreateBitmap(w, h, 1, 1, newarray);
-  
+
   delete[] newarray;
-  
+
   return bm;
 }
 
@@ -716,7 +714,3 @@ void Fl_GDI_Graphics_Driver::cache(Fl_Pixmap *img) {
 void Fl_GDI_Graphics_Driver::uncache_pixmap(fl_uintptr_t offscreen) {
   DeleteObject((Fl_Offscreen)offscreen);
 }
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx
index 41cca4fb0..e71fa65d7 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Line style code for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 /**
@@ -61,7 +59,3 @@ void Fl_GDI_Graphics_Driver::line_style_unscaled(int style, float width, char* d
   DeleteObject(fl_current_xmap->pen);
   fl_current_xmap->pen = newpen;
 }
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx
index 3e5d6bfb9..6bb526b6c 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Rectangle drawing routines for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 
@@ -197,7 +195,7 @@ int Fl_GDI_Graphics_Driver::clip_box(int x, int y, int w, int h, int& X, int& Y,
     ret = 2;
   } else if (EqualRgn(temp, rr)) { // complete
     ret = 0;
-  } else {	// partial intersection
+  } else {      // partial intersection
     RECT rect;
     GetRgnBox(temp, &rect);
     if (Fl_Surface_Device::surface() != Fl_Display_Device::display_device()) { // if print context, convert coords from device to logical
@@ -239,7 +237,3 @@ void Fl_GDI_Graphics_Driver::restore_clip() {
     if (r) unscale_clip(r);
   }
 }
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx
index caace8b39..c556121cc 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Portable drawing routines for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,18 +7,18 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 /**
   \file Fl_GDI_Graphics_Driver_vertex.cxx
 
   \brief  Portable drawing code for drawing arbitrary shapes with
-	  simple 2D transformations, implemented for Windows GDI.
+          simple 2D transformations, implemented for Windows GDI.
 */
 
 #include "Fl_GDI_Graphics_Driver.H"
@@ -99,9 +97,5 @@ void Fl_GDI_Graphics_Driver::ellipse_unscaled(double xt, double yt, double rx, d
     SelectObject(gc_, fl_brush());
     Pie(gc_, llx, lly, llx+w, lly+h, 0,0, 0,0);
   } else
-    Arc(gc_, llx, lly, llx+w, lly+h, 0,0, 0,0); 
+    Arc(gc_, llx, lly, llx+w, lly+h, 0,0, 0,0);
 }
-
-//
-// End of "$Id$".
-//
diff --git a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx
index 43fe15dcb..a7b9f1e8c 100644
--- a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx
+++ b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Draw-to-image code for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2018 by Bill Spitzak and others.
@@ -9,11 +7,11 @@
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/bugs.php
 //
 
 
@@ -102,8 +100,3 @@ void Fl_GDI_Image_Surface_Driver::end_current()
   fl_window = pre_window;
   Fl_Surface_Device::end_current();
 }
-
-
-//
-// End of "$Id$".
-//