From 5d9ca9864ead98b9890628c7b1a3c730bf572758 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 1 Nov 2015 19:53:19 -0500
Subject: [PATCH] Cmd*: Moved include to top of list, per flint++
 recommendation

---
 src/commands/CmdAdd.cpp         | 2 +-
 src/commands/CmdAliases.cpp     | 2 +-
 src/commands/CmdAnnotate.cpp    | 2 +-
 src/commands/CmdAppend.cpp      | 2 +-
 src/commands/CmdAttributes.cpp  | 2 +-
 src/commands/CmdBurndown.cpp    | 2 +-
 src/commands/CmdCalc.cpp        | 2 +-
 src/commands/CmdCalendar.cpp    | 2 +-
 src/commands/CmdColor.cpp       | 2 +-
 src/commands/CmdColumns.cpp     | 2 +-
 src/commands/CmdCommands.cpp    | 2 +-
 src/commands/CmdConfig.cpp      | 2 +-
 src/commands/CmdContext.cpp     | 4 ++--
 src/commands/CmdCount.cpp       | 2 +-
 src/commands/CmdCustom.cpp      | 2 +-
 src/commands/CmdDelete.cpp      | 2 +-
 src/commands/CmdDenotate.cpp    | 2 +-
 src/commands/CmdDiagnostics.cpp | 2 +-
 src/commands/CmdDone.cpp        | 2 +-
 src/commands/CmdDuplicate.cpp   | 2 +-
 src/commands/CmdExec.cpp        | 2 +-
 src/commands/CmdExport.cpp      | 2 +-
 src/commands/CmdGet.cpp         | 2 +-
 src/commands/CmdHelp.cpp        | 2 +-
 src/commands/CmdHistory.cpp     | 2 +-
 src/commands/CmdIDs.cpp         | 2 +-
 src/commands/CmdImport.cpp      | 4 ++--
 src/commands/CmdInfo.cpp        | 2 +-
 src/commands/CmdLog.cpp         | 2 +-
 src/commands/CmdModify.cpp      | 2 +-
 src/commands/CmdPrepend.cpp     | 2 +-
 src/commands/CmdProjects.cpp    | 2 +-
 src/commands/CmdReports.cpp     | 2 +-
 src/commands/CmdShow.cpp        | 2 +-
 src/commands/CmdStart.cpp       | 2 +-
 src/commands/CmdStats.cpp       | 2 +-
 src/commands/CmdStop.cpp        | 2 +-
 src/commands/CmdSummary.cpp     | 2 +-
 src/commands/CmdSync.cpp        | 2 +-
 src/commands/CmdTags.cpp        | 2 +-
 src/commands/CmdTimesheet.cpp   | 2 +-
 src/commands/CmdUDAs.cpp        | 2 +-
 src/commands/CmdUndo.cpp        | 2 +-
 src/commands/CmdUnique.cpp      | 2 +-
 src/commands/CmdVersion.cpp     | 2 +-
 45 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index 02433ed75..f7cd5a9c3 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -25,12 +25,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdAdd.h>
 #include <Context.h>
 #include <text.h>
 #include <i18n.h>
 #include <util.h>
 #include <main.h>
-#include <CmdAdd.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdAliases.cpp b/src/commands/CmdAliases.cpp
index e83d9e86b..a40651961 100644
--- a/src/commands/CmdAliases.cpp
+++ b/src/commands/CmdAliases.cpp
@@ -25,9 +25,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdAliases.h>
 #include <Context.h>
 #include <Command.h>
-#include <CmdAliases.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index d83fdbf46..389116504 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdAnnotate.h>
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
@@ -32,7 +33,6 @@
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
-#include <CmdAnnotate.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index 0465b7936..88fc39ef1 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdAppend.h>
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
@@ -32,7 +33,6 @@
 #include <text.h>
 #include <i18n.h>
 #include <main.h>
-#include <CmdAppend.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdAttributes.cpp b/src/commands/CmdAttributes.cpp
index 8604736f2..1b9b91df8 100644
--- a/src/commands/CmdAttributes.cpp
+++ b/src/commands/CmdAttributes.cpp
@@ -25,12 +25,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdAttributes.h>
 #include <sstream>
 #include <algorithm>
 #include <stdlib.h>
 #include <Context.h>
 #include <Command.h>
-#include <CmdAttributes.h>
 #include <i18n.h>
 
 extern Context context;
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index 3eda03e7d..eda52f53b 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdBurndown.h>
 #include <sstream>
 #include <algorithm>
 #include <limits>
@@ -37,7 +38,6 @@
 #include <i18n.h>
 #include <text.h>
 #include <util.h>
-#include <CmdBurndown.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdCalc.cpp b/src/commands/CmdCalc.cpp
index 8549f55bb..16337efc9 100644
--- a/src/commands/CmdCalc.cpp
+++ b/src/commands/CmdCalc.cpp
@@ -25,12 +25,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <Context.h>
+#include <CmdCalc.h>
 #include <Filter.h>
 #include <Eval.h>
 #include <Dates.h>
 #include <main.h>
 #include <i18n.h>
