1 files changed, 10 insertions, 21 deletions
diff --git a/FL/core/options.H b/FL/core/options.H
index 43f4bec20..0ecdfabeb 100644
--- a/FL/core/options.H
+++ b/FL/core/options.H
@@ -16,16 +16,10 @@
 
 /** \file FL/core/options.H
   \brief Application and system wide options management.
+  This file is included within class Fl in FL/Fl.H.
 */
 
-#ifndef Fl_core_options_H
-#define Fl_core_options_H
-
-#include <FL/fl_config.h>             // build configuration
-#include <FL/Fl_Export.H>             // for FL_EXPORT
-
-
-namespace Fl {
+// --- Options declarations ---
 
 /** Enumerator for global FLTK options.
     These options can be set system wide, per user, or for the running
@@ -102,8 +96,8 @@ typedef enum {
   /// When switched on and when the keyboard in use has '+' in the shifted position of its key,
   /// pressing that key and ctrl triggers the zoom-in operation.
   /// When switched off (default), the zoom-in operation requires that also the shift key is pressed.
-  /// Under macOS, this option has no effect because the OS itself generates ⌘= followed
-  /// by ⌘+ when pressing ⌘ and the '=|+' key without pressing shift.
+  /// Under macOS, this option has no effect because the OS itself generates cmd= followed
+  /// by cmd+ when pressing cmd and the '=|+' key without pressing shift.
   OPTION_SIMPLE_ZOOM_SHORTCUT,
 
   // don't change this, leave it always as the last element
@@ -115,12 +109,12 @@ typedef enum {
  Return a global setting for all FLTK applications, possibly overridden
  by a setting specifically for this application.
  */
-FL_EXPORT extern bool option(Fl_Option opt);
+static FL_EXPORT bool option(Fl_Option opt);
 
 /*
  Override an option while the application is running.
  */
-FL_EXPORT extern void option(Fl_Option opt, bool val);
+static FL_EXPORT void option(Fl_Option opt, bool val);
 
 // Visible focus methods...
 
@@ -129,14 +123,14 @@ FL_EXPORT extern void option(Fl_Option opt, bool val);
   non-text widgets. The default mode is to enable keyboard focus
   for all widgets.
 */
-FL_EXPORT inline void visible_focus(int v) { option(OPTION_VISIBLE_FOCUS, (v!=0)); }
+static FL_EXPORT inline void visible_focus(int v) { option(OPTION_VISIBLE_FOCUS, (v!=0)); }
 
 /**
   Gets or sets the visible keyboard focus on buttons and other
   non-text widgets. The default mode is to enable keyboard focus
   for all widgets.
 */
-FL_EXPORT inline int  visible_focus() { return option(OPTION_VISIBLE_FOCUS); }
+static FL_EXPORT inline int  visible_focus() { return option(OPTION_VISIBLE_FOCUS); }
 
 // Drag-n-drop text operation methods...
 
@@ -146,7 +140,7 @@ FL_EXPORT inline int  visible_focus() { return option(OPTION_VISIBLE_FOCUS); }
   be dragged from text fields or dragged within a text field as a
   cut/paste shortcut.
 */
-FL_EXPORT inline void dnd_text_ops(int v) { option(OPTION_DND_TEXT, (v!=0)); }
+static FL_EXPORT inline void dnd_text_ops(int v) { option(OPTION_DND_TEXT, (v!=0)); }
 
 /**
   Gets whether drag and drop text operations are
@@ -154,9 +148,4 @@ FL_EXPORT inline void dnd_text_ops(int v) { option(OPTION_DND_TEXT, (v!=0)); }
   be dragged from text fields or dragged within a text field as a
   cut/paste shortcut.
 */
-FL_EXPORT inline int  dnd_text_ops() { return option(OPTION_DND_TEXT); }
-
-} // namespace Fl
-
-
-#endif // !Fl_core_options_H
+static FL_EXPORT inline int  dnd_text_ops() { return option(OPTION_DND_TEXT); }