diff --git a/single_include/AggregateHeaders.cpp b/single_include/AggregateHeaders.cpp
index 42f97c958..a510dc6a2 100644
--- a/single_include/AggregateHeaders.cpp
+++ b/single_include/AggregateHeaders.cpp
@@ -1,7 +1,9 @@
+#include "kompute/Core.hpp"
 #include "kompute/shaders/shaderopmult.hpp"
 #include "kompute/Manager.hpp"
+#include "kompute/Sequence.hpp"
 #include "kompute/OpBase.hpp"
 #include "kompute/OpMult.hpp"
 #include "kompute/OpCreateTensor.hpp"
-#include "kompute/OpMult.hpp"
+#include "kompute/Algorithm.hpp"
 #include "kompute/Tensor.hpp"
diff --git a/single_include/kompute/Kompute.hpp b/single_include/kompute/Kompute.hpp
index 812a6f980..85168a422 100755
--- a/single_include/kompute/Kompute.hpp
+++ b/single_include/kompute/Kompute.hpp
@@ -1,3 +1,14 @@
+
+#include <vulkan/vulkan.h>
+#include <vulkan/vulkan.hpp>
+
+// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
+#if DEBUG
+#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
+#endif
+
+#include <spdlog/spdlog.h>
+
 /*
     THIS FILE HAS BEEN AUTOMATICALLY GENERATED - DO NOT EDIT
 
@@ -139,48 +150,6 @@ static unsigned const int shaders_glsl_opmult_comp_spv_len = 1308;
 }
 #endif // define SHADEROP_SHADEROPMULT_HPP
 
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
-
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
-
-#include <string>
-
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
-
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
-
 #define KP_MAX_DIM_SIZE 1
 
 namespace kp {
@@ -421,26 +390,6 @@ class Manager
 
 #include <fstream>
 
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
-
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
-
 namespace kp {
 
 class Algorithm
@@ -710,16 +659,6 @@ OpMult<tX, tY, tZ>::postSubmit()
 
 #endif // #ifndef OPMULT_CPP
 
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
-
 namespace kp {
 
 class OpCreateTensor : public OpBase
diff --git a/src/include/kompute/Algorithm.hpp b/src/include/kompute/Algorithm.hpp
index 1dd50a27c..98f815dc6 100644
--- a/src/include/kompute/Algorithm.hpp
+++ b/src/include/kompute/Algorithm.hpp
@@ -1,14 +1,6 @@
 #pragma once
 
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
+#include "kompute/Core.hpp"
 
 #include "kompute/Tensor.hpp"
 
diff --git a/src/include/kompute/Core.hpp b/src/include/kompute/Core.hpp
new file mode 100644
index 000000000..b2615b53f
--- /dev/null
+++ b/src/include/kompute/Core.hpp
@@ -0,0 +1,12 @@
+
+#include <vulkan/vulkan.h>
+#include <vulkan/vulkan.hpp>
+
+// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
+#if DEBUG
+#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
+#endif
+
+#include <spdlog/spdlog.h>
+
+
diff --git a/src/include/kompute/Manager.hpp b/src/include/kompute/Manager.hpp
index 4ae61af98..9b788c291 100644
--- a/src/include/kompute/Manager.hpp
+++ b/src/include/kompute/Manager.hpp
@@ -1,14 +1,6 @@
 #pragma once
 
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
+#include "kompute/Core.hpp"
 
 #include "kompute/Sequence.hpp"
 
diff --git a/src/include/kompute/OpBase.hpp b/src/include/kompute/OpBase.hpp
index 599b43060..cb9357f2f 100644
--- a/src/include/kompute/OpBase.hpp
+++ b/src/include/kompute/OpBase.hpp
@@ -1,16 +1,6 @@
 #pragma once
 
-#include <string>
-
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
+#include "kompute/Core.hpp"
 
 #include "kompute/Tensor.hpp"
 
diff --git a/src/include/kompute/OpCreateTensor.hpp b/src/include/kompute/OpCreateTensor.hpp
index 16d79792f..3c3cf4597 100644
--- a/src/include/kompute/OpCreateTensor.hpp
+++ b/src/include/kompute/OpCreateTensor.hpp
@@ -1,14 +1,6 @@
 #pragma once
 
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
+#include "kompute/Core.hpp"
 
 #include "kompute/Tensor.hpp"
 
diff --git a/src/include/kompute/OpMult.hpp b/src/include/kompute/OpMult.hpp
index 7189ab772..b550c1a58 100644
--- a/src/include/kompute/OpMult.hpp
+++ b/src/include/kompute/OpMult.hpp
@@ -2,15 +2,7 @@
 
 #include <fstream>
 
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
+#include "kompute/Core.hpp"
 
 #include "kompute/shaders/shaderopmult.hpp"
 
diff --git a/src/include/kompute/Parameter.hpp b/src/include/kompute/Parameter.hpp
index 5e939310f..9f9d2af2c 100644
--- a/src/include/kompute/Parameter.hpp
+++ b/src/include/kompute/Parameter.hpp
@@ -1,14 +1,6 @@
 #pragma once
 
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
+#include "kompute/Core.hpp"
 
 #include "kompute/Tensor.hpp"
 
diff --git a/src/include/kompute/Sequence.hpp b/src/include/kompute/Sequence.hpp
index e426987ba..6a070ec1d 100644
--- a/src/include/kompute/Sequence.hpp
+++ b/src/include/kompute/Sequence.hpp
@@ -1,14 +1,6 @@
 #pragma once
 
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
+#include "kompute/Core.hpp"
 
 #include "kompute/OpBase.hpp"
 
diff --git a/src/include/kompute/Tensor.hpp b/src/include/kompute/Tensor.hpp
index cda6f6cab..5933e3476 100644
--- a/src/include/kompute/Tensor.hpp
+++ b/src/include/kompute/Tensor.hpp
@@ -1,14 +1,6 @@
 #pragma once
 
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan.hpp>
-
-// SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
-#if DEBUG
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
-#endif
-
-#include <spdlog/spdlog.h>
+#include "kompute/Core.hpp"
 
 #define KP_MAX_DIM_SIZE 1