From 954d3f5058388bff03c4402111c8a975699dcc58 Mon Sep 17 00:00:00 2001
From: Felix Schurk <felix.schurk@rwth-aachen.de>
Date: Wed, 24 Jul 2024 18:20:43 +0200
Subject: [PATCH] add blank line between cmake.h header include to prevent
 sorting

* add required comment in the line below cmake.h include header
---
 src/CLI2.cpp                    | 2 ++
 src/Context.cpp                 | 2 ++
 src/DOM.cpp                     | 2 ++
 src/Eval.cpp                    | 2 ++
 src/Filter.cpp                  | 2 ++
 src/Hooks.cpp                   | 2 ++
 src/Lexer.cpp                   | 2 ++
 src/TDB2.cpp                    | 2 ++
 src/Task.cpp                    | 2 ++
 src/Variant.cpp                 | 2 ++
 src/Version.cpp                 | 2 ++
 src/ViewTask.cpp                | 4 +++-
 src/calc.cpp                    | 2 ++
 src/columns/ColDepends.cpp      | 2 ++
 src/columns/ColDescription.cpp  | 2 ++
 src/columns/ColDue.cpp          | 2 ++
 src/columns/ColEnd.cpp          | 2 ++
 src/columns/ColEntry.cpp        | 2 ++
 src/columns/ColID.cpp           | 2 ++
 src/columns/ColIMask.cpp        | 2 ++
 src/columns/ColLast.cpp         | 2 ++
 src/columns/ColMask.cpp         | 2 ++
 src/columns/ColModified.cpp     | 2 ++
 src/columns/ColParent.cpp       | 2 ++
 src/columns/ColProject.cpp      | 2 ++
 src/columns/ColRType.cpp        | 2 ++
 src/columns/ColRecur.cpp        | 2 ++
 src/columns/ColScheduled.cpp    | 2 ++
 src/columns/ColStart.cpp        | 2 ++
 src/columns/ColStatus.cpp       | 2 ++
 src/columns/ColTags.cpp         | 2 ++
 src/columns/ColTemplate.cpp     | 2 ++
 src/columns/ColTypeDate.cpp     | 4 +++-
 src/columns/ColTypeDuration.cpp | 2 ++
 src/columns/ColTypeNumeric.cpp  | 2 ++
 src/columns/ColTypeString.cpp   | 2 ++
 src/columns/ColUDA.cpp          | 2 ++
 src/columns/ColUUID.cpp         | 2 ++
 src/columns/ColUntil.cpp        | 2 ++
 src/columns/ColUrgency.cpp      | 2 ++
 src/columns/ColWait.cpp         | 2 ++
 src/columns/Column.cpp          | 2 ++
 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/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     | 2 ++
 src/commands/CmdCount.cpp       | 2 ++
 src/commands/CmdCustom.cpp      | 2 ++
 src/commands/CmdDelete.cpp      | 4 +++-
 src/commands/CmdDenotate.cpp    | 2 ++
 src/commands/CmdDiagnostics.cpp | 2 ++
 src/commands/CmdDone.cpp        | 6 ++++--
 src/commands/CmdDuplicate.cpp   | 2 ++
 src/commands/CmdEdit.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      | 2 ++
 src/commands/CmdInfo.cpp        | 2 ++
 src/commands/CmdLog.cpp         | 2 ++
 src/commands/CmdLogo.cpp        | 2 ++
 src/commands/CmdModify.cpp      | 2 ++
 src/commands/CmdNews.cpp        | 4 +++-
 src/commands/CmdPrepend.cpp     | 2 ++
 src/commands/CmdProjects.cpp    | 2 ++
 src/commands/CmdPurge.cpp       | 2 ++
 src/commands/CmdReports.cpp     | 2 ++
 src/commands/CmdShow.cpp        | 4 +++-
 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/CmdUrgency.cpp     | 2 ++
 src/commands/CmdVersion.cpp     | 2 ++
 src/commands/Command.cpp        | 2 ++
 src/dependency.cpp              | 2 ++
 src/feedback.cpp                | 2 ++
 src/legacy.cpp                  | 2 ++
 src/main.cpp                    | 2 ++
 src/nag.cpp                     | 2 ++
 src/recur.cpp                   | 2 ++
 src/rules.cpp                   | 2 ++
 src/sort.cpp                    | 8 +++++---
 src/tc/Replica.cpp              | 2 ++
 src/tc/Server.cpp               | 2 ++
 src/tc/Task.cpp                 | 2 ++
 src/tc/WorkingSet.cpp           | 2 ++
 src/tc/util.cpp                 | 2 ++
 src/util.cpp                    | 4 +++-
 src/util.h                      | 2 ++
 test/col.test.cpp               | 2 ++
 test/dom.test.cpp               | 2 ++
 test/eval.test.cpp              | 2 ++
 test/lexer.test.cpp             | 2 ++
 test/t.test.cpp                 | 2 ++
 test/tc.test.cpp                | 4 +++-
 test/tdb2.test.cpp              | 2 ++
 test/tw-2689.test.cpp           | 2 ++
 test/util.test.cpp              | 2 ++
 test/variant_add.test.cpp       | 2 ++
 test/variant_and.test.cpp       | 2 ++
 test/variant_cast.test.cpp      | 2 ++
 test/variant_divide.test.cpp    | 2 ++
 test/variant_equal.test.cpp     | 2 ++
 test/variant_exp.test.cpp       | 2 ++
 test/variant_gt.test.cpp        | 2 ++
 test/variant_gte.test.cpp       | 2 ++
 test/variant_inequal.test.cpp   | 2 ++
 test/variant_lt.test.cpp        | 2 ++
 test/variant_lte.test.cpp       | 2 ++
 test/variant_match.test.cpp     | 2 ++
 test/variant_math.test.cpp      | 2 ++
 test/variant_modulo.test.cpp    | 2 ++
 test/variant_multiply.test.cpp  | 2 ++
 test/variant_nomatch.test.cpp   | 2 ++
 test/variant_not.test.cpp       | 2 ++
 test/variant_or.test.cpp        | 2 ++
 test/variant_partial.test.cpp   | 2 ++
 test/variant_subtract.test.cpp  | 2 ++
 test/variant_xor.test.cpp       | 2 ++
 test/view.test.cpp              | 2 ++
 138 files changed, 288 insertions(+), 12 deletions(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 3fd286ecd..eca04fabe 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CLI2.h>
 #include <sstream>
 #include <algorithm>
diff --git a/src/Context.cpp b/src/Context.cpp
index 0f66aebba..2004d26ce 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <Context.h>
 #include <iostream>
 #include <fstream>
diff --git a/src/DOM.cpp b/src/DOM.cpp
index 4b6f901dc..e2eea1b68 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <DOM.h>
 #include <sstream>
 #include <map>
diff --git a/src/Eval.cpp b/src/Eval.cpp
index 5319a0804..9d2748aa3 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <Eval.h>
 #include <DOM.h>
 #include <map>
diff --git a/src/Filter.cpp b/src/Filter.cpp
index 4c900e917..e6ee0f550 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <Filter.h>
 #include <algorithm>
 #include <Context.h>
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index 12c8d1756..c0fdc056d 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <Hooks.h>
 #include <algorithm>
 // If <iostream> is included, put it after <stdio.h>, because it includes
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 801d6b491..d11a8f335 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <Lexer.h>
 #include <algorithm>
 #include <ctype.h>
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 5bfb9133b..185f86e29 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <TDB2.h>
 #include <iostream>
 #include <sstream>
diff --git a/src/Task.cpp b/src/Task.cpp
index 36d690e3d..d483fdd52 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <Task.h>
 #include <sstream>
 #include <stdlib.h>
diff --git a/src/Variant.cpp b/src/Variant.cpp
index 84c0a645e..3d34f7327 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <sstream>
 #include <algorithm>
 #include <stdio.h>
diff --git a/src/Version.cpp b/src/Version.cpp
index bbce61253..8d79c6816 100644
--- a/src/Version.cpp
+++ b/src/Version.cpp
@@ -26,6 +26,8 @@
 
 #include <Version.h>
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <sstream>
 #include <string>
diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp
index e3adf8826..791316002 100644
--- a/src/ViewTask.cpp
+++ b/src/ViewTask.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ViewTask.h>
 #include <numeric>
 #include <Context.h>
@@ -188,7 +190,7 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
 
   // Calculate final column widths.
   int overage = _width - sum_minimal - all_extra;
-  Context::getContext ().debug (format ("ViewTask::render min={1} ideal={2} overage={3} width={4}", 
+  Context::getContext ().debug (format ("ViewTask::render min={1} ideal={2} overage={3} width={4}",
                                         sum_minimal + all_extra,
                                         sum_ideal + all_extra,
                                         overage,
diff --git a/src/calc.cpp b/src/calc.cpp
index e6dd9ef22..af852d64b 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <string>
 #include <stdlib.h>
diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp
index 4b69e4d39..1bd01a72b 100644
--- a/src/columns/ColDepends.cpp
+++ b/src/columns/ColDepends.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColDepends.h>
 #include <algorithm>
 #include <Context.h>
diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp
index 86ef52524..b36661ff7 100644
--- a/src/columns/ColDescription.cpp
+++ b/src/columns/ColDescription.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColDescription.h>
 #include <stdlib.h>
 #include <Context.h>
diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index 3801af6d8..c1aee8ed3 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColDue.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColEnd.cpp b/src/columns/ColEnd.cpp
index 0f38d85ff..baddb8670 100644
--- a/src/columns/ColEnd.cpp
+++ b/src/columns/ColEnd.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColEnd.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColEntry.cpp b/src/columns/ColEntry.cpp
index 0d3397d02..8068d710a 100644
--- a/src/columns/ColEntry.cpp
+++ b/src/columns/ColEntry.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColEntry.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColID.cpp b/src/columns/ColID.cpp
index a6b8c2588..9f66406e8 100644
--- a/src/columns/ColID.cpp
+++ b/src/columns/ColID.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColID.h>
 #include <math.h>
 #include <format.h>
diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp
index ac49e4250..d4c79e249 100644
--- a/src/columns/ColIMask.cpp
+++ b/src/columns/ColIMask.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColIMask.h>
 #include <format.h>
 
diff --git a/src/columns/ColLast.cpp b/src/columns/ColLast.cpp
index ca7b1c0be..abeaff93d 100644
--- a/src/columns/ColLast.cpp
+++ b/src/columns/ColLast.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColLast.h>
 #include <format.h>
 
diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp
index b1bb13870..3be3418ca 100644
--- a/src/columns/ColMask.cpp
+++ b/src/columns/ColMask.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColMask.h>
 #include <format.h>
 
diff --git a/src/columns/ColModified.cpp b/src/columns/ColModified.cpp
index fa7d96564..658e4b80b 100644
--- a/src/columns/ColModified.cpp
+++ b/src/columns/ColModified.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColModified.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp
index 60e5ac091..dfd63d4d6 100644
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColParent.h>
 #include <format.h>
 
diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp
index a5890f1bb..e9444b00c 100644
--- a/src/columns/ColProject.cpp
+++ b/src/columns/ColProject.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColProject.h>
 #include <Context.h>
 #include <Eval.h>
diff --git a/src/columns/ColRType.cpp b/src/columns/ColRType.cpp
index fb2a0e7a8..bbe62b2c8 100644
--- a/src/columns/ColRType.cpp
+++ b/src/columns/ColRType.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColRType.h>
 #include <Context.h>
 #include <shared.h>
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index 844dcb5a5..319705a18 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColRecur.h>
 #include <Context.h>
 #include <Duration.h>
diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index e04cb2517..e20ae46ba 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColScheduled.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index 2c7f7bc35..d9ee252a4 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColStart.h>
 #include <Context.h>
 #include <utf8.h>
diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp
index 02d3ccff6..b2b5e6137 100644
--- a/src/columns/ColStatus.cpp
+++ b/src/columns/ColStatus.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColStatus.h>
 #include <format.h>
 #include <utf8.h>
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index e5d30ab57..8f69d71e8 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColTags.h>
 #include <algorithm>
 #include <Context.h>
diff --git a/src/columns/ColTemplate.cpp b/src/columns/ColTemplate.cpp
index 055df7e6e..584d08d42 100644
--- a/src/columns/ColTemplate.cpp
+++ b/src/columns/ColTemplate.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColTemplate.h>
 #include <format.h>
 
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 310606c29..7a882acb6 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColTypeDate.h>
 #include <Context.h>
 #include <Datetime.h>
@@ -43,7 +45,7 @@ ColumnTypeDate::ColumnTypeDate ()
   _label     = "";
   _styles    = {"formatted",
                 "julian",
-                "epoch", 
+                "epoch",
                 "iso",
                 "age",
                 "relative",
diff --git a/src/columns/ColTypeDuration.cpp b/src/columns/ColTypeDuration.cpp
index 942d69b16..8a2182e58 100644
--- a/src/columns/ColTypeDuration.cpp
+++ b/src/columns/ColTypeDuration.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColTypeDuration.h>
 #include <Context.h>
 #include <Eval.h>
diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp
index 737e991e8..5f4dd2d4f 100644
--- a/src/columns/ColTypeNumeric.cpp
+++ b/src/columns/ColTypeNumeric.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColTypeNumeric.h>
 #include <Context.h>
 #include <Eval.h>
diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp
index 2d93ca9fc..cf71a42dd 100644
--- a/src/columns/ColTypeString.cpp
+++ b/src/columns/ColTypeString.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColTypeString.h>
 #include <Context.h>
 #include <Eval.h>
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index 57dd628bb..95244562c 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColUDA.h>
 #include <Context.h>
 #include <Datetime.h>
diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp
index 34fbe2a67..ac7822dc0 100644
--- a/src/columns/ColUUID.cpp
+++ b/src/columns/ColUUID.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColUUID.h>
 #include <format.h>
 
diff --git a/src/columns/ColUntil.cpp b/src/columns/ColUntil.cpp
index d6f74fafe..fada3aea0 100644
--- a/src/columns/ColUntil.cpp
+++ b/src/columns/ColUntil.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColUntil.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp
index f1c89720b..cc19b03d3 100644
--- a/src/columns/ColUrgency.cpp
+++ b/src/columns/ColUrgency.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColUrgency.h>
 #include <format.h>
 
diff --git a/src/columns/ColWait.cpp b/src/columns/ColWait.cpp
index e0286eadf..cd7b1633b 100644
--- a/src/columns/ColWait.cpp
+++ b/src/columns/ColWait.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <ColWait.h>
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index 402b4ca3f..5620f6c65 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <Column.h>
 #include <algorithm>
 #include <set>
diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp
index 21d5475a9..749c53499 100644
--- a/src/commands/CmdAdd.cpp
+++ b/src/commands/CmdAdd.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdAdd.h>
 #include <Context.h>
 #include <format.h>
diff --git a/src/commands/CmdAliases.cpp b/src/commands/CmdAliases.cpp
index e6e1b8e5e..b6b6074c4 100644
--- a/src/commands/CmdAliases.cpp
+++ b/src/commands/CmdAliases.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdAliases.h>
 #include <Context.h>
 #include <Command.h>
diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index 4a3a17a83..45827aeab 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdAnnotate.h>
 #include <iostream>
 #include <Context.h>
diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index 1ce75447b..3cfd820db 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdAppend.h>
 #include <iostream>
 #include <Context.h>
diff --git a/src/commands/CmdAttributes.cpp b/src/commands/CmdAttributes.cpp
index 4088d6391..1ae4d69f0 100644
--- a/src/commands/CmdAttributes.cpp
+++ b/src/commands/CmdAttributes.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdAttributes.h>
 #include <sstream>
 #include <algorithm>
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index be9a252be..2a3006504 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdBurndown.h>
 #include <sstream>
 #include <map>
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 1a956a605..179ea8a6c 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdCalendar.h>
 #include <sstream>
 #include <iomanip>
diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp
index 0721edc1e..8ce3c576a 100644
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdColor.h>
 #include <sstream>
 #include <Table.h>
diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp
index d85b23fda..6502882df 100644
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdColumns.h>
 #include <algorithm>
 #include <Context.h>
diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp
index b7a91ee2e..6382d5d52 100644
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdCommands.h>
 #include <sstream>
 #include <algorithm>
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index 6f5eab75a..cc845948e 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdConfig.h>
 #include <sstream>
 #include <algorithm>
diff --git a/src/commands/CmdContext.cpp b/src/commands/CmdContext.cpp
index f8e6c3e2d..b010b62f9 100644
--- a/src/commands/CmdContext.cpp
+++ b/src/commands/CmdContext.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdContext.h>
 #include <CmdConfig.h>
 #include <Table.h>
diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp
index 14c6f442b..f577136ba 100644
--- a/src/commands/CmdCount.cpp
+++ b/src/commands/CmdCount.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdCount.h>
 #include <Filter.h>
 #include <main.h>
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index 378cdc11e..7266b2187 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdCustom.h>
 #include <sstream>
 #include <map>
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index 8bedab285..b27690c81 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdDelete.h>
 #include <iostream>
 #include <Context.h>
@@ -72,7 +74,7 @@ int CmdDelete::execute (std::string&)
   // Accumulated project change notifications.
   std::map <std::string, std::string> projectChanges;
 
-  if(filtered.size() > 1) { 
+  if(filtered.size() > 1) {
     feedback_affected("This command will alter {1} tasks.", filtered.size());
   }
   for (auto& task : filtered)
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index ac73f940b..1b3a56916 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdDenotate.h>
 #include <iostream>
 #include <Context.h>
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 625dbcd26..7901524cf 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdDiagnostics.h>
 #include <iomanip>
 #include <sstream>
diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index f579364ac..e6b8af922 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdDone.h>
 #include <iostream>
 #include <Context.h>
@@ -129,9 +131,9 @@ int CmdDone::execute (std::string&)
       rc = 1;
     }
   }
-  
+
   nag (modified);
-  
+
   // Now list the project changes.
   for (const auto& change : projectChanges)
     if (change.first != "")
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index 46f1070e3..386a301e7 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdDuplicate.h>
 #include <iostream>
 #include <Context.h>
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index ca91527b0..7e8c93023 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdEdit.h>
 #include <iostream>
 #include <sstream>
diff --git a/src/commands/CmdExec.cpp b/src/commands/CmdExec.cpp
index 111c77798..3c200d6ba 100644
--- a/src/commands/CmdExec.cpp
+++ b/src/commands/CmdExec.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdExec.h>
 #include <stdlib.h>
 #include <Context.h>
diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index e758c9078..dcbd26206 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdExport.h>
 #include <Context.h>
 #include <Filter.h>
diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp
index 38aae7c35..0c2eb7173 100644
--- a/src/commands/CmdGet.cpp
+++ b/src/commands/CmdGet.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdGet.h>
 #include <Variant.h>
 #include <Context.h>
diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index f755735a7..72c2ea51a 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdHelp.h>
 #include <algorithm>
 #include <Table.h>
diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp
index 8b8f7ab83..5f895b8e8 100644
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdHistory.h>
 #include <sstream>
 #include <Context.h>
diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index 62d6739e0..3e52aa42b 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdIDs.h>
 #include <sstream>
 #include <algorithm>
diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp
index 77d6f0ce1..19cef20fc 100644
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdImport.h>
 #include <CmdModify.h>
 #include <iostream>
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index f0a1e993c..3a2771a6d 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdInfo.h>
 #include <sstream>
 #include <stdlib.h>
diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp
index 91043e195..c58032e57 100644
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdLog.h>
 #include <Context.h>
 #include <format.h>
diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp
index a910f7e70..c6d3138d8 100644
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdLogo.h>
 #include <Context.h>
 #include <util.h>
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index cb407367d..4a16a9427 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdModify.h>
 #include <iostream>
 #include <Context.h>
diff --git a/src/commands/CmdNews.cpp b/src/commands/CmdNews.cpp
index 798c4f43f..419372095 100644
--- a/src/commands/CmdNews.cpp
+++ b/src/commands/CmdNews.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdNews.h>
 #include <iostream>
 #include <cmath>
@@ -39,7 +41,7 @@
 #include <main.h>
 
 /* Adding a new version:
- * 
+ *
  * - Add a new `versionX_Y_Z` method to `NewsItem`, and add news items for the new
  *   release.
  * - Call the new method in `NewsItem.all()`. Calls should be in version order.
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index 0e59d5a30..25a307c49 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdPrepend.h>
 #include <iostream>
 #include <Context.h>
diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp
index 2c5dea7d4..97d668f80 100644
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdProjects.h>
 #include <algorithm>
 #include <sstream>
diff --git a/src/commands/CmdPurge.cpp b/src/commands/CmdPurge.cpp
index 09550cdcd..cee795820 100644
--- a/src/commands/CmdPurge.cpp
+++ b/src/commands/CmdPurge.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdPurge.h>
 #include <Context.h>
 #include <Filter.h>
diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp
index c881f38d0..e8bfa80dc 100644
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdReports.h>
 #include <sstream>
 #include <Context.h>
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index 53fb6ac03..4bb797d71 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdShow.h>
 #include <vector>
 #include <sstream>
@@ -284,7 +286,7 @@ int CmdShow::execute (std::string& output)
 
   std::string section;
 
-  // Look for the first plausible argument which could be a pattern 
+  // Look for the first plausible argument which could be a pattern
   if (words.size ())
     section = words[0];
 
diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index e63edd1cb..1566e1bfb 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdStart.h>
 #include <iostream>
 #include <Context.h>
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index 668b1cf0d..be658bc5f 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdStats.h>
 #include <sstream>
 #include <iomanip>
diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index f9d1cec6d..a46b5840d 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdStop.h>
 #include <iostream>
 #include <Context.h>
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 4a23384ba..5564a8829 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdSummary.h>
 #include <algorithm>
 #include <sstream>
diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp
index 836d6ebe0..3a6dc8144 100644
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdSync.h>
 #include <sstream>
 #include <inttypes.h>
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index fcf58b631..9d43d4040 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdTags.h>
 #include <sstream>
 #include <vector>
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index eee64f007..63eddf328 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdTimesheet.h>
 #include <algorithm>
 #include <sstream>
diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index d10badcd9..55fa33e6f 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdUDAs.h>
 #include <Table.h>
 #include <sstream>
diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp
index d51d54f97..cb3ec26c4 100644
--- a/src/commands/CmdUndo.cpp
+++ b/src/commands/CmdUndo.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdUndo.h>
 #include <Context.h>
 
diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp
index cda54f196..ca67b3075 100644
--- a/src/commands/CmdUnique.cpp
+++ b/src/commands/CmdUnique.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdUnique.h>
 #include <string>
 #include <set>
diff --git a/src/commands/CmdUrgency.cpp b/src/commands/CmdUrgency.cpp
index 55487e507..6260d8d2c 100644
--- a/src/commands/CmdUrgency.cpp
+++ b/src/commands/CmdUrgency.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdUrgency.h>
 #include <sstream>
 #include <stdlib.h>
diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index efdf90d6d..1042071d6 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <CmdVersion.h>
 #include <sstream>
 #include <stdlib.h>
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index 15b311aae..ba028b4a9 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <vector>
 #include <stdlib.h>
diff --git a/src/dependency.cpp b/src/dependency.cpp
index 154859e32..ab17c3d08 100644
--- a/src/dependency.cpp
+++ b/src/dependency.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <algorithm>
 #include <iostream>
 #include <sstream>
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 131be6627..4905b06d0 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <algorithm>
 #include <sstream>
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 7cf9f9321..965e1d227 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <cstddef>
 #include <sstream>
 #include <Context.h>
diff --git a/src/main.cpp b/src/main.cpp
index 07ac2fd22..d360876d0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <new>
 #include <cstring>
diff --git a/src/nag.cpp b/src/nag.cpp
index f95c5201b..55085a8b2 100644
--- a/src/nag.cpp
+++ b/src/nag.cpp
@@ -26,6 +26,8 @@
 
 #include <algorithm>
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <Context.h>
 #include <iterator>
 #include <unordered_set>
diff --git a/src/recur.cpp b/src/recur.cpp
index 524c912d3..463534ecf 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <iomanip>
 #include <fstream>
diff --git a/src/rules.cpp b/src/rules.cpp
index 760858487..4edf81d5f 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <stdlib.h>
 #include <Context.h>
 #include <Datetime.h>
diff --git a/src/sort.cpp b/src/sort.cpp
index ac5c3d418..25f690fe4 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <algorithm>
 #include <vector>
 #include <list>
@@ -76,12 +78,12 @@ void sort_projects (
       {
         parent_pos = std::find_if (sorted.begin (), sorted.end (),
             [&parent](const std::pair <std::string, int>& item) { return item.first == parent; });
-        
+
         // if parent does not exist yet: insert into sorted view
         if (parent_pos == sorted.end ())
           sorted.emplace_back (parent, 1);
       }
-      
+
       // insert new element below latest parent
       sorted.insert ((parent_pos == sorted.end ()) ? parent_pos : ++parent_pos, project);
     }
@@ -100,7 +102,7 @@ void sort_projects (
   std::map <std::string, int> allProjectsInt;
   for (auto& p : allProjects)
     allProjectsInt[p.first] = (int) p.second;
-  
+
   sort_projects (sorted, allProjectsInt);
 }
 
diff --git a/src/tc/Replica.cpp b/src/tc/Replica.cpp
index f33a617dc..e1a2fb1ce 100644
--- a/src/tc/Replica.cpp
+++ b/src/tc/Replica.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <format.h>
 #include "tc/Replica.h"
 #include "tc/Task.h"
diff --git a/src/tc/Server.cpp b/src/tc/Server.cpp
index fe4717afd..5e43d1c2e 100644
--- a/src/tc/Server.cpp
+++ b/src/tc/Server.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <format.h>
 #include "tc/Server.h"
 #include "tc/util.h"
diff --git a/src/tc/Task.cpp b/src/tc/Task.cpp
index 69a354a9f..7b3a4e217 100644
--- a/src/tc/Task.cpp
+++ b/src/tc/Task.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <assert.h>
 #include "tc/Task.h"
 #include "tc/util.h"
diff --git a/src/tc/WorkingSet.cpp b/src/tc/WorkingSet.cpp
index 4f116aaa5..b089f347c 100644
--- a/src/tc/WorkingSet.cpp
+++ b/src/tc/WorkingSet.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <format.h>
 #include "tc/WorkingSet.h"
 #include "tc/Task.h"
diff --git a/src/tc/util.cpp b/src/tc/util.cpp
index 567c4a05b..318f9ed0f 100644
--- a/src/tc/util.cpp
+++ b/src/tc/util.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <format.h>
 #include <assert.h>
 #include "tc/Replica.h"
diff --git a/src/util.cpp b/src/util.cpp
index 02a97c44c..da6eb4f93 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <format.h>
 #include <shared.h>
 // If <iostream> is included, put it after <stdio.h>, because it includes
@@ -67,7 +69,7 @@
 static const char* newline = "\n";
 static const char* noline  = "";
 
-//////////////////////////////////////////////////////////////////////////////// 
+////////////////////////////////////////////////////////////////////////////////
 static void signal_handler (int s)
 {
   if (s == SIGINT)
diff --git a/src/util.h b/src/util.h
index f900e989e..62e8223b0 100644
--- a/src/util.h
+++ b/src/util.h
@@ -28,6 +28,8 @@
 #define INCLUDED_UTIL
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <string>
 #include <vector>
 #include <map>
diff --git a/test/col.test.cpp b/test/col.test.cpp
index a579d52b8..c4be0ea4f 100644
--- a/test/col.test.cpp
+++ b/test/col.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <stdlib.h>
 #include <columns/ColID.h>
 #include <main.h>
diff --git a/test/dom.test.cpp b/test/dom.test.cpp
index 214955cda..34a815476 100644
--- a/test/dom.test.cpp
+++ b/test/dom.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <test.h>
 #include <DOM.h>
 #include <Variant.h>
diff --git a/test/eval.test.cpp b/test/eval.test.cpp
index 85ed424c4..f5969bdb5 100644
--- a/test/eval.test.cpp
+++ b/test/eval.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <test.h>
 #include <Context.h>
 #include <Eval.h>
diff --git a/test/lexer.test.cpp b/test/lexer.test.cpp
index 8ebce5d4c..43a8af3c0 100644
--- a/test/lexer.test.cpp
+++ b/test/lexer.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <vector>
 #include <string.h>
diff --git a/test/t.test.cpp b/test/t.test.cpp
index 63739c6da..e0e35c4c0 100644
--- a/test/t.test.cpp
+++ b/test/t.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <stdlib.h>
 #include <main.h>
 #include <test.h>
diff --git a/test/tc.test.cpp b/test/tc.test.cpp
index 1d4c7e519..724105404 100644
--- a/test/tc.test.cpp
+++ b/test/tc.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <stdlib.h>
 #include <unistd.h>
@@ -84,7 +86,7 @@ int main (int, char**)
   t.is ((int)tasks.size(), 1, "all_tasks returns one task");
 
   //// Task
-  
+
   task = std::move(tasks[0]);
 
   t.is (task.get_uuid(), uuid, "returned task has correct uuid");
diff --git a/test/tdb2.test.cpp b/test/tdb2.test.cpp
index 059663349..03b1d9f84 100644
--- a/test/tdb2.test.cpp
+++ b/test/tdb2.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/test/tw-2689.test.cpp b/test/tw-2689.test.cpp
index 3b67f1f4e..e18fdb021 100644
--- a/test/tw-2689.test.cpp
+++ b/test/tw-2689.test.cpp
@@ -26,6 +26,8 @@
 
 #include <iostream>
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <stdlib.h>
 #include <main.h>
 #include <test.h>
diff --git a/test/util.test.cpp b/test/util.test.cpp
index 74901dfd5..36276a38b 100644
--- a/test/util.test.cpp
+++ b/test/util.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <stdlib.h>
 #include <main.h>
diff --git a/test/variant_add.test.cpp b/test/variant_add.test.cpp
index 56dc8ab46..8c6f22e9f 100644
--- a/test/variant_add.test.cpp
+++ b/test/variant_add.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_and.test.cpp b/test/variant_and.test.cpp
index 9963556e8..237bbd02d 100644
--- a/test/variant_and.test.cpp
+++ b/test/variant_and.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_cast.test.cpp b/test/variant_cast.test.cpp
index 8eb2c63cc..ac6c246ca 100644
--- a/test/variant_cast.test.cpp
+++ b/test/variant_cast.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_divide.test.cpp b/test/variant_divide.test.cpp
index 70a895a4a..676c25870 100644
--- a/test/variant_divide.test.cpp
+++ b/test/variant_divide.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_equal.test.cpp b/test/variant_equal.test.cpp
index b89d2e782..5b8c6c530 100644
--- a/test/variant_equal.test.cpp
+++ b/test/variant_equal.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_exp.test.cpp b/test/variant_exp.test.cpp
index b8c9d227c..ac7c1e085 100644
--- a/test/variant_exp.test.cpp
+++ b/test/variant_exp.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_gt.test.cpp b/test/variant_gt.test.cpp
index 69dd44742..86d2b6317 100644
--- a/test/variant_gt.test.cpp
+++ b/test/variant_gt.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_gte.test.cpp b/test/variant_gte.test.cpp
index 093358f0e..708a598e1 100644
--- a/test/variant_gte.test.cpp
+++ b/test/variant_gte.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_inequal.test.cpp b/test/variant_inequal.test.cpp
index 74c91b965..348b7b9a7 100644
--- a/test/variant_inequal.test.cpp
+++ b/test/variant_inequal.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_lt.test.cpp b/test/variant_lt.test.cpp
index 56394f4c9..897168c44 100644
--- a/test/variant_lt.test.cpp
+++ b/test/variant_lt.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_lte.test.cpp b/test/variant_lte.test.cpp
index b218ecdb9..30eda6398 100644
--- a/test/variant_lte.test.cpp
+++ b/test/variant_lte.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_match.test.cpp b/test/variant_match.test.cpp
index 5b39e62dc..97a7f6432 100644
--- a/test/variant_match.test.cpp
+++ b/test/variant_match.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_math.test.cpp b/test/variant_math.test.cpp
index b8a7b3a21..f247d4c69 100644
--- a/test/variant_math.test.cpp
+++ b/test/variant_math.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_modulo.test.cpp b/test/variant_modulo.test.cpp
index 75a9d2ad2..1f0e53c52 100644
--- a/test/variant_modulo.test.cpp
+++ b/test/variant_modulo.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_multiply.test.cpp b/test/variant_multiply.test.cpp
index 88f84682a..6dcb20159 100644
--- a/test/variant_multiply.test.cpp
+++ b/test/variant_multiply.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_nomatch.test.cpp b/test/variant_nomatch.test.cpp
index a811c558e..0f069f9d9 100644
--- a/test/variant_nomatch.test.cpp
+++ b/test/variant_nomatch.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_not.test.cpp b/test/variant_not.test.cpp
index 4337745d0..aad898cc3 100644
--- a/test/variant_not.test.cpp
+++ b/test/variant_not.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_or.test.cpp b/test/variant_or.test.cpp
index 8b097b9e9..010406d7f 100644
--- a/test/variant_or.test.cpp
+++ b/test/variant_or.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_partial.test.cpp b/test/variant_partial.test.cpp
index a545979c0..66b6385cf 100644
--- a/test/variant_partial.test.cpp
+++ b/test/variant_partial.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_subtract.test.cpp b/test/variant_subtract.test.cpp
index 331073e38..e545d4422 100644
--- a/test/variant_subtract.test.cpp
+++ b/test/variant_subtract.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/variant_xor.test.cpp b/test/variant_xor.test.cpp
index 54a4f6a0f..cd32ee24f 100644
--- a/test/variant_xor.test.cpp
+++ b/test/variant_xor.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <test.h>
 #include <Variant.h>
diff --git a/test/view.test.cpp b/test/view.test.cpp
index c65045c5d..59f668298 100644
--- a/test/view.test.cpp
+++ b/test/view.test.cpp
@@ -25,6 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+// cmake.h include header must come first
+
 #include <iostream>
 #include <stdlib.h>
 #include <unistd.h>