try to use consitent ordering for include files in libgui sources Use alphabetical ordering for include files in libgui sources. Group in blocks in teh following order: standard header files Qt header files libgui header files liboctave header files libinterp header files Use forward declarations for Octave classes where possible. Files affected: color-picker.h, dialog.cc, dialog.h, documentation-dock-widget.h, documentation.cc, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.h, gui-preferences-mw.h, gui-preferences.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, m-editor/file-editor-interface.h, m-editor/file-editor-tab.cc, m-editor/file-editor-tab.h, m-editor/file-editor.cc, m-editor/file-editor.h, m-editor/marker.h, m-editor/octave-qscintilla.cc, m-editor/octave-qscintilla.h, main-window.cc, main-window.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, qt-application.cc, qt-interpreter-events.cc, qt-interpreter-events.h, resource-manager.cc, resource-manager.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, and workspace-view.h.

--- a/libgui/src/m-editor/octave-qscintilla.cc	Fri Jun 07 10:14:35 2019 +0200
+++ b/libgui/src/m-editor/octave-qscintilla.cc	Sun Sep 15 12:28:23 2019 -0400
@@ -30,6 +30,11 @@
 
 #include <Qsci/qscilexer.h>
 
+#include <QKeySequence>
+#include <QMimeData>
+#include <QShortcut>
+#include <QToolTip>
+#include <QVBoxLayout>
 #if defined (HAVE_QSCI_QSCILEXEROCTAVE_H)
 #  define HAVE_LEXER_OCTAVE 1
 #  include <Qsci/qscilexeroctave.h>
@@ -37,29 +42,21 @@
 #  define HAVE_LEXER_MATLAB 1
 #  include <Qsci/qscilexermatlab.h>
 #endif
-#include <Qsci/qscilexercpp.h>
+#include <Qsci/qscicommandset.h>
 #include <Qsci/qscilexerbash.h>
-#include <Qsci/qscilexerperl.h>
 #include <Qsci/qscilexerbatch.h>
+#include <Qsci/qscilexercpp.h>
 #include <Qsci/qscilexerdiff.h>
-
-#include <Qsci/qscicommandset.h>
+#include <Qsci/qscilexerperl.h>
 
-#include <QKeySequence>
-#include <QMimeData>
-#include <QShortcut>
-#include <QToolTip>
-#include <QVBoxLayout>
-
+#include "file-editor-tab.h"
 #include "gui-preferences.h"
+// FIXME: hardwired marker numbers?
+#include "marker.h"
+#include "octave-qscintilla.h"
 #include "resource-manager.h"
 #include "shortcut-manager.h"
 
-#include "octave-qscintilla.h"
-#include "file-editor-tab.h"
-// FIXME: hardwired marker numbers?
-#include "marker.h"
-
 // Return true if CANDIDATE is a "closing" that matches OPENING,
 // such as "end" or "endif" for "if", or "catch" for "try".
 // Used for testing the last word of an "if" etc. line,