-#include <CmdCalc.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index e05102f05..b45712f95 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdCalendar.h>
 #include <sstream>
 #include <iomanip>
 #include <stdlib.h>
@@ -36,7 +37,6 @@
 #include <util.h>
 #include <utf8.h>
 #include <main.h>
-#include <CmdCalendar.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index bc5b56369..3657b0c3c 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdColor.h>
 #include <sstream>
 #include <ViewText.h>
 #include <Context.h>
@@ -32,7 +33,6 @@
 #include <Color.h>
 #include <text.h>
 #include <i18n.h>
-#include <CmdColor.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index f4c979d47..0fc5d7f53 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdColumns.h>
 #include <algorithm>
 #include <Context.h>
 #include <ViewText.h>
@@ -32,7 +33,6 @@
 #include <text.h>
 #include <i18n.h>
 #include <main.h>
-#include <CmdColumns.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index ca256d1a0..51a939b03 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -25,13 +25,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdCommands.h>
 #include <sstream>
 #include <algorithm>
 #include <stdlib.h>
 #include <Context.h>
 #include <ViewText.h>
 #include <Command.h>
-#include <CmdCommands.h>
 #include <ColString.h>
 #include <text.h>
 #include <i18n.h>
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index 92558f431..29bf58c3e 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdConfig.h>
 #include <sstream>
 #include <algorithm>
 #include <Context.h>
@@ -32,7 +33,6 @@
 #include <i18n.h>
 #include <text.h>
 #include <util.h>
-#include <CmdConfig.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index 5e39a956f..6b147bc87 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdContext.h>
+#include <CmdConfig.h>
 #include <Context.h>
 #include <Filter.h>
 #include <sstream>
@@ -32,8 +34,6 @@
 #include <i18n.h>
 #include <util.h>
 #include <text.h>
-#include <CmdContext.h>
-#include <CmdConfig.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp
index c82f5910c..922918df8 100644
--- a/src/commands/CmdCount.cpp
+++ b/src/commands/CmdCount.cpp
@@ -25,12 +25,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdCount.h>
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
 #include <text.h>
 #include <i18n.h>
-#include <CmdCount.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index df9703c1b..4f45a8bac 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdCustom.h>
 #include <sstream>
 #include <map>
 #include <vector>
@@ -37,7 +38,6 @@
 #include <i18n.h>
 #include <text.h>
 #include <main.h>
-#include <CmdCustom.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index 431c29d87..178e214b7 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdDelete.h>
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
@@ -32,7 +33,6 @@
 #include <text.h>
 #include <i18n.h>
 #include <main.h>
-#include <CmdDelete.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index d5affca24..e884d7156 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdDenotate.h>
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
@@ -32,7 +33,6 @@
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
-#include <CmdDenotate.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index d5b2e1b1f..4403119c6 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdDiagnostics.h>
 #include <iomanip>
 #include <sstream>
 #include <algorithm>
@@ -43,7 +44,6 @@
 #include <gnutls/gnutls.h>
 #endif
 
-#include <CmdDiagnostics.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index 830d8a45f..99543d3af 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdDone.h>
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
@@ -32,7 +33,6 @@
 #include <text.h>
 #include <i18n.h>
 #include <main.h>
-#include <CmdDone.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index beb454aa6..673257514 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdDuplicate.h>
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
@@ -32,7 +33,6 @@
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
-#include <CmdDuplicate.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdExec.cpp b/src/commands/CmdExec.cpp
index ca50ca029..4da91a2bd 100644
--- a/src/commands/CmdExec.cpp
+++ b/src/commands/CmdExec.cpp
@@ -25,11 +25,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdExec.h>
 #include <stdlib.h>
 #include <Context.h>
 #include <i18n.h>
 #include <text.h>
-#include <CmdExec.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index fb7ed8aac..7e4a0b52b 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -25,11 +25,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdExport.h>
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
 #include <i18n.h>
-#include <CmdExport.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp
index d27bdee65..4149e167c 100644
--- a/src/commands/CmdGet.cpp
+++ b/src/commands/CmdGet.cpp
@@ -25,12 +25,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdGet.h>
 #include <Variant.h>
 #include <Context.h>
 #include <main.h>
 #include <text.h>
 #include <i18n.h>
-#include <CmdGet.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index d174db611..bb74465b6 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
-#include <algorithm>
 #include <CmdHelp.h>
+#include <algorithm>
 #include <ViewText.h>
 #include <Context.h>
 #include <i18n.h>
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 465fb699b..17e247b64 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdHistory.h>
 #include <sstream>
 #include <Context.h>
 #include <Filter.h>
@@ -33,7 +34,6 @@
 #include <text.h>
 #include <i18n.h>
 #include <ISO8601.h>
-#include <CmdHistory.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index f1a919186..5b6dbe731 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdIDs.h>
 #include <sstream>
 #include <algorithm>
 #include <Context.h>
