Clean up headers with include-what-you-use

.clang-format

@@ -59,12 +59,12 @@ ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
-IncludeBlocks:   Preserve
+IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        4
-  - Regex:           '.*'
-    Priority:        3
+  - Regex:           '<[[:alnum:]._]+>'
+    Priority:        5
+  - Regex:           '^(<"podio/)'
+    Priority:        1
 IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: false
 IndentPPDirectives: BeforeHash

include/podio/CollectionBufferFactory.h

@@ -6,6 +6,7 @@
 
 #include <functional>
 #include <optional>
+#include <string>
 #include <unordered_map>
 #include <vector>
 

include/podio/DatamodelRegistry.h

@@ -1,6 +1,7 @@
 #ifndef PODIO_DATAMODELREGISTRY_H
 #define PODIO_DATAMODELREGISTRY_H
 
+#include <cstddef>
 #include <string>
 #include <string_view>
 #include <tuple>

include/podio/GenericParameters.h

@@ -5,13 +5,18 @@
 #include "podio/utilities/TypeHelpers.h"
 
 #include <algorithm>
+#include <cstddef>
+#include <initializer_list>
 #include <iostream>
 #include <iterator>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <optional>
 #include <string>
+#include <tuple>
+#include <type_traits>
+#include <utility>
 #include <vector>
 
 #if PODIO_ENABLE_SIO

include/podio/RNTupleReader.h

@@ -1,23 +1,24 @@
 #ifndef PODIO_RNTUPLEREADER_H
 #define PODIO_RNTUPLEREADER_H
 
+#include "podio/GenericParameters.h"
 #include "podio/ROOTFrameData.h"
 #include "podio/SchemaEvolution.h"
 #include "podio/podioVersion.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
+#include <ROOT/RVersion.hxx>
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
+  #include <ROOT/RNTupleReader.hxx>
+#endif
 
+#include <memory>
 #include <string>
 #include <string_view>
 #include <unordered_map>
 #include <vector>
 
