Cleanup includes

- Remove unused includes
- Use '<..>' style consistently
- Strip any paths from include
- Replace deprecated C++ headers
- Sort includes according to LLVM rules
  https://llvm.org/docs/CodingStandards.html#include-style

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>

src/AtomicFile.cpp

@@ -24,19 +24,18 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <csignal>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <cassert>
-#include <iostream>
-#include <vector>
-#include <unistd.h>
-#include <timew.h>
-
-#include <format.h>
 #include <AtomicFile.h>
 #include <FS.h>
+#include <cassert>
+#include <cerrno>
+#include <csignal>
+#include <cstdio>
+#include <cstring>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
+#include <unistd.h>
+#include <vector>
 
 struct AtomicFile::impl
 {

src/CLI.cpp

@@ -24,19 +24,18 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <CLI.h>
 #include <Color.h>
-#include <Pig.h>
-#include <shared.h>
-#include <format.h>
-#include <utf8.h>
-#include <sstream>
-#include <algorithm>
-#include <set>
-#include <Duration.h>
-#include <timew.h>
 #include <DatetimeParser.h>
+#include <Duration.h>
+#include <Pig.h>
+#include <algorithm>
+#include <format.h>
+#include <set>
+#include <shared.h>
+#include <sstream>
+#include <timew.h>
+#include <utf8.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 A2::A2 (const std::string& raw, Lexer::Type lextype)

src/CLI.h

@@ -27,13 +27,13 @@
 #ifndef INCLUDED_CLI
 #define INCLUDED_CLI
 
-#include <Lexer.h>
-#include <string>
-#include <set>
-#include <vector>
-#include <map>
 #include <Duration.h>
-#include "Interval.h"
+#include <Interval.h>
+#include <Lexer.h>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
 
 // Represents a single argument.
 class A2

src/Chart.cpp

@@ -24,17 +24,14 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <iomanip>
+#include <Chart.h>
-#include <iostream>
-#include <shared.h>
-#include <commands.h>
-#include <Duration.h>
 #include <Composite.h>
-#include <Chart.h>
+#include <Duration.h>
-#include <format.h>
 #include <cassert>
+#include <format.h>
+#include <iomanip>
+#include <shared.h>
 #include <timew.h>
-#include <Chart.h>
 #include <utf8.h>
 
 ////////////////////////////////////////////////////////////////////////////////

src/Chart.h

@@ -27,10 +27,10 @@
 #ifndef INCLUDED_CHART
 #define INCLUDED_CHART
 
+#include <ChartConfig.h>
 #include <Composite.h>
 #include <Interval.h>
 #include <map>
-#include "ChartConfig.h"
 
 class Chart
 {

src/ChartConfig.h

@@ -27,6 +27,10 @@
 #ifndef INCLUDED_CHARTCONFIG
 #define INCLUDED_CHARTCONFIG
 
+#include <Color.h>
+#include <Datetime.h>
+#include <map>
+
 class ChartConfig
 {
 public:

src/Database.cpp

@@ -24,16 +24,15 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cassert>
-#include <Database.h>
-#include <format.h>
-#include <JSON.h>
-#include <IntervalFactory.h>
-#include <iostream>
-#include <iomanip>
-#include <shared.h>
-#include <timew.h>
 #include <AtomicFile.h>
+#include <Database.h>
+#include <IntervalFactory.h>
+#include <JSON.h>
+#include <cassert>
+#include <format.h>
+#include <iomanip>
+#include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Database::iterator::iterator (files_iterator fbegin, files_iterator fend) :

src/Database.h

@@ -29,12 +29,12 @@
 
 #include <Datafile.h>
 #include <Interval.h>
-#include <Range.h>
-#include <Transaction.h>
-#include <vector>
-#include <string>
-#include <TagInfoDatabase.h>
 #include <Journal.h>
+#include <Range.h>
+#include <TagInfoDatabase.h>
+#include <Transaction.h>
+#include <string>
+#include <vector>
 
 class Database
 {

src/Datafile.cpp

@@ -24,16 +24,15 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
-#include <Datafile.h>
-#include <timew.h>
-#include <format.h>
-#include <algorithm>
-#include <sstream>
-#include <cassert>
-#include <stdlib.h>
 #include <AtomicFile.h>
+#include <Datafile.h>
 #include <IntervalFactory.h>
+#include <algorithm>
+#include <cassert>
+#include <cstdlib>
+#include <format.h>
+#include <sstream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 void Datafile::initialize (const std::string& name)

src/Datafile.h

@@ -27,11 +27,11 @@
 #ifndef INCLUDED_DATAFILE
 #define INCLUDED_DATAFILE
 
+#include <FS.h>
 #include <Interval.h>
 #include <Range.h>
-#include <FS.h>
-#include <vector>
 #include <string>
+#include <vector>
 
 class Datafile
 {

src/DatetimeParser.cpp

@@ -24,19 +24,13 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <DatetimeParser.h>
+#include <Duration.h>
 #include <algorithm>
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-#include <cassert>
-#include <stdlib.h>
-#include <shared.h>
 #include <format.h>
+#include <iostream>
 #include <unicode.h>
 #include <utf8.h>
-#include <src/libshared/src/Duration.h>
 
 static std::vector <std::string> dayNames {
   "sunday",

src/DatetimeParser.h

@@ -27,10 +27,10 @@
 #ifndef INCLUDED_DATETIMEPARSER
 #define INCLUDED_DATETIMEPARSER
 
-#include <string>
-#include <ctime>
 #include <Pig.h>
 #include <Range.h>
+#include <ctime>
+#include <string>
 
 class DatetimeParser
 {

src/Exclusion.cpp

@@ -24,13 +24,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
-#include <Exclusion.h>
 #include <Datetime.h>
+#include <Exclusion.h>
 #include <Pig.h>
-#include <shared.h>
-#include <format.h>
 #include <algorithm>
+#include <format.h>
+#include <shared.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // An exclusion represents untrackable time such as holidays, weekends, evenings

src/Exclusion.h

@@ -29,8 +29,8 @@
 
 #include <Interval.h>
 #include <Range.h>
-#include <vector>
 #include <string>
+#include <vector>
 
 class Exclusion
 {

src/Extensions.cpp

@@ -24,16 +24,14 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Extensions.h>
 #include <FS.h>
 #include <Timer.h>
-#include <shared.h>
+#include <algorithm>
-#include <timew.h>
-#include <sstream>
 #include <iomanip>
 #include <iostream>
-#include <algorithm>
+#include <shared.h>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 void Extensions::initialize (const std::string& location)

src/Extensions.h

@@ -27,8 +27,8 @@
 #ifndef INCLUDED_EXTENSIONS
 #define INCLUDED_EXTENSIONS
 
-#include <vector>
 #include <string>
+#include <vector>
 
 class Extensions
 {

src/Interval.cpp

@@ -24,14 +24,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Interval.h>
-#include <timew.h>
-#include <format.h>
-#include <Lexer.h>
-#include <sstream>
 #include <JSON.h>
-#include <Interval.h>
+#include <Lexer.h>
+#include <algorithm>
+#include <sstream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 bool Interval::operator== (const Interval& other) const

src/IntervalFactory.cpp

@@ -24,11 +24,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <format.h>
-#include <Lexer.h>
 #include <IntervalFactory.h>
 #include <JSON.h>
-#include <shared.h>
+#include <Lexer.h>
+#include <format.h>
 
 static std::vector <std::string> tokenizeSerialization (const std::string& line) 
 {

src/IntervalFilterAllWithIds.h

@@ -27,10 +27,10 @@
 #ifndef INCLUDED_INTERVALFILTERALLWITHIDS
 #define INCLUDED_INTERVALFILTERALLWITHIDS
 
-#include <IntervalFilter.h>
-#include <string>
-#include <set>
 #include <Interval.h>
+#include <IntervalFilter.h>
+#include <set>
+#include <string>
 
 class IntervalFilterAllWithIds : public IntervalFilter
 {

src/IntervalFilterAllWithTags.cpp

@@ -24,8 +24,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <IntervalFilterAllWithTags.h>
 #include <Interval.h>
+#include <IntervalFilterAllWithTags.h>
 
 IntervalFilterAllWithTags::IntervalFilterAllWithTags (std::set <std::string> tags): _tags (std::move(tags))
 {}

src/IntervalFilterAllWithTags.h

@@ -27,10 +27,10 @@
 #ifndef INCLUDED_INTERVALFILTERALLWITHTAGSET
 #define INCLUDED_INTERVALFILTERALLWITHTAGSET
 
-#include <IntervalFilter.h>
-#include <string>
-#include <set>
 #include <Interval.h>
+#include <IntervalFilter.h>
+#include <set>
+#include <string>
 
 class IntervalFilterAllWithTags : public IntervalFilter
 {

src/IntervalFilterAndGroup.h

@@ -27,8 +27,8 @@
 #ifndef INCLUDED_INTERVALFILTERANDGROUP
 #define INCLUDED_INTERVALFILTERANDGROUP
 
-#include <memory>
 #include <IntervalFilter.h>
+#include <memory>
 
 class IntervalFilterAndGroup : public IntervalFilter
 {

src/IntervalFilterFirstOf.h

@@ -27,8 +27,8 @@
 #ifndef INCLUDED_INTERVALFILTERFIRSTOF
 #define INCLUDED_INTERVALFILTERFIRSTOF
 
-#include <memory>
 #include <IntervalFilter.h>
+#include <memory>
 
 class IntervalFilterFirstOf : public IntervalFilter
 {

src/Journal.cpp

@@ -24,12 +24,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cassert>
 #include <AtomicFile.h>
-#include <format.h>
 #include <Journal.h>
 #include <TransactionsFactory.h>
-
+#include <cassert>
 #include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////

src/Journal.h

@@ -28,10 +28,10 @@
 #define INCLUDED_JOURNAL
 
 
-#include <vector>
-#include <string>
-#include <memory>
 #include <Transaction.h>
+#include <memory>
+#include <string>
+#include <vector>
 
 class Journal
 {

src/Range.cpp

@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <Range.h>
-#include <sstream>
 #include <cassert>
+#include <sstream>
 
 ////////////////////////////////////////////////////////////////////////////////
 // A Range consists of a start time and optional end time. A missing end

src/Rules.cpp

@@ -24,18 +24,17 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
+#include <AtomicFile.h>
-#include <Rules.h>
 #include <FS.h>
-#include <shared.h>
+#include <JSON.h>
-#include <format.h>
+#include <Rules.h>
-#include <sstream>
-#include <tuple>
 #include <cassert>
 #include <cerrno>
-#include <inttypes.h>
+#include <cinttypes>
-#include <AtomicFile.h>
+#include <format.h>
-#include <JSON.h>
+#include <shared.h>
+#include <sstream>
+#include <tuple>
 
 ////////////////////////////////////////////////////////////////////////////////
 Rules::Rules ()

src/Rules.h

@@ -27,12 +27,12 @@
 #ifndef INCLUDED_RULES
 #define INCLUDED_RULES
 
-#include <Lexer.h>
-#include <map>
-#include <vector>
-#include <string>
 #include <Database.h>
 #include <Journal.h>
+#include <Lexer.h>
+#include <map>
+#include <string>
+#include <vector>
 
 class Rules
 {

src/TagInfoDatabase.cpp

@@ -25,9 +25,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <JSON.h>
+#include <TagInfo.h>
 #include <TagInfoDatabase.h>
 #include <format.h>
-#include <TagInfo.h>
 #include <timew.h>
 
 ///////////////////////////////////////////////////////////////////////////////

src/TagInfoDatabase.h

@@ -27,10 +27,10 @@
 #ifndef INCLUDED_TAGINFODATABASE
 #define INCLUDED_TAGINFODATABASE
 
+#include <TagInfo.h>
+#include <map>
 #include <set>
 #include <string>
-#include <map>
-#include <TagInfo.h>
 
 class TagInfoDatabase
 {

src/TransactionsFactory.cpp

@@ -24,8 +24,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <vector>
 #include <TransactionsFactory.h>
+#include <vector>
 
 void TransactionsFactory::parseLine (const std::string& line)
 {

src/TransactionsFactory.h

@@ -27,8 +27,8 @@
 #ifndef INCLUDED_TRANSACTIONSFACTORY
 #define INCLUDED_TRANSACTIONSFACTORY
 
-#include <string>
 #include <Transaction.h>
+#include <string>
 
 class TransactionsFactory
 {

src/commands/CmdAnnotate.cpp

@@ -24,15 +24,13 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
+#include <IntervalFilterAllInRange.h>
+#include <IntervalFilterAllWithIds.h>
+#include <IntervalFilterFirstOf.h>
 #include <commands.h>
 #include <format.h>
-#include <timew.h>
 #include <iostream>
-#include <stdlib.h>
+#include <timew.h>
-#include <IntervalFilterAllWithIds.h>
-#include <IntervalFilterAllInRange.h>
-#include <IntervalFilterFirstOf.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdAnnotate (

src/commands/CmdCancel.cpp

@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <commands.h>
-#include <timew.h>
 #include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdCancel (

src/commands/CmdChart.cpp

@@ -24,19 +24,17 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <Duration.h>
-#include <Range.h>
 #include <Chart.h>
 #include <ChartConfig.h>
-#include <commands.h>
+#include <Duration.h>
-#include <timew.h>
-#include <shared.h>
-#include <format.h>
-#include <iostream>
-#include <iomanip>
 #include <IntervalFilterAllInRange.h>
 #include <IntervalFilterAllWithTags.h>
 #include <IntervalFilterAndGroup.h>
+#include <Range.h>
+#include <commands.h>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
 
 int renderChart (const CLI&, const std::string&, Interval&, Rules&, Database&);
 

src/commands/CmdConfig.cpp

@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <JSON.h>
-#include <format.h>
 #include <commands.h>
+#include <format.h>
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////

src/commands/CmdContinue.cpp

@@ -24,15 +24,15 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <commands.h>
+#include <IntervalFilterAllInRange.h>
-#include <format.h>
-#include <timew.h>
-#include <iostream>
-#include <cassert>
 #include <IntervalFilterAllWithIds.h>
 #include <IntervalFilterAllWithTags.h>
 #include <IntervalFilterFirstOf.h>
-#include <IntervalFilterAllInRange.h>
+#include <cassert>
+#include <commands.h>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdContinue (

src/commands/CmdDefault.cpp

@@ -24,11 +24,11 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
 #include <IntervalFilterAllInRange.h>
 #include <IntervalFilterFirstOf.h>
+#include <commands.h>
+#include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // Returns 0 if tracking is active, 1 if not.

src/commands/CmdDelete.cpp

@@ -24,11 +24,11 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <timew.h>
+#include <IntervalFilterAllWithIds.h>
+#include <Journal.h>
 #include <format.h>
 #include <iostream>
-#include <src/Journal.h>
+#include <timew.h>
-#include <IntervalFilterAllWithIds.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdDelete (

src/commands/CmdDiagnostics.cpp

@@ -26,10 +26,10 @@
 
 #include <cmake.h>
 #include <format.h>
-#include <timew.h>
 #include <iostream>
-#include <shared.h>
 #include <paths.h>
+#include <shared.h>
+#include <timew.h>
 
 #ifdef HAVE_COMMIT
 #include <commit.h>

src/commands/CmdExport.cpp

@@ -24,13 +24,13 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
 #include <IntervalFilterAllInRange.h>
 #include <IntervalFilterAllWithIds.h>
 #include <IntervalFilterAllWithTags.h>
 #include <IntervalFilterAndGroup.h>
+#include <commands.h>
+#include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdExport (

src/commands/CmdExtensions.cpp

@@ -24,8 +24,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <commands.h>
 #include <Table.h>
+#include <commands.h>
 #include <iostream>
 #include <paths.h>
 

src/commands/CmdFill.cpp

@@ -25,11 +25,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <Duration.h>
-#include <format.h>
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
 #include <IntervalFilterAllInRange.h>
+#include <commands.h>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdFill (

src/commands/CmdGaps.cpp

@@ -24,12 +24,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <Table.h>
 #include <Duration.h>
-#include <format.h>
+#include <Table.h>
 #include <commands.h>
-#include <timew.h>
+#include <format.h>
 #include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdGaps (

src/commands/CmdGet.cpp

@@ -25,10 +25,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <commands.h>
-#include <timew.h>
-#include <shared.h>
 #include <format.h>
 #include <iostream>
+#include <shared.h>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // Іdentify DOM references in cli, provide space-separated results.

src/commands/CmdHelp.cpp

@@ -24,15 +24,13 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <commands.h>
-#include <algorithm>
-#include <iostream>
 #include <FS.h>
-#include <shared.h>
 #include <additional-help.h>
+#include <algorithm>
+#include <commands.h>
+#include <iostream>
+#include <shared.h>
+#include <sys/wait.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdHelpUsage (const Extensions& extensions)

src/commands/CmdJoin.cpp

@@ -24,14 +24,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Duration.h>
-#include <format.h>
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
-#include <stdlib.h>
 #include <IntervalFilterAllWithIds.h>
+#include <commands.h>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdJoin (

src/commands/CmdLengthen.cpp

@@ -24,14 +24,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Duration.h>
-#include <format.h>
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
-#include <stdlib.h>
 #include <IntervalFilterAllWithIds.h>
+#include <commands.h>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdLengthen (

src/commands/CmdModify.cpp

@@ -24,12 +24,11 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cassert>
-#include <format.h>
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
 #include <IntervalFilterAllWithIds.h>
+#include <cassert>
+#include <commands.h>
+#include <format.h>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdModify (

src/commands/CmdMove.cpp

@@ -24,14 +24,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Datetime.h>
-#include <format.h>
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
-#include <stdlib.h>
 #include <IntervalFilterAllWithIds.h>
+#include <commands.h>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdMove (

src/commands/CmdReport.cpp

@@ -24,17 +24,16 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
-#include <commands.h>
-#include <shared.h>
-#include <format.h>
-#include <timew.h>
-#include <iostream>
-#include <sstream>
 #include <FS.h>
 #include <IntervalFilterAllInRange.h>
 #include <IntervalFilterAllWithTags.h>
 #include <IntervalFilterAndGroup.h>
+#include <cmake.h>
+#include <commands.h>
+#include <format.h>
+#include <iostream>
+#include <shared.h>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // Given a partial match for an extension script name, find the full patch of

src/commands/CmdResize.cpp

@@ -24,14 +24,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Duration.h>
-#include <format.h>
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
-#include <stdlib.h>
 #include <IntervalFilterAllWithIds.h>
+#include <commands.h>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdResize (

src/commands/CmdShorten.cpp

@@ -24,14 +24,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Duration.h>
-#include <format.h>
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
-#include <stdlib.h>
 #include <IntervalFilterAllWithIds.h>
+#include <commands.h>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdShorten (

src/commands/CmdShow.cpp

@@ -24,11 +24,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
-#include <shared.h>
-#include <timew.h>
 #include <algorithm>
 #include <iostream>
+#include <shared.h>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdShow (Rules& rules)

src/commands/CmdSplit.cpp

@@ -24,14 +24,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Duration.h>
-#include <format.h>
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
-#include <stdlib.h>
 #include <IntervalFilterAllWithIds.h>
+#include <commands.h>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdSplit (

src/commands/CmdStart.cpp

@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <commands.h>
-#include <timew.h>
 #include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdStart (

src/commands/CmdStop.cpp

@@ -24,10 +24,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <format.h>
 #include <commands.h>
-#include <timew.h>
+#include <format.h>
 #include <iostream>
+#include <timew.h>
 
 template <class T> T setIntersect (
   const T& left, const T& right)

src/commands/CmdSummary.cpp

@@ -24,16 +24,15 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <Table.h>
 #include <Duration.h>
-#include <shared.h>
-#include <format.h>
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
-#include <IntervalFilterAndGroup.h>
-#include <IntervalFilterAllWithTags.h>
 #include <IntervalFilterAllInRange.h>
+#include <IntervalFilterAllWithTags.h>
+#include <IntervalFilterAndGroup.h>
+#include <Table.h>
+#include <commands.h>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
 #include <utf8.h>
 
 // Implemented in CmdChart.cpp.

src/commands/CmdTag.cpp

@@ -24,16 +24,13 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
+#include <IntervalFilterAllInRange.h>
-#include <cassert>
+#include <IntervalFilterAllWithIds.h>
+#include <IntervalFilterFirstOf.h>
 #include <commands.h>
 #include <format.h>
-#include <timew.h>
 #include <iostream>
-#include <stdlib.h>
+#include <timew.h>
-#include <IntervalFilterAllWithIds.h>
-#include <IntervalFilterAllInRange.h>
-#include <IntervalFilterFirstOf.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdTag (

src/commands/CmdTags.cpp

@@ -24,16 +24,15 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
-#include <commands.h>
-#include <timew.h>
-#include <Table.h>
 #include <Color.h>
-#include <set>
-#include <iostream>
 #include <IntervalFilterAllInRange.h>
 #include <IntervalFilterAllWithTags.h>
 #include <IntervalFilterAndGroup.h>
+#include <Table.h>
+#include <commands.h>
+#include <iostream>
+#include <set>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdTags (

src/commands/CmdTrack.cpp

@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <commands.h>
-#include <timew.h>
 #include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdTrack (

src/commands/CmdUndo.cpp

@@ -24,11 +24,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
-#include <format.h>
 #include <IntervalFactory.h>
+#include <commands.h>
+#include <format.h>
+#include <iostream>
 
 static void undoIntervalAction(UndoAction& action, Database& database)
 {

src/commands/CmdUntag.cpp

@@ -24,15 +24,13 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
+#include <IntervalFilterAllInRange.h>
+#include <IntervalFilterAllWithIds.h>
+#include <IntervalFilterFirstOf.h>
 #include <commands.h>
 #include <format.h>
-#include <timew.h>
 #include <iostream>
-#include <stdlib.h>
+#include <timew.h>
-#include <IntervalFilterAllWithIds.h>
-#include <IntervalFilterAllInRange.h>
-#include <IntervalFilterFirstOf.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int CmdUntag (

src/commands/commands.h

@@ -28,10 +28,10 @@
 #define INCLUDED_COMMANDS
 
 #include <CLI.h>
-#include <Rules.h>
 #include <Database.h>
 #include <Extensions.h>
 #include <Journal.h>
+#include <Rules.h>
 
 int CmdAnnotate      (const CLI&, Rules&, Database&, Journal&                   );
 int CmdCancel        (            Rules&, Database&, Journal&                   );

src/data.cpp

@@ -24,17 +24,14 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <algorithm>
-#include <cmake.h>
-#include <shared.h>
-#include <format.h>
 #include <Datetime.h>
 #include <Duration.h>
-#include <timew.h>
-#include <algorithm>
-#include <iostream>
 #include <IntervalFactory.h>
 #include <IntervalFilter.h>
+#include <algorithm>
+#include <format.h>
+#include <shared.h>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // Read rules and extract all holiday definitions. Create a Range for each

src/dom.cpp

@@ -24,17 +24,16 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
-#include <timew.h>
-#include <Pig.h>
 #include <Duration.h>
-#include <format.h>
-#include <vector>
-#include <iostream>
 #include <IntervalFilterAllInRange.h>
 #include <IntervalFilterAllWithTags.h>
 #include <IntervalFilterAndGroup.h>
 #include <IntervalFilterFirstOf.h>
+#include <Pig.h>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
+#include <vector>
 
 ////////////////////////////////////////////////////////////////////////////////
 bool domGet (

src/helper.cpp

@@ -24,17 +24,14 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
-#include <timew.h>
-#include <shared.h>
-#include <format.h>
 #include <Datetime.h>
 #include <Duration.h>
 #include <IntervalFactory.h>
-#include <sstream>
+#include <format.h>
 #include <iomanip>
-#include <iostream>
 #include <map>
+#include <sstream>
+#include <timew.h>
 #include <vector>
 
 ////////////////////////////////////////////////////////////////////////////////

src/init.cpp

@@ -25,14 +25,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
-#include <timew.h>
-#include <shared.h>
-#include <format.h>
 #include <commands.h>
-#include <cstring>
+#include <format.h>
-#include <unistd.h>
 #include <iostream>
 #include <paths.h>
+#include <shared.h>
+#include <timew.h>
+#include <unistd.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 bool lightweightVersionCheck (int argc, const char** argv)

src/lex.cpp

@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <iostream>
 #include <Lexer.h>
+#include <iostream>
 
 int main (int argc, char** argv)
 {

src/log.cpp

@@ -25,9 +25,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <Color.h>
-#include <timew.h>
 #include <iostream>
 #include <sstream>
+#include <timew.h>
 
 static bool debugMode = false;
 static std::string debugIndicator = ">>";

src/paths.h

@@ -26,10 +26,10 @@
 
 #ifndef INCLUDED_PATH_RESOLVER
 #define INCLUDED_PATH_RESOLVER
-#include <string>
-#include <Rules.h>
 #include <CLI.h>
 #include <Rules.h>
+#include <Rules.h>
+#include <string>
 
 namespace paths {
     void initializeDirs (const CLI&, Rules&);

src/timew.cpp

@@ -24,20 +24,18 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <AtomicFile.h>
 #include <CLI.h>
 #include <Database.h>
-#include <Rules.h>
-#include <Extensions.h>
 #include <Datetime.h>
+#include <Extensions.h>
+#include <Rules.h>
 #include <Timer.h>
-#include <shared.h>
-#include <commands.h>
-#include <timew.h>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <new>
+#include <shared.h>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int argc, const char** argv)

src/timew.h

@@ -28,14 +28,14 @@
 #define INCLUDED_TIMEW
 
 #include <CLI.h>
+#include <Color.h>
 #include <Database.h>
-#include <Rules.h>
+#include <Exclusion.h>
 #include <Extensions.h>
 #include <Interval.h>
-#include <Exclusion.h>
-#include <Palette.h>
-#include <Color.h>
 #include <IntervalFilter.h>
+#include <Palette.h>
+#include <Rules.h>
 
 // data.cpp
 std::vector <Range>     getHolidays       (const Rules&);

src/util.cpp

@@ -24,9 +24,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
-#include <timew.h>
 #include <string>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // Escape all 'c' --> '\c'.

src/validate.cpp

@@ -24,11 +24,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
-#include <format.h>
-#include <timew.h>
-#include <iostream>
 #include <IntervalFilterAllInRange.h>
+#include <format.h>
+#include <iostream>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // :fill

test/AtomicFileTest.cpp

@@ -24,20 +24,15 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cassert>
-#include <sstream>
-#include <memory>
-#include <string>
-#include <unistd.h>
-#include <iostream>
-#include <cstdlib>
-#include <fstream>
-#include <cmake.h>
-#include <timew.h>
-#include <test.h>
 #include <AtomicFile.h>
 #include <FS.h>
 #include <TempDir.h>
+#include <cassert>
+#include <iostream>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <test.h>
 
 #ifdef FIU_ENABLE
 

test/Datafile.t.cpp

@@ -24,11 +24,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <test.h>
 #include <Datafile.h>
 #include <Interval.h>
-
 #include <TempDir.h>
+#include <test.h>
 
 int main ()
 {

test/DatetimeParser.t.cpp

@@ -24,12 +24,11 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Datetime.h>
-#include <test.h>
+#include <DatetimeParser.h>
+#include <ctime>
 #include <iostream>
-#include <time.h>
+#include <test.h>
-#include <src/DatetimeParser.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 void testParseOpenRange (

test/TagInfoDatabase.t.cpp

@@ -24,9 +24,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
-#include <test.h>
 #include <TagInfoDatabase.h>
+#include <test.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)

test/TempDir.h

@@ -27,13 +27,11 @@
 #ifndef TIMEW_TEMP_DIR
 #define TIMEW_TEMP_DIR
 
-#include <unistd.h>
-#include <cstdlib>
-
-#include <iostream>
-#include <vector>
-
 #include <FS.h>
+#include <cstdlib>
+#include <iostream>
+#include <unistd.h>
+#include <vector>
 
 class TempDir
 {

test/data.t.cpp

@@ -24,9 +24,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <timew.h>
+#include <IntervalFactory.h>
 #include <test.h>
-#include <src/IntervalFactory.h>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 void test_flatten (

test/exclusion.t.cpp

@@ -24,12 +24,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Exclusion.h>
 #include <Range.h>
-#include <vector>
-#include <iostream>
 #include <test.h>
+#include <vector>
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)

test/helper.t.cpp

@@ -24,9 +24,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
-#include <timew.h>
 #include <test.h>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)

test/interval.t.cpp

@@ -24,7 +24,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Interval.h>
 #include <IntervalFactory.h>
 #include <test.h>

test/range.t.cpp

@@ -24,10 +24,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Range.h>
-#include <test.h>
+#include <cmake.h>
 #include <iostream>
+#include <test.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)

test/rules.t.cpp

@@ -24,7 +24,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
 #include <Rules.h>
 #include <test.h>
 

test/test.cpp

@@ -24,14 +24,14 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <iostream>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <iomanip>
-#include <stdio.h>
+#include <iostream>
-#include <unistd.h>
-#include <string.h>
-#include <math.h>
-#include <stdlib.h>
 #include <test.h>
+#include <unistd.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 UnitTest::UnitTest ()

test/util.t.cpp

@@ -24,9 +24,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <cmake.h>
-#include <timew.h>
 #include <test.h>
+#include <timew.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)