@@ -32,7 +33,6 @@
 #include <main.h>
 #include <text.h>
 #include <i18n.h>
-#include <CmdIDs.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index 79877f0d2..940c617ae 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdImport.h>
+#include <CmdModify.h>
 #include <iostream>
 #include <sstream>
 #include <Context.h>
@@ -33,8 +35,6 @@
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
-#include <CmdImport.h>
-#include <CmdModify.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index a284b0efd..2c6268408 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdInfo.h>
 #include <sstream>
 #include <stdlib.h>
 #include <math.h>
@@ -34,7 +35,6 @@
 #include <main.h>
 #include <text.h>
 #include <i18n.h>
-#include <CmdInfo.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp
index d99939a46..1b11e68b5 100644
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@@ -25,12 +25,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdLog.h>
 #include <Context.h>
 #include <text.h>
 #include <i18n.h>
 #include <util.h>
 #include <main.h>
-#include <CmdLog.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index 655fe3c17..606df67d1 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdModify.h>
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
@@ -32,7 +33,6 @@
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
-#include <CmdModify.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index e655aad0a..ceb983135 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdPrepend.h>
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
@@ -32,7 +33,6 @@
 #include <text.h>
 #include <i18n.h>
 #include <main.h>
-#include <CmdPrepend.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index 27cd0ce9d..4d110396d 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdProjects.h>
 #include <algorithm>
 #include <sstream>
 #include <Context.h>
@@ -34,7 +35,6 @@
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
-#include <CmdProjects.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index 54f32e532..882ccbdaa 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -25,13 +25,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdReports.h>
 #include <sstream>
 #include <algorithm>
 #include <Context.h>
 #include <ViewText.h>
 #include <text.h>
 #include <i18n.h>
-#include <CmdReports.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index 258ea20c6..6ec410f49 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdShow.h>
 #include <vector>
 #include <sstream>
 #include <algorithm>
@@ -34,7 +35,6 @@
 #include <Context.h>
 #include <FS.h>
 #include <ViewText.h>
-#include <CmdShow.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index 2cb861999..f32326c68 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdStart.h>
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
@@ -32,7 +33,6 @@
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
-#include <CmdStart.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 580e69a7e..1f08e78c3 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdStats.h>
 #include <sstream>
 #include <iomanip>
 #include <stdlib.h>
@@ -36,7 +37,6 @@
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
-#include <CmdStats.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index b0a3fcef5..21ef87528 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -25,13 +25,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdStop.h>
 #include <iostream>
 #include <Context.h>
 #include <Filter.h>
 #include <main.h>
 #include <text.h>
 #include <i18n.h>
-#include <CmdStop.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index f8ec2193e..170108f88 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdSummary.h>
 #include <algorithm>
 #include <sstream>
 #include <stdlib.h>
@@ -36,7 +37,6 @@
 #include <util.h>
 #include <i18n.h>
 #include <main.h>
-#include <CmdSummary.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index 4f52d9e01..a2071db07 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdSync.h>
 #include <sstream>
 #include <inttypes.h>
 #include <signal.h>
@@ -34,7 +35,6 @@
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
-#include <CmdSync.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index f04de92c2..bf23e1389 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -25,13 +25,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdTags.h>
 #include <sstream>
 #include <vector>
 #include <stdlib.h>
 #include <Context.h>
 #include <Filter.h>
 #include <ViewText.h>
-#include <CmdTags.h>
 #include <text.h>
 #include <i18n.h>
 
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index df3ba2c39..3dcd9e0a5 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdTimesheet.h>
 #include <sstream>
 #include <stdlib.h>
 #include <Context.h>
@@ -34,7 +35,6 @@
 #include <main.h>
 #include <i18n.h>
 #include <text.h>
-#include <CmdTimesheet.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index aa4fcec32..62b93cd48 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdUDAs.h>
 #include <sstream>
 #include <algorithm>
 #include <Context.h>
@@ -34,7 +35,6 @@
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
-#include <CmdUDAs.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp
index 6ec119407..fa1156eb2 100644
--- a/src/commands/CmdUndo.cpp
+++ b/src/commands/CmdUndo.cpp
@@ -25,10 +25,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdUndo.h>
 #include <Context.h>
 #include <Filter.h>
 #include <i18n.h>
-#include <CmdUndo.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index 3a5099c61..ceebcfa54 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdUnique.h>
 #include <string>
 #include <set>
 #include <algorithm>
@@ -33,7 +34,6 @@
 #include <main.h>
 #include <text.h>
 #include <i18n.h>
-#include <CmdUnique.h>
 
 extern Context context;
 
diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index afb5b9dd1..e8425b373 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <CmdVersion.h>
 #include <sstream>
 #include <stdlib.h>
 #include <Context.h>
@@ -32,7 +33,6 @@
 #ifdef HAVE_COMMIT
 #include <commit.h>
 #endif
-#include <CmdVersion.h>
 #include <text.h>
 #include <i18n.h>