-#include <ROOT/RNTuple.hxx>
-#include <RVersion.h>
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
-  #include <ROOT/RNTupleReader.hxx>
-#endif
-
 namespace podio {
+class CollectionIDTable;
 
 /**
 This class has the function to read available data from disk

include/podio/RNTupleWriter.h

@@ -1,23 +1,33 @@
 #ifndef PODIO_RNTUPLEWRITER_H
 #define PODIO_RNTUPLEWRITER_H
 
-#include "podio/Frame.h"
+#include "TFile.h"
 #include "podio/SchemaEvolution.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
 #include "podio/utilities/RootHelpers.h"
-
-#include "TFile.h"
-#include <ROOT/RNTuple.hxx>
 #include <ROOT/RNTupleModel.hxx>
+#include <ROOT/RVersion.hxx>
+
+#include <cstdint>
+
+namespace ROOT {
+namespace Experimental {
+  class REntry;
+} // namespace Experimental
+} // namespace ROOT
 #if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
   #include <ROOT/RNTupleWriter.hxx>
 #endif
 
+#include <memory>
 #include <string>
+#include <tuple>
 #include <unordered_map>
 #include <vector>
 
 namespace podio {
+class Frame;
+class GenericParameters;
 
 /// The RNTupleWriter writes podio files into ROOT files using the new RNTuple
 /// format.

include/podio/ROOTFrameData.h

@@ -9,6 +9,7 @@
 #include <optional>
 #include <string>
 #include <unordered_map>
+#include <vector>
 
 namespace podio {
 

include/podio/ROOTLegacyReader.h

@@ -1,12 +1,11 @@
 #ifndef PODIO_ROOTLEGACYREADER_H
 #define PODIO_ROOTLEGACYREADER_H
 
+#include "TChain.h"
 #include "podio/ROOTFrameData.h"
 #include "podio/podioVersion.h"
 #include "podio/utilities/RootHelpers.h"
 
-#include "TChain.h"
-
 #include <memory>
 #include <string>
 #include <tuple>

include/podio/ROOTReader.h

@@ -1,25 +1,22 @@
 #ifndef PODIO_ROOTREADER_H
 #define PODIO_ROOTREADER_H
 
+#include "TChain.h"
 #include "podio/ROOTFrameData.h"
+#include "podio/SchemaEvolution.h"
 #include "podio/podioVersion.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
 #include "podio/utilities/RootHelpers.h"
 
-#include "TChain.h"
-
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <string_view>
 #include <tuple>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
-// forward declarations
-class TClass;
-class TFile;
-class TTree;
-
 namespace podio {
 
 namespace detail {
@@ -30,7 +27,6 @@ namespace detail {
 
 } // namespace detail
 
-class CollectionBase;
 class CollectionIDTable;
 class GenericParameters;
 struct CollectionReadBuffers;

include/podio/ROOTWriter.h

@@ -1,12 +1,11 @@
 #ifndef PODIO_ROOTWRITER_H
 #define PODIO_ROOTWRITER_H
 
+#include "TFile.h"
 #include "podio/CollectionIDTable.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
 #include "podio/utilities/RootHelpers.h"
 
-#include "TFile.h"
-
 #include <memory>
 #include <string>
 #include <tuple>
@@ -18,7 +17,6 @@ class TTree;
 
 namespace podio {
 class Frame;
-class CollectionBase;
 class GenericParameters;
 
 /// The ROOTWriter writes podio files into ROOT files using TTrees.

include/podio/Reader.h

@@ -2,8 +2,16 @@
 #define PODIO_READER_H
 
 #include "podio/Frame.h"
+#include "podio/FrameCategories.h"
 #include "podio/podioVersion.h"
 
+#include <cstddef>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+
 namespace podio {
 
 /// Generic (type erased) reader class that can handle different I/O backends

include/podio/SIOBlock.h

@@ -6,7 +6,6 @@
 #include <podio/GenericParameters.h>
 #include <podio/podioVersion.h>
 #include <podio/utilities/TypeHelpers.h>
-
 #include <sio/block.h>
 #include <sio/io_device.h>
 #include <sio/version.h>

include/podio/SIOBlockUserData.h

@@ -5,7 +5,6 @@
 #include "podio/CollectionBuffers.h"
 #include "podio/SIOBlock.h"
 #include "podio/UserDataCollection.h"
-
 #include <sio/api.h>
 #include <sio/io_device.h>
 #include <sio/version.h>

include/podio/SIOFrameData.h

@@ -5,7 +5,6 @@
 #include "podio/CollectionIDTable.h"
 #include "podio/GenericParameters.h"
 #include "podio/SIOBlock.h"
-
 #include <sio/buffer.h>
 #include <sio/definitions.h>
 

include/podio/SIOLegacyReader.h

@@ -4,7 +4,6 @@
 #include "podio/SIOBlock.h"
 #include "podio/SIOFrameData.h"
 #include "podio/podioVersion.h"
-
 #include <sio/definitions.h>
 
 #include <memory>

include/podio/SIOReader.h

@@ -5,7 +5,6 @@
 #include "podio/SIOFrameData.h"
 #include "podio/podioVersion.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
-
 #include <sio/definitions.h>
 
 #include <memory>

include/podio/SIOWriter.h

@@ -3,7 +3,6 @@
 
 #include "podio/SIOBlock.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
-
 #include <sio/definitions.h>
 
 #include <string>

include/podio/SchemaEvolution.h

@@ -1,6 +1,7 @@
 #ifndef PODIO_SCHEMAEVOLUTION_H
 #define PODIO_SCHEMAEVOLUTION_H
 
+#include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <string>

include/podio/UserDataCollection.h

@@ -7,6 +7,18 @@
 #include "podio/SchemaEvolution.h"
 #include "podio/utilities/TypeHelpers.h"
 
+#include <cstddef>
+#include <cstdint>
+#include <iostream>
+#include <string_view>
+#include <tuple>
+#include <type_traits>
+#include <vector>
+
+namespace podio {
+class ICollectionProvider;
+} // namespace podio
+
 #define PODIO_ADD_USER_TYPE(type)                                                                                      \
   template <>                                                                                                          \
   constexpr const char* userDataTypeName<type>() {                                                                     \

include/podio/Writer.h

@@ -2,6 +2,11 @@
 #define PODIO_WRITER_H
 
 #include "podio/Frame.h"
+#include "podio/FrameCategories.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace podio {
 

include/podio/utilities/DatamodelRegistryIOHelpers.h

@@ -1,15 +1,16 @@
 #ifndef PODIO_UTILITIES_DATAMODELREGISTRYIOHELPERS_H
 #define PODIO_UTILITIES_DATAMODELREGISTRYIOHELPERS_H
 
-#include "podio/CollectionBase.h"
-#include "podio/DatamodelRegistry.h"
-
+#include <cstddef>
 #include <set>
 #include <string>
+#include <string_view>
 #include <tuple>
+#include <utility>
 #include <vector>
 
 namespace podio {
+class CollectionBase;
 
 /// Helper class to collect the datamodel (JSON) definitions that should be
 /// written.

include/podio/utilities/RootHelpers.h

@@ -3,13 +3,19 @@
 
 #include "podio/GenericParameters.h"
 
-#include "ROOT/RVec.hxx"
-#include "TBranch.h"
-
+#include <cstdint>
 #include <string>
 #include <tuple>
 #include <vector>
 
+class TBranch;
+namespace ROOT {
+namespace VecOps {
+  template <typename T>
+  class RVec;
+} // namespace VecOps
+} // namespace ROOT
+
 namespace podio {
 class CollectionBase;
 

src/CollectionBufferFactory.cc

@@ -1,6 +1,10 @@
 #include "podio/CollectionBufferFactory.h"
+
 #include "podio/CollectionBuffers.h"
 
+#include <cstddef>
+#include <utility>
+
 namespace podio {
 CollectionBufferFactory& CollectionBufferFactory::mutInstance() {
   static CollectionBufferFactory factory;

src/CollectionIDTable.cc

@@ -4,7 +4,10 @@
 #include "MurmurHash3.h"
 
 #include <algorithm>
+#include <cstddef>
 #include <iostream>
+#include <iterator>
+#include <utility>
 
 namespace podio {
 

src/DataSource.cc

@@ -1,4 +1,5 @@
 #include "podio/DataSource.h"
+
 #include "podio/Reader.h"
 
 // podio

src/DatamodelRegistryIOHelpers.cc

@@ -1,5 +1,10 @@
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
+
+#include "podio/CollectionBase.h"
+#include "podio/DatamodelRegistry.h"
+
 #include <algorithm>
+#include <iostream>
 #include <iterator>
 
 namespace podio {