diff --git a/include/lbann/base.hpp b/include/lbann/base.hpp
index 5f86f6b3fdd..1f3cc864386 100644
--- a/include/lbann/base.hpp
+++ b/include/lbann/base.hpp
@@ -27,7 +27,9 @@
 #ifndef LBANN_BASE_HPP_INCLUDED
 #define LBANN_BASE_HPP_INCLUDED
 
-#include <El.hpp>
+#include "lbann/lbann_stl.hpp"
+
+#include <El.hpp> // IWYU pragma: export
 
 // Defines, among other things, DataType.
 #include "lbann_config.hpp"
diff --git a/include/lbann/data_readers/data_reader_cifar10.hpp b/include/lbann/data_readers/data_reader_cifar10.hpp
index f3e1389dd91..8b66c6ad3bb 100644
--- a/include/lbann/data_readers/data_reader_cifar10.hpp
+++ b/include/lbann/data_readers/data_reader_cifar10.hpp
@@ -30,6 +30,8 @@
 #define LBANN_DATA_READER_CIFAR10_HPP
 
 #include "data_reader_image.hpp"
+#include "lbann/base.hpp"
+#include "lbann/lbann_stl.hpp"
 
 namespace lbann {
 
diff --git a/include/lbann/data_readers/data_reader_merge_features.hpp b/include/lbann/data_readers/data_reader_merge_features.hpp
index aa8375f38c9..c2a8f874c99 100644
--- a/include/lbann/data_readers/data_reader_merge_features.hpp
+++ b/include/lbann/data_readers/data_reader_merge_features.hpp
@@ -30,8 +30,12 @@
 #define LBANN_DATA_READER_MERGE_FEATURES_HPP
 
 #include "compound_data_reader.hpp"
+#include "lbann/base.hpp"
+#include "lbann/data_readers/data_reader.hpp"
+#include "lbann/lbann_stl.hpp"
 
 namespace lbann {
+class thread_pool;
 
 /**
  * Data reader for merging multiple data readers.
diff --git a/include/lbann/data_readers/data_reader_merge_samples.hpp b/include/lbann/data_readers/data_reader_merge_samples.hpp
index 1c4b66fa005..5af7eef55b3 100644
--- a/include/lbann/data_readers/data_reader_merge_samples.hpp
+++ b/include/lbann/data_readers/data_reader_merge_samples.hpp
@@ -30,6 +30,9 @@
 #define LBANN_DATA_READER_MERGE_SAMPLES_HPP
 
 #include "compound_data_reader.hpp"
+#include "lbann/base.hpp"
+#include "lbann/data_readers/data_reader.hpp"
+#include "lbann/lbann_stl.hpp"
 
 namespace lbann {
 
diff --git a/include/lbann/data_readers/data_reader_mesh.hpp b/include/lbann/data_readers/data_reader_mesh.hpp
index e9c1e8949cf..9dac8e74b03 100644
--- a/include/lbann/data_readers/data_reader_mesh.hpp
+++ b/include/lbann/data_readers/data_reader_mesh.hpp
@@ -30,8 +30,11 @@
 #define LBANN_DATA_READER_MESH_HPP
 
 #include "data_reader.hpp"
+#include "lbann/base.hpp"
+#include "lbann/lbann_stl.hpp"
 
 namespace lbann {
+class thread_pool;
 
 /**
  * Data reader for reading dumped mesh images.
diff --git a/include/lbann/data_readers/data_reader_mnist.hpp b/include/lbann/data_readers/data_reader_mnist.hpp
index cbe0741feb8..ca6f6d22526 100644
--- a/include/lbann/data_readers/data_reader_mnist.hpp
+++ b/include/lbann/data_readers/data_reader_mnist.hpp
@@ -30,6 +30,8 @@
 #define LBANN_DATA_READER_MNIST_HPP
 
 #include "data_reader_image.hpp"
+#include "lbann/base.hpp"
+#include "lbann/lbann_stl.hpp"
 
 namespace lbann {
 
diff --git a/include/lbann/data_readers/data_reader_nci.hpp b/include/lbann/data_readers/data_reader_nci.hpp
index c007612756b..5fbdc35d78f 100644
--- a/include/lbann/data_readers/data_reader_nci.hpp
+++ b/include/lbann/data_readers/data_reader_nci.hpp
@@ -30,6 +30,7 @@
 #define LBANN_DATA_READER_NCI_HPP
 
 #include "data_reader_csv.hpp"
+#include "lbann/lbann_stl.hpp"
 
 #define NCI_HAS_HEADER
 
diff --git a/include/lbann/data_readers/data_reader_python.hpp b/include/lbann/data_readers/data_reader_python.hpp
index f6124e85564..03ed03566b0 100644
--- a/include/lbann/data_readers/data_reader_python.hpp
+++ b/include/lbann/data_readers/data_reader_python.hpp
@@ -27,7 +27,16 @@
 #ifndef LBANN_DATA_READERS_PYTHON_HPP_INCLUDED
 #define LBANN_DATA_READERS_PYTHON_HPP_INCLUDED
 
+#include <El.hpp>
+
 #include "data_reader.hpp"
+#include "lbann/base.hpp"
+#include "lbann/data_readers/utils/input_data_type.hpp"
+#include "lbann/lbann_stl.hpp"
+
+namespace lbann {
+class thread_pool;
+}  // namespace lbann
 #ifdef LBANN_HAS_EMBEDDED_PYTHON
 #include "lbann/utils/python.hpp"
 
diff --git a/include/lbann/data_readers/data_reader_synthetic.hpp b/include/lbann/data_readers/data_reader_synthetic.hpp
index 151c7d47c2b..ddf29aef33d 100644
--- a/include/lbann/data_readers/data_reader_synthetic.hpp
+++ b/include/lbann/data_readers/data_reader_synthetic.hpp
@@ -30,6 +30,10 @@
 
 #include "data_reader.hpp"
 #include "lbann/utils/dim_helpers.hpp"
+#include "lbann/base.hpp"
+#include "lbann/data_readers/utils/input_data_type.hpp"
+#include "lbann/lbann_stl.hpp"
+#include "lbann/utils/exception.hpp"
 
 // Forward declaration
 class DataReaderSyntheticWhiteboxTester;
diff --git a/include/lbann/lbann_stl.hpp b/include/lbann/lbann_stl.hpp
new file mode 100644
index 00000000000..89aa07e6351
--- /dev/null
+++ b/include/lbann/lbann_stl.hpp
@@ -0,0 +1,66 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2014-2023, Lawrence Livermore National Security, LLC.
+// Produced at the Lawrence Livermore National Laboratory.
+// Written by the LBANN Research Team (B. Van Essen, et al.) listed in
+// the CONTRIBUTORS file. <lbann-dev@llnl.gov>
+//
+// LLNL-CODE-697807.
+// All rights reserved.
+//
+// This file is part of LBANN: Livermore Big Artificial Neural Network
+// Toolkit. For details, see http://software.llnl.gov/LBANN or
+// https://github.com/LLNL/LBANN.
+//
+// Licensed under the Apache License, Version 2.0 (the "Licensee"); you
+// may not use this file except in compliance with the License.  You may
+// obtain a copy of the License at:
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+// implied. See the License for the specific language governing
+// permissions and limitations under the license.
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef LBANN_LBANN_STL_HPP_INCLUDED
+#define LBANN_LBANN_STL_HPP_INCLUDED
+
+#if defined(__cpp_modules) && __cpp_modules
+import std;
+#else
+// IWYU pragma: begin_exports
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdio>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
+#include <deque>
+#include <fstream>
+#include <functional>
+#include <iosfwd>
+#include <iostream>
+#include <iterator>
+#include <limits>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <numeric>
+#include <random>
+#include <regex>
+#include <set>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+// IWYU pragma: end_exports
+#endif
+
+#endif // LBANN_LBANN_STL_HPP_INCLUDED
diff --git a/lbann_iwyu_mapping.imp b/lbann_iwyu_mapping.imp
new file mode 100644
index 00000000000..22003d02fc4
--- /dev/null
+++ b/lbann_iwyu_mapping.imp
@@ -0,0 +1,40 @@
+[
+ { include: ["@<hydrogen/.*>", "private", "<El.hpp>", "public"] },
+ { include: ["@<h2/.*>", "private", "\"lbann/utils/h2_tmp.hpp\"", "public"] },
+
+ { include: ["@<cereal/types/.*>", "private", "\"lbann/utils/serialization/cereal_utils.hpp\"", "public"] },
+ { include: ["@<cereal/details/.*>", "private", "<cereal/cereal.hpp>", "public"] },
+
+ # Standard packages in the Conduit library, outside of the relay sublibrary should be in a standard header
+ { include: ["@<conduit/conduit_[^r].*>", "private", "<conduit/conduit.hpp>", "public"] },
+
+ { include: ["@<El/.*>", "private", "<El.hpp>", "public"] },
+
+ { include: ["@\"lbann/utils/serialization/.*\"", "public", "\"lbann/utils/serialize.hpp\"", "public"] },
+# { include: ["@<lbann/.*>", "private", "\"lbann/base.hpp\"", "public"] },
+ { include: ["\"lbann_config.hpp\"", "private", "\"lbann/base.hpp\"", "public"] },
+
+ # Grab all of the C++ implementation details and tie them into a common header
+ { include: ["@<__.*>", "private", "\"lbann/lbann_stl.hpp\"", "public"] },
+ { include: ["@<_.*>", "private", "\"lbann/lbann_stl.hpp\"", "public"] },
+
+ { symbol: ["hid_t", "private", "\"hdf5.h\"", "public"] },
+
+ # Handle obnoxious Python.h symbols
+ { symbol: ["PyObject_CallMethod", "private", "<Python.h>", "public"] },
+ { symbol: ["PyIter_Next", "private", "<Python.h>", "public"] },
+ { symbol: ["PyObject_CallObject", "private", "<Python.h>", "public"] },
+ { symbol: ["PyObject_GetIter", "private", "<Python.h>", "public"] },
+ { symbol: ["PyObject_Length", "private", "<Python.h>", "public"] },
+ { symbol: ["PyImport_ImportModule", "private", "<Python.h>", "public"] },
+ { symbol: ["PyList_Append", "private", "<Python.h>", "public"] },
+ { symbol: ["PyList_New", "private", "<Python.h>", "public"] },
+ { symbol: ["PyLong_AsLong", "private", "<Python.h>", "public"] },
+ { symbol: ["Py_BuildValue", "private", "<Python.h>", "public"] },
+ { symbol: ["PyObject_GetAttrString", "private", "<Python.h>", "public"] },
+ { symbol: ["PyObject_SetAttrString", "private", "<Python.h>", "public"] },
+ { symbol: ["Py_DECREF", "private", "<Python.h>", "public"] },
+ { symbol: ["PySys_GetObject", "private", "<Python.h>", "public"] },
+ { symbol: ["PyRun_SimpleString", "private", "<Python.h>", "public"] },
+
+]
diff --git a/src/data_readers/data_reader.cpp b/src/data_readers/data_reader.cpp
index d6ecfd864e4..f3a514db3ae 100644
--- a/src/data_readers/data_reader.cpp
+++ b/src/data_readers/data_reader.cpp
@@ -26,23 +26,30 @@
 // lbann_data_reader .hpp .cpp - Input data base class for training, testing
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "lbann/comm_impl.hpp"
+#include <El.hpp>
+#include <cereal/cereal.hpp>
+#include <conduit/conduit.hpp>
+
 #include "lbann/data_readers/data_reader.hpp"
 #include "lbann/data_store/data_store_conduit.hpp"
 #include "lbann/execution_algorithms/sgd_execution_context.hpp"
-#include "lbann/io/persist.hpp"
 #include "lbann/io/persist_impl.hpp"
 #include "lbann/trainers/trainer.hpp"
-#include "lbann/utils/serialize.hpp"
 #include "lbann/utils/threads/thread_pool.hpp"
 #include "lbann/utils/timer.hpp"
-
-#include "conduit/conduit_node.hpp"
-
-#include <omp.h>
-#include <future>
+#include "lbann/base.hpp"
+#include "lbann/comm.hpp"
+#include "lbann/data_coordinator/data_coordinator.hpp"
+#include "lbann/data_readers/utils/input_data_type.hpp"
+#include "lbann/lbann_stl.hpp"
+#include "lbann/utils/argument_parser.hpp"
+#include "lbann/utils/enum_iterator.hpp"
+#include "lbann/utils/exception.hpp"
+#include "lbann/utils/options.hpp"
+#include "lbann/utils/random_number_generators.hpp"
 
 namespace lbann {
+class persist;
 
 #undef DEBUG
 //#define DEBUG
diff --git a/src/data_readers/data_reader_HDF5.cpp b/src/data_readers/data_reader_HDF5.cpp
index 6ccb9fb81fb..67ea29dc820 100644
--- a/src/data_readers/data_reader_HDF5.cpp
+++ b/src/data_readers/data_reader_HDF5.cpp
@@ -24,13 +24,27 @@
 // permissions and limitations under the license.
 //
 /////////////////////////////////////////////////////////////////////////////////
-#include "conduit/conduit_relay_mpi.hpp"
+#include <El.hpp>
+#include <conduit/conduit.hpp>
+#include <conduit/conduit_relay_io.hpp>
+#include <conduit/conduit_relay_io_hdf5.hpp>
 
+#include "conduit/conduit_relay_mpi.hpp"
 #include "lbann/data_readers/data_reader_HDF5.hpp"
 #include "lbann/data_readers/data_reader_sample_list_impl.hpp"
 #include "lbann/data_readers/sample_list_impl.hpp"
 #include "lbann/data_readers/sample_list_open_files_impl.hpp"
 #include "lbann/utils/timer.hpp"
+#include "hdf5.h"
+#include "lbann/comm.hpp"
+#include "lbann/data_readers/data_reader_sample_list.hpp"
+#include "lbann/data_readers/sample_list_hdf5.hpp"
+#include "lbann/data_readers/utils/input_data_type.hpp"
+#include "lbann/data_store/data_store_conduit.hpp"
+#include "lbann/lbann_stl.hpp"
+#include "lbann/utils/argument_parser.hpp"
+#include "lbann/utils/exception.hpp"
+#include "lbann/utils/options.hpp"
 
 namespace lbann {
 namespace {
diff --git a/src/data_readers/data_reader_cifar10.cpp b/src/data_readers/data_reader_cifar10.cpp
index 396e976d3c8..19e5e31c569 100644
--- a/src/data_readers/data_reader_cifar10.cpp
+++ b/src/data_readers/data_reader_cifar10.cpp
@@ -27,7 +27,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "lbann/data_readers/data_reader_cifar10.hpp"
-#include "lbann/data_readers/sample_list_impl.hpp"
+
+#include <El.hpp>
+
+#include "lbann/data_readers/data_reader_image.hpp"
+#include "lbann/data_readers/utils/input_data_type.hpp"
+#include "lbann/transforms/transform_pipeline.hpp"
+#include "lbann/utils/exception.hpp"
 
 namespace lbann {
 
diff --git a/src/data_readers/data_reader_csv.cpp b/src/data_readers/data_reader_csv.cpp
index 60d44d49577..fc519f194c6 100644
--- a/src/data_readers/data_reader_csv.cpp
+++ b/src/data_readers/data_reader_csv.cpp
@@ -26,12 +26,17 @@
 // lbann_data_reader_csv .hpp .cpp - generic_data_reader class for CSV files
 ////////////////////////////////////////////////////////////////////////////////
 
+#include <El.hpp>
+
 #include "lbann/comm_impl.hpp"
 #include "lbann/data_readers/data_reader_csv.hpp"
-#include "lbann/utils/options.hpp"
 #include "lbann/utils/threads/thread_pool.hpp"
-
-#include <unordered_set>
+#include "lbann/base.hpp"
+#include "lbann/comm.hpp"
+#include "lbann/data_readers/data_reader.hpp"
+#include "lbann/data_readers/utils/input_data_type.hpp"
+#include "lbann/lbann_stl.hpp"
+#include "lbann/utils/exception.hpp"
 
 namespace lbann {
 
diff --git a/src/data_readers/data_reader_image.cpp b/src/data_readers/data_reader_image.cpp
index ca1988ca597..c75727d8422 100644
--- a/src/data_readers/data_reader_image.cpp
+++ b/src/data_readers/data_reader_image.cpp
@@ -26,17 +26,28 @@
 // data_reader_image .hpp .cpp - generic data reader class for image dataset
 ////////////////////////////////////////////////////////////////////////////////
 
+#include <cereal/archives/binary.hpp>
+#include <cereal/cereal.hpp>
+#include <conduit/conduit.hpp>
+
 #include "lbann/comm_impl.hpp"
 #include "lbann/data_readers/data_reader_image.hpp"
 #include "lbann/data_readers/sample_list_impl.hpp"
 #include "lbann/data_store/data_store_conduit.hpp"
 #include "lbann/utils/file_utils.hpp"
 #include "lbann/utils/lbann_library.hpp"
-#include "lbann/utils/threads/thread_utils.hpp"
 #include "lbann/utils/timer.hpp"
 #include "lbann/utils/vectorwrapbuf.hpp"
-
-#include <fstream>
+#include "lbann/base.hpp"
+#include "lbann/comm.hpp"
+#include "lbann/data_readers/data_reader.hpp"
+#include "lbann/data_readers/sample_list.hpp"
+#include "lbann/lbann_stl.hpp"
+#include "lbann/transforms/transform_pipeline.hpp"
+#include "lbann/utils/argument_parser.hpp"
+#include "lbann/utils/exception.hpp"
+#include "lbann/utils/options.hpp"
+#include "lbann/utils/threads/thread_pool.hpp"
 
 namespace lbann {
 
diff --git a/src/data_readers/data_reader_jag_conduit.cpp b/src/data_readers/data_reader_jag_conduit.cpp
index 741fcfbdd34..150adbf0d30 100644
--- a/src/data_readers/data_reader_jag_conduit.cpp
+++ b/src/data_readers/data_reader_jag_conduit.cpp
@@ -25,38 +25,41 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+#include <El.hpp>
+#include <cereal/archives/binary.hpp>
+#include <cereal/cereal.hpp>
+#include <conduit/conduit.hpp>
+#include <conduit/conduit_relay.hpp>
+#include <conduit/conduit_relay_io_hdf5.hpp>
+
 #include "lbann/comm_impl.hpp"
 #include "lbann/data_readers/data_reader_jag_conduit.hpp"
 #include "lbann/data_store/data_store_conduit.hpp"
 #include "lbann/trainers/trainer.hpp"
 #include "lbann/execution_algorithms/sgd_execution_context.hpp"
 #include "lbann/utils/dim_helpers.hpp"
-#include "lbann/utils/lbann_library.hpp"
-#include "lbann/utils/serialize.hpp"
 #include "lbann/transforms/repack_HWC_to_CHW_layout.hpp"
 #include "lbann/transforms/scale_and_translate.hpp"
-
 #include "lbann/utils/file_utils.hpp" // for add_delimiter() in load()
 #include "lbann/data_readers/sample_list_impl.hpp"
 #include "lbann/data_readers/sample_list_open_files_impl.hpp"
 #include "lbann/utils/vectorwrapbuf.hpp"
-
-#include <limits>     // numeric_limits
-#include <algorithm>  // max_element
-#include <numeric>    // accumulate
-#include <functional> // multiplies
-#include <type_traits>// is_same
-#include <set>
-#include <map>
-#include <omp.h>
 #include "lbann/utils/timer.hpp"
-#include "lbann/utils/glob.hpp"
-#include "lbann/utils/peek_map.hpp"
-#include "conduit/conduit_relay.hpp"
-#include "conduit/conduit_relay_io_hdf5.hpp"
-
-#include <sstream>
-#include <fstream>
+#include "hdf5.h"
+#include "lbann/base.hpp"
+#include "lbann/comm.hpp"
+#include "lbann/data_coordinator/data_coordinator.hpp"
+#include "lbann/data_coordinator/data_coordinator_metadata.hpp"
+#include "lbann/data_readers/data_reader.hpp"
+#include "lbann/data_readers/sample_list.hpp"
+#include "lbann/data_readers/utils/input_data_type.hpp"
+#include "lbann/lbann_stl.hpp"
+#include "lbann/utils/argument_parser.hpp"
+#include "lbann/utils/exception.hpp"
+#include "lbann/utils/options.hpp"
+#include "lbann/utils/random_number_generators.hpp"
+#include "lbann/utils/threads/thread_pool.hpp"
+#include "lbann/utils/type_erased_matrix.hpp"
 
 // This comes after all the headers, and is only visible within the current implementation file.
 // To make sure, we put '#undef _CN_' at the end of this file
diff --git a/src/data_readers/data_reader_merge_features.cpp b/src/data_readers/data_reader_merge_features.cpp
index c302a925e21..3dcb6cec1ec 100644
--- a/src/data_readers/data_reader_merge_features.cpp
+++ b/src/data_readers/data_reader_merge_features.cpp
@@ -27,10 +27,16 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "lbann/data_readers/data_reader_merge_features.hpp"
-#include "lbann/utils/options.hpp"
+
+#include <El.hpp>
+
 #include "lbann/utils/timer.hpp"
+#include "lbann/comm.hpp"
+#include "lbann/data_readers/compound_data_reader.hpp"
+#include "lbann/utils/exception.hpp"
 
 namespace lbann {
+class thread_pool;
 
 data_reader_merge_features::data_reader_merge_features(
   std::vector<generic_data_reader*> data_readers,
diff --git a/src/data_readers/data_reader_merge_samples.cpp b/src/data_readers/data_reader_merge_samples.cpp
index d7430514e91..7733af5cc8e 100644
--- a/src/data_readers/data_reader_merge_samples.cpp
+++ b/src/data_readers/data_reader_merge_samples.cpp
@@ -27,7 +27,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "lbann/data_readers/data_reader_merge_samples.hpp"
-#include "lbann/utils/options.hpp"
+
+#include "lbann/data_readers/compound_data_reader.hpp"
+#include "lbann/data_readers/utils/input_data_type.hpp"
+#include "lbann/utils/exception.hpp"
 
 namespace lbann {
 
diff --git a/src/data_readers/data_reader_mesh.cpp b/src/data_readers/data_reader_mesh.cpp
index 5879dfe29de..69b0e222ffc 100644
--- a/src/data_readers/data_reader_mesh.cpp
+++ b/src/data_readers/data_reader_mesh.cpp
@@ -27,8 +27,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "lbann/data_readers/data_reader_mesh.hpp"
+
+#include <El.hpp>
+
 #include "lbann/utils/glob.hpp"
 #include "lbann/utils/threads/thread_pool.hpp"
+#include "lbann/data_readers/data_reader.hpp"
+#include "lbann/data_readers/utils/input_data_type.hpp"
+#include "lbann/utils/exception.hpp"
+#include "lbann/utils/random_number_generators.hpp"
 
 namespace lbann {
 
diff --git a/src/data_readers/data_reader_mnist.cpp b/src/data_readers/data_reader_mnist.cpp
index 43d8b501d15..1ab9b3ddc20 100644
--- a/src/data_readers/data_reader_mnist.cpp
+++ b/src/data_readers/data_reader_mnist.cpp
@@ -27,10 +27,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "lbann/data_readers/data_reader_mnist.hpp"
-#include "lbann/data_readers/sample_list_impl.hpp"
-#include "lbann/utils/file_utils.hpp"
+
+#include <El.hpp>
 #include <cstdio>
 
+#include "lbann/utils/file_utils.hpp"
+#include "lbann/comm.hpp"
+#include "lbann/data_readers/data_reader_image.hpp"
+#include "lbann/data_readers/utils/input_data_type.hpp"
+#include "lbann/transforms/transform_pipeline.hpp"
+#include "lbann/utils/exception.hpp"
+
 namespace lbann {
 
 mnist_reader::mnist_reader(bool shuffle)
diff --git a/src/data_readers/data_reader_nci.cpp b/src/data_readers/data_reader_nci.cpp
index cc58fd69450..92af2d9ea17 100644
--- a/src/data_readers/data_reader_nci.cpp
+++ b/src/data_readers/data_reader_nci.cpp
@@ -27,9 +27,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "lbann/data_readers/data_reader_nci.hpp"
-#include <cstdio>
-#include <string>
-#include <omp.h>
+
+#include "lbann/data_readers/data_reader_csv.hpp"
 
 namespace lbann {
 
diff --git a/src/data_readers/data_reader_node2vec.cpp b/src/data_readers/data_reader_node2vec.cpp
index 8b5009f96e3..d1f97f65c2f 100644
--- a/src/data_readers/data_reader_node2vec.cpp
+++ b/src/data_readers/data_reader_node2vec.cpp
@@ -24,18 +24,16 @@
 // permissions and limitations under the license.
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "lbann/comm_impl.hpp"
-#include "lbann/data_readers/data_reader_node2vec.hpp"
 #ifdef LBANN_HAS_LARGESCALE_NODE2VEC
-#include "lbann/utils/memory.hpp"
-#include "lbann/utils/random.hpp"
 #include <dist/node2vec_rw/node2vec_rw.hpp>
 #include <havoqgt/distributed_db.hpp>
 #include <havoqgt/delegate_partitioned_graph.hpp>
-
 #include <algorithm>
 #include <numeric>
 
+#include "lbann/utils/memory.hpp"
+#include "lbann/utils/random.hpp"
+
 namespace lbann {
 
 namespace node2vec_reader_impl {
diff --git a/src/data_readers/data_reader_python.cpp b/src/data_readers/data_reader_python.cpp
index 73f07f4e232..1d5f96ef7b1 100644
--- a/src/data_readers/data_reader_python.cpp
+++ b/src/data_readers/data_reader_python.cpp
@@ -25,15 +25,18 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "lbann/data_readers/data_reader_python.hpp"
+
 #include "lbann/trainers/trainer.hpp"
-#ifdef LBANN_HAS_EMBEDDED_PYTHON
-#include <cstdio>
-#include <algorithm>
-#include <regex>
+#include "lbann/data_readers/data_reader.hpp"
+#include "lbann/utils/dim_helpers.hpp"
+#include "lbann/utils/exception.hpp"
 
+namespace lbann {
+class thread_pool;
+}  // namespace lbann
+#ifdef LBANN_HAS_EMBEDDED_PYTHON
 #include <Python.h>
 
-#include "lbann/trainers/trainer.hpp"
 #include "lbann/utils/python.hpp"
 
 namespace lbann {
diff --git a/src/data_readers/data_reader_smiles.cpp b/src/data_readers/data_reader_smiles.cpp
index bcea535bdd1..3ce4ade910d 100644
--- a/src/data_readers/data_reader_smiles.cpp
+++ b/src/data_readers/data_reader_smiles.cpp
@@ -25,6 +25,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+#include <conduit/conduit.hpp>
+
 #include "lbann/comm_impl.hpp"
 #include "lbann/data_readers/data_reader_sample_list_impl.hpp"
 #include "lbann/data_readers/data_reader_smiles.hpp"
@@ -35,12 +37,13 @@
 #include "lbann/utils/file_utils.hpp"
 #include "lbann/utils/timer.hpp"
 #include "lbann/utils/commify.hpp"
-#include "lbann/utils/lbann_library.hpp"
-#include "lbann/utils/vectorwrapbuf.hpp"
-#include <algorithm>
-#include <mutex>
-#include <cctype>
-#include <random>
+#include "lbann/base.hpp"
+#include "lbann/comm.hpp"
+#include "lbann/data_readers/data_reader_sample_list.hpp"
+#include "lbann/data_readers/sample_list_ifstream.hpp"
+#include "lbann/lbann_stl.hpp"
+#include "lbann/utils/exception.hpp"
+#include "lbann/utils/options.hpp"
 
 namespace lbann {
 
diff --git a/src/data_readers/data_reader_synthetic.cpp b/src/data_readers/data_reader_synthetic.cpp
index cea0ce11c86..d4029e26d1b 100644
--- a/src/data_readers/data_reader_synthetic.cpp
+++ b/src/data_readers/data_reader_synthetic.cpp
@@ -28,9 +28,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "lbann/data_readers/data_reader_synthetic.hpp"
+
+#include <El.hpp>
+
 #include "lbann/utils/random_number_generators.hpp"
-#include <cstdio>
-#include <string>
+#include "lbann/data_readers/data_reader.hpp"
+#include "lbann/utils/random.hpp"
 
 namespace lbann {
 
diff --git a/src/layers/activations/cereal_registration/elu.cpp b/src/layers/activations/cereal_registration/elu.cpp
index cff58f79609..17e3b5a7c32 100644
--- a/src/layers/activations/cereal_registration/elu.cpp
+++ b/src/layers/activations/cereal_registration/elu.cpp
@@ -23,10 +23,15 @@
 // implied. See the License for the specific language governing
 // permissions and limitations under the license.
 ////////////////////////////////////////////////////////////////////////////////
-#include "lbann/utils/serialize.hpp"
 #include <lbann/layers/activations/elu.hpp>
+#include <El.hpp>
+#include <cereal/cereal.hpp>
+
+#include "lbann/utils/serialize.hpp"
+#include "lbann/layers/data_type_layer.hpp"
 
 namespace lbann {
+enum class data_layout;
 
 template <typename TensorDataType, data_layout Layout, El::Device Device>
 template <typename ArchiveT>
diff --git a/src/layers/activations/cereal_registration/identity.cpp b/src/layers/activations/cereal_registration/identity.cpp
index 9f5ca9893a2..a049a4fad63 100644
--- a/src/layers/activations/cereal_registration/identity.cpp
+++ b/src/layers/activations/cereal_registration/identity.cpp
@@ -23,10 +23,14 @@
 // implied. See the License for the specific language governing
 // permissions and limitations under the license.
 ////////////////////////////////////////////////////////////////////////////////
-#include "lbann/utils/serialize.hpp"
 #include <lbann/layers/activations/identity.hpp>
+#include <El.hpp>
+
+#include "lbann/utils/serialize.hpp"
+#include "lbann/layers/data_type_layer.hpp"
 
 namespace lbann {
+enum class data_layout;
 
 template <typename TensorDataType, data_layout Layout, El::Device Device>
 template <typename ArchiveT>
diff --git a/src/layers/activations/cereal_registration/leaky_relu.cpp b/src/layers/activations/cereal_registration/leaky_relu.cpp
index 6f584503f11..c11e97c696d 100644
--- a/src/layers/activations/cereal_registration/leaky_relu.cpp
+++ b/src/layers/activations/cereal_registration/leaky_relu.cpp
@@ -23,10 +23,15 @@
 // implied. See the License for the specific language governing
 // permissions and limitations under the license.
 ////////////////////////////////////////////////////////////////////////////////
-#include "lbann/utils/serialize.hpp"
 #include <lbann/layers/activations/leaky_relu.hpp>
+#include <El.hpp>
+#include <cereal/cereal.hpp>
+
+#include "lbann/utils/serialize.hpp"
+#include "lbann/layers/data_type_layer.hpp"
 
 namespace lbann {
+enum class data_layout;
 
 template <typename TensorDataType, data_layout Layout, El::Device Device>
 template <typename ArchiveT>
diff --git a/src/layers/activations/cereal_registration/log_softmax.cpp b/src/layers/activations/cereal_registration/log_softmax.cpp
index b3596d37930..3cfdaf44af9 100644
--- a/src/layers/activations/cereal_registration/log_softmax.cpp
+++ b/src/layers/activations/cereal_registration/log_softmax.cpp
@@ -23,10 +23,14 @@
 // implied. See the License for the specific language governing
 // permissions and limitations under the license.
 ////////////////////////////////////////////////////////////////////////////////
-#include "lbann/utils/serialize.hpp"
 #include <lbann/layers/activations/log_softmax.hpp>
+#include <El.hpp>
+
+#include "lbann/utils/serialize.hpp"
+#include "lbann/layers/data_type_layer.hpp"
 
 namespace lbann {
+enum class data_layout;
 
 template <typename TensorDataType, data_layout Layout, El::Device Device>
 template <typename ArchiveT>
diff --git a/src/layers/activations/cereal_registration/relu.cpp b/src/layers/activations/cereal_registration/relu.cpp
index d1570789964..da25ae6c173 100644
--- a/src/layers/activations/cereal_registration/relu.cpp
+++ b/src/layers/activations/cereal_registration/relu.cpp
@@ -23,10 +23,14 @@
 // implied. See the License for the specific language governing
 // permissions and limitations under the license.
 ////////////////////////////////////////////////////////////////////////////////
-#include "lbann/utils/serialize.hpp"
 #include <lbann/layers/activations/relu.hpp>
+#include <El.hpp>
+
+#include "lbann/utils/serialize.hpp"
+#include "lbann/layers/data_type_layer.hpp"
 
 namespace lbann {
+enum class data_layout;
 
 template <typename TensorDataType, data_layout Layout, El::Device Device>
 template <typename ArchiveT>
diff --git a/src/layers/activations/cereal_registration/softmax.cpp b/src/layers/activations/cereal_registration/softmax.cpp
index 753ff85dda6..ff8a1ba4a53 100644
--- a/src/layers/activations/cereal_registration/softmax.cpp
+++ b/src/layers/activations/cereal_registration/softmax.cpp
@@ -23,10 +23,15 @@
 // implied. See the License for the specific language governing
 // permissions and limitations under the license.
 ////////////////////////////////////////////////////////////////////////////////
-#include "lbann/utils/serialize.hpp"
 #include <lbann/layers/activations/softmax.hpp>
+#include <El.hpp>
+#include <cereal/cereal.hpp>
+
+#include "lbann/utils/serialize.hpp"
+#include "lbann/layers/data_type_layer.hpp"
 
 namespace lbann {
+enum class data_layout;
 
 template <typename TensorDataType, data_layout Layout, El::Device Device>
 template <typename ArchiveT>
diff --git a/src/layers/math/matmul.cpp b/src/layers/math/matmul.cpp
index e7f118b14f5..fca1e3af73e 100644
--- a/src/layers/math/matmul.cpp
+++ b/src/layers/math/matmul.cpp
@@ -31,8 +31,8 @@
 #include "lbann/utils/gpu/helpers.hpp"
 #endif // LBANN_HAS_GPU
 #include "lbann/proto/layers.pb.h"
-#include<iostream>
-namespace lbann 
+#include <iostream>
+namespace lbann
 {
 
 #ifdef LBANN_HAS_DISTCONV
@@ -111,13 +111,13 @@ matmul_distconv_adapter<TensorDataType, Layout, Device>
 ::get_activations_local_shape(int index) const{
   const auto &layer = dynamic_cast<
     const matmul_layer<TensorDataType, Layout, Device>&>(this->layer());
-  const auto output_shape = 
+  const auto output_shape =
   ::distconv::get_matmul_local_tensor_shape(
     this->get_prev_activations(0),
     this->get_prev_activations(1),
     layer.m_transpose_a,
     layer.m_transpose_b);
-  return output_shape; 
+  return output_shape;
 }
 // =============================================================
 // DistConv-enabled MatMul member functions
@@ -142,7 +142,7 @@ template <typename TensorDataType, data_layout Layout, El::Device Device>
 const matmul_distconv_adapter<TensorDataType, Layout, Device>&
 matmul_layer<TensorDataType, Layout, Device>
 ::get_distconv_adapter() const{
-  return dynamic_cast<const matmul_distconv_adapter< 
+  return dynamic_cast<const matmul_distconv_adapter<
     TensorDataType, Layout, Device>&>(data_type_layer<TensorDataType>::get_distconv_adapter());
 }
 
@@ -512,7 +512,7 @@ void matmul_layer<TensorDataType, Layout, Device>::fp_compute() {
 }
 template <typename TensorDataType, data_layout Layout, El::Device Device>
 void matmul_layer<TensorDataType, Layout, Device>::bp_compute() {
-  
+
   #ifdef LBANN_HAS_DISTCONV
   // We are guaranteed to have
   if(this->distconv_enabled()){