diff --git a/src/vt/collective/reduce/scoping/strong_types.h b/src/vt/collective/reduce/scoping/strong_types.h
index 3e24a4b481..c4e8eeffd8 100644
--- a/src/vt/collective/reduce/scoping/strong_types.h
+++ b/src/vt/collective/reduce/scoping/strong_types.h
@@ -46,6 +46,7 @@
 
 #include "vt/configs/types/types_type.h"
 #include "vt/configs/types/types_sentinels.h"
+#include "vt/epoch/epoch_type.h"
 #include "vt/utils/strong/strong_type.h"
 
 namespace vt { namespace collective { namespace reduce { namespace detail {
diff --git a/src/vt/configs/debug/debug_var_unused.h b/src/vt/configs/debug/debug_var_unused.h
index 481ebc70c3..c461fc6203 100644
--- a/src/vt/configs/debug/debug_var_unused.h
+++ b/src/vt/configs/debug/debug_var_unused.h
@@ -44,6 +44,8 @@
 #if !defined INCLUDED_VT_CONFIGS_DEBUG_DEBUG_VAR_UNUSED_H
 #define INCLUDED_VT_CONFIGS_DEBUG_DEBUG_VAR_UNUSED_H
 
+#include <utility>
+
 #define vt_force_use(...)           vt::debug::useVars(__VA_ARGS__);
 
 namespace vt { namespace debug {
diff --git a/src/vt/configs/error/stack_out.h b/src/vt/configs/error/stack_out.h
index 57a0b2aacf..1858ab0022 100644
--- a/src/vt/configs/error/stack_out.h
+++ b/src/vt/configs/error/stack_out.h
@@ -47,12 +47,13 @@
 #include <cstdlib>
 #include <vector>
 #include <tuple>
+#include <string>
 
 namespace vt { namespace debug { namespace stack {
 
-using StackTupleType  = std::tuple<int32_t,void*,std::string,std::size_t>;
+using StackTupleType = std::tuple<int32_t, void *, std::string, std::size_t>;
 using StackVectorType = std::vector<StackTupleType>;
-using DumpStackType   = std::tuple<std::string,StackVectorType>;
+using DumpStackType = std::tuple<std::string, StackVectorType>;
 
 /*
  * This function automatically produce a backtrace of the stack with demangled
diff --git a/src/vt/configs/types/types_headers.h b/src/vt/configs/types/types_headers.h
index f1ebde4d3e..606db97d04 100644
--- a/src/vt/configs/types/types_headers.h
+++ b/src/vt/configs/types/types_headers.h
@@ -49,5 +49,6 @@
 #include "vt/configs/types/types_rdma.h"
 #include "vt/configs/types/types_size.h"
 #include "vt/configs/types/types_sentinels.h"
+#include "vt/epoch/epoch_type.h"
 
 #endif  /*INCLUDED_VT_CONFIGS_TYPES_TYPES_HEADERS_H*/
diff --git a/src/vt/configs/types/types_rdma.h b/src/vt/configs/types/types_rdma.h
index 787ccdb69f..91383a153a 100644
--- a/src/vt/configs/types/types_rdma.h
+++ b/src/vt/configs/types/types_rdma.h
@@ -44,7 +44,6 @@
 #if !defined INCLUDED_VT_CONFIGS_TYPES_TYPES_RDMA_H
 #define INCLUDED_VT_CONFIGS_TYPES_TYPES_RDMA_H
 
-#include "vt/configs/debug/debug_masterconfig.h"
 #include "vt/configs/types/types_type.h"
 
 #include <cstdint>
diff --git a/src/vt/configs/types/types_sentinels.h b/src/vt/configs/types/types_sentinels.h
index 06faefa1f0..7fd67a7a38 100644
--- a/src/vt/configs/types/types_sentinels.h
+++ b/src/vt/configs/types/types_sentinels.h
@@ -44,7 +44,6 @@
 #if !defined INCLUDED_VT_CONFIGS_TYPES_TYPES_SENTINELS_H
 #define INCLUDED_VT_CONFIGS_TYPES_TYPES_SENTINELS_H
 
-#include "vt/configs/debug/debug_masterconfig.h"
 #include "vt/configs/types/types_type.h"
 #include "vt/configs/types/types_rdma.h"
 
diff --git a/src/vt/configs/types/types_type.h b/src/vt/configs/types/types_type.h
index adaf543d72..ed125fea76 100644
--- a/src/vt/configs/types/types_type.h
+++ b/src/vt/configs/types/types_type.h
@@ -128,7 +128,4 @@ using ActionNodeType          = std::function<void(NodeType)>;
 
 }  // end namespace vt
 
-// Include the epoch type, which is a strong, named type
-#include "vt/epoch/epoch_type.h"
-
 #endif  /*INCLUDED_VT_CONFIGS_TYPES_TYPES_TYPE_H*/
diff --git a/src/vt/context/runnable_context/td.h b/src/vt/context/runnable_context/td.h
index 40174e188e..b991a8760e 100644
--- a/src/vt/context/runnable_context/td.h
+++ b/src/vt/context/runnable_context/td.h
@@ -47,6 +47,7 @@
 #include "vt/context/runnable_context/base.h"
 #include "vt/configs/types/types_type.h"
 #include "vt/configs/types/types_sentinels.h"
+#include "vt/epoch/epoch_type.h"
 
 #include <vector>
 
diff --git a/src/vt/epoch/epoch_impl_type.h b/src/vt/epoch/epoch_impl_type.h
index f04bc1dd51..30631d44bd 100644
--- a/src/vt/epoch/epoch_impl_type.h
+++ b/src/vt/epoch/epoch_impl_type.h
@@ -44,6 +44,8 @@
 #if !defined INCLUDED_VT_EPOCH_EPOCH_IMPL_TYPE_H
 #define INCLUDED_VT_EPOCH_EPOCH_IMPL_TYPE_H
 
+#include <cstdint>
+
 namespace vt { namespace epoch { namespace detail {
 
 /// Epoch tag type for the strong type
diff --git a/src/vt/utils/bits/bits_counter.h b/src/vt/utils/bits/bits_counter.h
index 1d6b968bb1..8994f65d0a 100644
--- a/src/vt/utils/bits/bits_counter.h
+++ b/src/vt/utils/bits/bits_counter.h
@@ -44,6 +44,8 @@
 #if !defined INCLUDED_VT_UTILS_BITS_BITS_COUNTER_H
 #define INCLUDED_VT_UTILS_BITS_BITS_COUNTER_H
 
+#include <vt/configs/types/types_type.h>
+
 // Do not pull in other VT dependencies here
 
 namespace vt { namespace utils {
diff --git a/src/vt/utils/strong/strong_type.h b/src/vt/utils/strong/strong_type.h
index bc82096074..5088b5928e 100644
--- a/src/vt/utils/strong/strong_type.h
+++ b/src/vt/utils/strong/strong_type.h
@@ -44,6 +44,9 @@
 #if !defined INCLUDED_VT_UTILS_STRONG_STRONG_TYPE_H
 #define INCLUDED_VT_UTILS_STRONG_STRONG_TYPE_H
 
+#include <functional>
+#include <type_traits>
+
 namespace vt { namespace util { namespace strong { namespace detail {
 
 /**