Some minor cleaning up.

src/plugins/dataStore/DataStore/src/datastoredialog.cpp

@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 #include "coreguiutils.h"
-#include "datastoreinterface.h"
 #include "datastoredialog.h"
+#include "datastoreinterface.h"
 #include "plugin.h"
 
 //==============================================================================

src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.cpp

@@ -25,9 +25,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "cellmlannotationview.h"
 #include "cellmlannotationviewcellmllistwidget.h"
 #include "cellmlannotationvieweditingwidget.h"
-#include "cellmlannotationviewmetadatanormalviewdetailswidget.h"
 #include "cellmlannotationviewmetadatadetailswidget.h"
 #include "cellmlannotationviewmetadataeditdetailswidget.h"
+#include "cellmlannotationviewmetadatanormalviewdetailswidget.h"
 #include "cellmlannotationviewplugin.h"
 #include "cellmlfilemanager.h"
 #include "corecliutils.h"

src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.cpp

@@ -23,14 +23,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "borderedwidget.h"
 #include "cellmlannotationvieweditingwidget.h"
-#include "cellmlannotationviewmetadatanormalviewdetailswidget.h"
 #include "cellmlannotationviewmetadatadetailswidget.h"
 #include "cellmlannotationviewmetadataeditdetailswidget.h"
+#include "cellmlannotationviewmetadatanormalviewdetailswidget.h"
 #include "cellmlannotationviewmetadataviewdetailswidget.h"
 #include "cellmlannotationviewplugin.h"
 #include "filemanager.h"
-#include "usermessagewidget.h"
 #include "progressbarwidget.h"
+#include "usermessagewidget.h"
 #include "webviewerwidget.h"
 
 //==============================================================================

src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.cpp

@@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "cellmlannotationvieweditingwidget.h"
 #include "cellmlannotationviewmetadatadetailswidget.h"
 #include "cellmlannotationviewmetadataeditdetailswidget.h"
-#include "cellmlannotationviewmetadataviewdetailswidget.h"
 #include "cellmlannotationviewmetadatanormalviewdetailswidget.h"
+#include "cellmlannotationviewmetadataviewdetailswidget.h"
 #include "cellmlannotationviewwidget.h"
 #include "cellmlfilerdftriple.h"
 #include "coreguiutils.h"

src/plugins/editing/CellMLTextView/src/cellmltextviewconverter.cpp

@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 #include "cellmlfile.h"
-#include "corecliutils.h"
 #include "cellmltextviewconverter.h"
+#include "corecliutils.h"
 
 //==============================================================================
 

src/plugins/editing/RawCellMLView/src/rawcellmlviewwidget.cpp

@@ -24,8 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //       to updating the viewer (e.g. see the XSL transformation)...
 //==============================================================================
 
-#include "cellmlfilemanager.h"
 #include "cellmleditingviewwidget.h"
+#include "cellmlfilemanager.h"
 #include "corecliutils.h"
 #include "editorlistwidget.h"
 #include "editorwidgeteditorwidget.h"

src/plugins/editing/RawSEDMLView/src/rawsedmlviewwidget.cpp

@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "rawsedmlviewwidget.h"
 #include "sedmleditingviewwidget.h"
 #include "sedmlfile.h"
-#include "sedmlfilemanager.h"
 #include "sedmlfileissue.h"
+#include "sedmlfilemanager.h"
 
 //==============================================================================
 

src/plugins/editing/SEDMLEditingView/src/sedmleditingviewplugin.cpp

@@ -23,10 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "corecliutils.h"
 #include "coreguiutils.h"
-#include "sedmleditingviewplugin.h"
 #include "editingviewinterface.h"
 #include "filemanager.h"
 #include "sedmleditingviewinterface.h"
+#include "sedmleditingviewplugin.h"
 
 //==============================================================================
 

src/plugins/miscellaneous/Core/src/borderedwidget.h

@@ -25,8 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#include "widget.h"
 #include "coreglobal.h"
+#include "widget.h"
 
 //==============================================================================
 

src/plugins/miscellaneous/Core/src/centralwidget.h

@@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 #include "file.h"
-#include "widget.h"
 #include "viewinterface.h"
+#include "widget.h"
 
 //==============================================================================
 

src/plugins/miscellaneous/Core/src/coreguiutils.cpp

@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 #include "centralwidget.h"
-#include "corecliutils.h"
 #include "commonwidget.h"
+#include "corecliutils.h"
 #include "coreguiutils.h"
 #include "filemanager.h"
 

src/plugins/miscellaneous/HelpWindow/src/helpwindowwindow.cpp

@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "borderedwidget.h"
 #include "corecliutils.h"
-#include "helpwindowwindow.h"
 #include "helpwindowwidget.h"
+#include "helpwindowwindow.h"
 #include "toolbarwidget.h"
 
 //==============================================================================

src/plugins/organisation/FileBrowserWindow/src/filebrowserwindowwindow.cpp

@@ -21,8 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // File Browser window
 //==============================================================================
 
-#include "filebrowserwindowwindow.h"
 #include "filebrowserwindowwidget.h"
+#include "filebrowserwindowwindow.h"
 #include "toolbarwidget.h"
 
 //==============================================================================

src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowwindow.cpp

@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 #include "coreguiutils.h"
-#include "fileorganiserwindowwindow.h"
 #include "fileorganiserwindowwidget.h"
+#include "fileorganiserwindowwindow.h"
 #include "toolbarwidget.h"
 
 //==============================================================================