diff --git a/samples/desktop/Tiny/Tiny_Mesh.cpp b/samples/desktop/Tiny/Tiny_Mesh.cpp
index 0e7685bcf7e..4d8aa7dfa29 100644
--- a/samples/desktop/Tiny/Tiny_Mesh.cpp
+++ b/samples/desktop/Tiny/Tiny_Mesh.cpp
@@ -28,7 +28,6 @@
 #endif
 #include <GLFW/glfw3native.h>
 #include <glm/ext.hpp>
-#include <glm/glm.hpp>
 #include <glm/gtc/random.hpp>
 #include <igl/FPSCounter.h>
 #include <igl/IGL.h>
diff --git a/shell/renderSessions/GPUStressSession.cpp b/shell/renderSessions/GPUStressSession.cpp
index 75c914961f4..4245ce7d14c 100644
--- a/shell/renderSessions/GPUStressSession.cpp
+++ b/shell/renderSessions/GPUStressSession.cpp
@@ -22,7 +22,6 @@
 #include <igl/NameHandle.h>
 #include <igl/ShaderCreator.h>
 #include <igl/opengl/GLIncludes.h>
-#include <math.h>
 #include <memory>
 #include <random>
 #include <shell/shared/platform/DisplayContext.h>
diff --git a/shell/renderSessions/HelloOpenXRSession.cpp b/shell/renderSessions/HelloOpenXRSession.cpp
index 551ceb8f275..5b559f27f50 100644
--- a/shell/renderSessions/HelloOpenXRSession.cpp
+++ b/shell/renderSessions/HelloOpenXRSession.cpp
@@ -17,7 +17,6 @@
 #include <igl/NameHandle.h>
 #include <igl/ShaderCreator.h>
 #include <igl/opengl/Device.h>
-#include <igl/opengl/GLIncludes.h>
 #include <igl/opengl/RenderCommandEncoder.h>
 #include <shell/renderSessions/HelloOpenXRSession.h>
 #include <shell/shared/renderSession/ShellParams.h>
diff --git a/shell/renderSessions/MRTSession.cpp b/shell/renderSessions/MRTSession.cpp
index f6056812c7e..4d84c4717a0 100644
--- a/shell/renderSessions/MRTSession.cpp
+++ b/shell/renderSessions/MRTSession.cpp
@@ -17,7 +17,6 @@
 #include <igl/ShaderCreator.h>
 #include <igl/VertexInputState.h>
 #include <igl/opengl/Device.h>
-#include <igl/opengl/GLIncludes.h>
 #include <shell/renderSessions/MRTSession.h>
 #include <shell/shared/renderSession/ShellParams.h>
 
diff --git a/src/igl/Device.cpp b/src/igl/Device.cpp
index 5465c358e41..25fb8c0021d 100644
--- a/src/igl/Device.cpp
+++ b/src/igl/Device.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <igl/Device.h>
-#include <igl/Shader.h>
 
 #include <algorithm>
 #include <utility>
diff --git a/src/igl/SamplerState.cpp b/src/igl/SamplerState.cpp
index a4d7af21e28..c3e0fd5f6c4 100644
--- a/src/igl/SamplerState.cpp
+++ b/src/igl/SamplerState.cpp
@@ -7,7 +7,6 @@
 
 #include <igl/SamplerState.h>
 
-#include <igl/Assert.h>
 #include <igl/Common.h>
 
 namespace igl {
diff --git a/src/igl/opengl/Device.cpp b/src/igl/opengl/Device.cpp
index 84a463f7995..7e0acca346e 100644
--- a/src/igl/opengl/Device.cpp
+++ b/src/igl/opengl/Device.cpp
@@ -20,7 +20,6 @@
 #include <igl/opengl/IContext.h>
 #include <igl/opengl/RenderPipelineState.h>
 #include <igl/opengl/SamplerState.h>
-#include <igl/opengl/Shader.h>
 #include <igl/opengl/TextureBuffer.h>
 #include <igl/opengl/TextureTarget.h>
 #include <igl/opengl/UniformBuffer.h>
diff --git a/src/igl/opengl/Framebuffer.cpp b/src/igl/opengl/Framebuffer.cpp
index 2d7e6ebeacc..27124d46384 100644
--- a/src/igl/opengl/Framebuffer.cpp
+++ b/src/igl/opengl/Framebuffer.cpp
@@ -9,7 +9,6 @@
 
 #include <cstdlib>
 #include <igl/RenderPass.h>
-#include <igl/opengl/CommandBuffer.h>
 #include <igl/opengl/Device.h>
 #include <igl/opengl/DummyTexture.h>
 #include <igl/opengl/Errors.h>
diff --git a/src/igl/opengl/IContext.cpp b/src/igl/opengl/IContext.cpp
index 037d7aef81c..39628dccd04 100644
--- a/src/igl/opengl/IContext.cpp
+++ b/src/igl/opengl/IContext.cpp
@@ -9,8 +9,6 @@
 #include <igl/opengl/IContext.h>
 
 #include <cstring>
-#include <igl/Assert.h>
-#include <igl/opengl/Errors.h>
 #include <igl/opengl/GLFunc.h>
 #include <igl/opengl/GLIncludes.h>
 #include <igl/opengl/Macros.h>
diff --git a/src/igl/opengl/VertexArrayObject.cpp b/src/igl/opengl/VertexArrayObject.cpp
index dbef081cfea..061fbcf9639 100644
--- a/src/igl/opengl/VertexArrayObject.cpp
+++ b/src/igl/opengl/VertexArrayObject.cpp
@@ -8,10 +8,7 @@
 #include <igl/opengl/VertexArrayObject.h>
 
 #include <cstdlib>
-#include <igl/opengl/Device.h>
-#include <igl/opengl/Errors.h>
 #include <string>
-#include <vector>
 
 namespace igl::opengl {
 
diff --git a/src/igl/opengl/egl/Context.cpp b/src/igl/opengl/egl/Context.cpp
index f3b62bb5d0a..a7c50d76d8f 100644
--- a/src/igl/opengl/egl/Context.cpp
+++ b/src/igl/opengl/egl/Context.cpp
@@ -10,10 +10,7 @@
 #include <igl/opengl/egl/Context.h>
 
 #include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <igl/opengl/ComputeCommandAdapter.h>
 #include <igl/opengl/HWDevice.h>
-#include <igl/opengl/RenderCommandAdapter.h>
 
 #include <cassert>
 #include <igl/Macros.h>
diff --git a/src/igl/tests/Backend.cpp b/src/igl/tests/Backend.cpp
index d5390e90643..147aa73f609 100644
--- a/src/igl/tests/Backend.cpp
+++ b/src/igl/tests/Backend.cpp
@@ -12,7 +12,6 @@
 #include "util/TestDevice.h"
 
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/NameHandle.h>
 #include <igl/Shader.h>
 #include <memory>
diff --git a/src/igl/tests/Blending.cpp b/src/igl/tests/Blending.cpp
index 57e85515b0c..3c99a977b63 100644
--- a/src/igl/tests/Blending.cpp
+++ b/src/igl/tests/Blending.cpp
@@ -13,7 +13,6 @@
 #include "util/TestDevice.h"
 
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/NameHandle.h>
 #include <string>
 
diff --git a/src/igl/tests/ComputeCommandEncoder.cpp b/src/igl/tests/ComputeCommandEncoder.cpp
index 69694c1374d..c029ea40d90 100644
--- a/src/igl/tests/ComputeCommandEncoder.cpp
+++ b/src/igl/tests/ComputeCommandEncoder.cpp
@@ -13,11 +13,7 @@
 #include <vector>
 
 #include "data/ShaderData.h"
-#include "data/TextureData.h"
-#include "data/VertexIndexData.h"
 #include "igl/Buffer.h"
-#include "igl/DepthStencilState.h"
-#include "igl/RenderPipelineState.h"
 #include "util/Common.h"
 
 namespace igl::tests {
diff --git a/src/igl/tests/Device.cpp b/src/igl/tests/Device.cpp
index 493ceb7a4cb..d5945b49e8d 100644
--- a/src/igl/tests/Device.cpp
+++ b/src/igl/tests/Device.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "data/ShaderData.h"
-#include "data/TextureData.h"
 #include "data/VertexIndexData.h"
 #include "util/Common.h"
 #include "util/TestDevice.h"
diff --git a/src/igl/tests/DeviceFeatureSet.cpp b/src/igl/tests/DeviceFeatureSet.cpp
index 357850c3c27..0691d09bf05 100644
--- a/src/igl/tests/DeviceFeatureSet.cpp
+++ b/src/igl/tests/DeviceFeatureSet.cpp
@@ -5,11 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "data/TextureData.h"
 #include "util/Common.h"
 #include "util/TestDevice.h"
 #if IGL_BACKEND_OPENGL
-#include <igl/opengl/GLIncludes.h>
 #include <igl/opengl/IContext.h>
 #include <igl/opengl/PlatformDevice.h>
 #endif // IGL_BACKEND_OPENGL
diff --git a/src/igl/tests/Framebuffer.cpp b/src/igl/tests/Framebuffer.cpp
index eb1a2d70e82..a56fd423e34 100644
--- a/src/igl/tests/Framebuffer.cpp
+++ b/src/igl/tests/Framebuffer.cpp
@@ -12,7 +12,6 @@
 #include "util/TestDevice.h"
 
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #if IGL_BACKEND_OPENGL
 #include <igl/opengl/IContext.h>
 #include <igl/opengl/PlatformDevice.h>
diff --git a/src/igl/tests/Multiview.cpp b/src/igl/tests/Multiview.cpp
index 23d340c5172..e249a9c5d4f 100644
--- a/src/igl/tests/Multiview.cpp
+++ b/src/igl/tests/Multiview.cpp
@@ -13,7 +13,6 @@
 #include <IGLU/managedUniformBuffer/ManagedUniformBuffer.h>
 #include <glm/glm.hpp>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <string>
 
 namespace igl::tests {
diff --git a/src/igl/tests/RenderCommandEncoder.cpp b/src/igl/tests/RenderCommandEncoder.cpp
index be8b1c6f10a..a38db516767 100644
--- a/src/igl/tests/RenderCommandEncoder.cpp
+++ b/src/igl/tests/RenderCommandEncoder.cpp
@@ -14,12 +14,10 @@
 
 #include "data/ShaderData.h"
 #include "data/TextureData.h"
-#include "data/VertexIndexData.h"
 #include "util/Common.h"
 
 #include <igl/Buffer.h>
 #include <igl/DepthStencilState.h>
-#include <igl/IGL.h>
 #include <igl/NameHandle.h>
 #include <igl/RenderPipelineState.h>
 
diff --git a/src/igl/tests/ShaderLibrary.cpp b/src/igl/tests/ShaderLibrary.cpp
index 9dcb4a92db4..d92d7c05a2e 100644
--- a/src/igl/tests/ShaderLibrary.cpp
+++ b/src/igl/tests/ShaderLibrary.cpp
@@ -9,7 +9,6 @@
 #include "util/Common.h"
 
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 
 namespace igl::tests {
 
diff --git a/src/igl/tests/ShaderModule.cpp b/src/igl/tests/ShaderModule.cpp
index 06338ed8aae..6c8bea9f341 100644
--- a/src/igl/tests/ShaderModule.cpp
+++ b/src/igl/tests/ShaderModule.cpp
@@ -9,7 +9,6 @@
 #include "util/Common.h"
 
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 
 namespace igl::tests {
 
diff --git a/src/igl/tests/TextureArray.cpp b/src/igl/tests/TextureArray.cpp
index 124226c6757..d81cc9d746c 100644
--- a/src/igl/tests/TextureArray.cpp
+++ b/src/igl/tests/TextureArray.cpp
@@ -15,10 +15,7 @@
 #include <IGLU/managedUniformBuffer/ManagedUniformBuffer.h>
 #include <array>
 #include <cstring>
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/NameHandle.h>
 #include <string>
 
diff --git a/src/igl/tests/TextureArrayFloat.cpp b/src/igl/tests/TextureArrayFloat.cpp
index b7e17d8394c..204f3a3a6d5 100644
--- a/src/igl/tests/TextureArrayFloat.cpp
+++ b/src/igl/tests/TextureArrayFloat.cpp
@@ -23,11 +23,8 @@
 #include <IGLU/managedUniformBuffer/ManagedUniformBuffer.h>
 #include <array>
 #include <cstring>
-#include <glm/glm.hpp>
 #include <glm/gtc/color_space.hpp>
-#include <glm/gtc/matrix_transform.hpp>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/NameHandle.h>
 #include <string>
 
diff --git a/src/igl/tests/TextureCube.cpp b/src/igl/tests/TextureCube.cpp
index a5c673c0547..d6997a5bb62 100644
--- a/src/igl/tests/TextureCube.cpp
+++ b/src/igl/tests/TextureCube.cpp
@@ -15,9 +15,7 @@
 #include <IGLU/managedUniformBuffer/ManagedUniformBuffer.h>
 #include <array>
 #include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/NameHandle.h>
 #include <string>
 
diff --git a/src/igl/tests/TextureFloat.cpp b/src/igl/tests/TextureFloat.cpp
index 52a10f8b714..15c87e93b47 100644
--- a/src/igl/tests/TextureFloat.cpp
+++ b/src/igl/tests/TextureFloat.cpp
@@ -16,11 +16,9 @@
 #include <IGLU/managedUniformBuffer/ManagedUniformBuffer.h>
 #include <array>
 #include <cstring>
-#include <glm/glm.hpp>
 #include <glm/gtc/color_space.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/NameHandle.h>
 #include <string>
 
diff --git a/src/igl/tests/TextureFormatProperties.cpp b/src/igl/tests/TextureFormatProperties.cpp
index c29a6f66a0d..06c722dc4a6 100644
--- a/src/igl/tests/TextureFormatProperties.cpp
+++ b/src/igl/tests/TextureFormatProperties.cpp
@@ -12,9 +12,7 @@
 #include "util/TestDevice.h"
 
 #include <cstddef>
-#include <cstring>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/NameHandle.h>
 #include <string>
 
diff --git a/src/igl/tests/TextureHalfFloat.cpp b/src/igl/tests/TextureHalfFloat.cpp
index 4fb226a35c7..1e7d38447a2 100644
--- a/src/igl/tests/TextureHalfFloat.cpp
+++ b/src/igl/tests/TextureHalfFloat.cpp
@@ -23,12 +23,9 @@
 #include <IGLU/managedUniformBuffer/ManagedUniformBuffer.h>
 #include <array>
 #include <cstring>
-#include <glm/glm.hpp>
 #include <glm/gtc/color_space.hpp>
-#include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/packing.hpp>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/Macros.h>
 #include <igl/NameHandle.h>
 #include <string>
diff --git a/src/igl/tests/TextureRangeDesc.cpp b/src/igl/tests/TextureRangeDesc.cpp
index 4a9a3e846ee..1d8d9c42c05 100644
--- a/src/igl/tests/TextureRangeDesc.cpp
+++ b/src/igl/tests/TextureRangeDesc.cpp
@@ -11,10 +11,7 @@
 #include "util/TestDevice.h"
 
 #include <cstddef>
-#include <cstring>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
-#include <igl/NameHandle.h>
 #include <string>
 
 namespace igl::tests {
diff --git a/src/igl/tests/TexturesRGB.cpp b/src/igl/tests/TexturesRGB.cpp
index 81e8508dba1..62450839cc2 100644
--- a/src/igl/tests/TexturesRGB.cpp
+++ b/src/igl/tests/TexturesRGB.cpp
@@ -13,7 +13,6 @@
 #include "util/TestDevice.h"
 
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/NameHandle.h>
 #include <string>
 
diff --git a/src/igl/tests/iglu/StatePool.cpp b/src/igl/tests/iglu/StatePool.cpp
index 3d7dab9491f..81d0e928c04 100644
--- a/src/igl/tests/iglu/StatePool.cpp
+++ b/src/igl/tests/iglu/StatePool.cpp
@@ -11,7 +11,6 @@
 
 #include <IGLU/state_pool/RenderPipelineStatePool.h>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/NameHandle.h>
 #include <string>
 
diff --git a/src/igl/tests/iglu/TextureAccessor.cpp b/src/igl/tests/iglu/TextureAccessor.cpp
index 81ecd62f135..8af501c5f2c 100644
--- a/src/igl/tests/iglu/TextureAccessor.cpp
+++ b/src/igl/tests/iglu/TextureAccessor.cpp
@@ -12,7 +12,6 @@
 #include <IGLU/texture_accessor/TextureAccessorFactory.h>
 #include <gtest/gtest.h>
 #include <igl/Common.h>
-#include <igl/IGL.h>
 #include <string>
 
 #define OFFSCREEN_TEX_HEIGHT 2
diff --git a/src/igl/tests/iglu/UniformCollection.cpp b/src/igl/tests/iglu/UniformCollection.cpp
index bb58b6bed3e..dfab2ad8ab4 100644
--- a/src/igl/tests/iglu/UniformCollection.cpp
+++ b/src/igl/tests/iglu/UniformCollection.cpp
@@ -13,7 +13,6 @@
 #include <IGLU/uniform/Collection.h>
 #include <IGLU/uniform/Descriptor.h>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <string>
 
 namespace iglu::tests {
diff --git a/src/igl/tests/iglu/UniformDescriptor.cpp b/src/igl/tests/iglu/UniformDescriptor.cpp
index 71759f55253..1f8d9d60e5c 100644
--- a/src/igl/tests/iglu/UniformDescriptor.cpp
+++ b/src/igl/tests/iglu/UniformDescriptor.cpp
@@ -13,7 +13,6 @@
 #include <IGLU/uniform/Collection.h>
 #include <IGLU/uniform/Descriptor.h>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <string>
 
 namespace iglu::tests {
diff --git a/src/igl/tests/iglu/texture_loader/StbHdrTextureLoaderTest.cpp b/src/igl/tests/iglu/texture_loader/StbHdrTextureLoaderTest.cpp
index 5c8318f78c1..1cbebd819a6 100644
--- a/src/igl/tests/iglu/texture_loader/StbHdrTextureLoaderTest.cpp
+++ b/src/igl/tests/iglu/texture_loader/StbHdrTextureLoaderTest.cpp
@@ -10,8 +10,6 @@
 #include <IGLU/texture_loader/stb_hdr/Header.h>
 #include <IGLU/texture_loader/stb_hdr/TextureLoaderFactory.h>
 #include <cstring>
-#include <igl/vulkan/util/TextureFormat.h>
-#include <vector>
 
 namespace igl::tests::stb::hdr {
 
diff --git a/src/igl/tests/iglu/texture_loader/StbJpegTextureLoaderTest.cpp b/src/igl/tests/iglu/texture_loader/StbJpegTextureLoaderTest.cpp
index 35ab4571c68..4c6c22b82db 100644
--- a/src/igl/tests/iglu/texture_loader/StbJpegTextureLoaderTest.cpp
+++ b/src/igl/tests/iglu/texture_loader/StbJpegTextureLoaderTest.cpp
@@ -10,7 +10,6 @@
 #include <IGLU/texture_loader/stb_jpeg/Header.h>
 #include <IGLU/texture_loader/stb_jpeg/TextureLoaderFactory.h>
 #include <cstring>
-#include <igl/vulkan/util/TextureFormat.h>
 #include <numeric>
 #include <vector>
 
diff --git a/src/igl/tests/iglu/texture_loader/StbPngTextureLoaderTest.cpp b/src/igl/tests/iglu/texture_loader/StbPngTextureLoaderTest.cpp
index e6d81317141..f4bfdf72969 100644
--- a/src/igl/tests/iglu/texture_loader/StbPngTextureLoaderTest.cpp
+++ b/src/igl/tests/iglu/texture_loader/StbPngTextureLoaderTest.cpp
@@ -10,7 +10,6 @@
 #include <IGLU/texture_loader/stb_png/Header.h>
 #include <IGLU/texture_loader/stb_png/TextureLoaderFactory.h>
 #include <cstring>
-#include <igl/vulkan/util/TextureFormat.h>
 #include <numeric>
 #include <vector>
 
diff --git a/src/igl/tests/ogl/DepthStencilState.cpp b/src/igl/tests/ogl/DepthStencilState.cpp
index 261ca44ff8e..610363e5e5e 100644
--- a/src/igl/tests/ogl/DepthStencilState.cpp
+++ b/src/igl/tests/ogl/DepthStencilState.cpp
@@ -10,7 +10,6 @@
 #include "../util/Common.h"
 
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/opengl/DepthStencilState.h>
 #include <string>
 
diff --git a/src/igl/tests/ogl/HWDevice.cpp b/src/igl/tests/ogl/HWDevice.cpp
index 3d267e647e4..82d49dcd63c 100644
--- a/src/igl/tests/ogl/HWDevice.cpp
+++ b/src/igl/tests/ogl/HWDevice.cpp
@@ -8,7 +8,6 @@
 #include "../util/Common.h"
 
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/tests/util/device/opengl/TestDevice.h>
 
 #if IGL_PLATFORM_IOS
diff --git a/src/igl/tests/ogl/PipelineState.cpp b/src/igl/tests/ogl/PipelineState.cpp
index e8edeb611c4..453ae9f5a40 100644
--- a/src/igl/tests/ogl/PipelineState.cpp
+++ b/src/igl/tests/ogl/PipelineState.cpp
@@ -6,11 +6,9 @@
  */
 
 #include "../data/ShaderData.h"
-#include "../data/VertexIndexData.h"
 #include "../util/Common.h"
 
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/opengl/RenderPipelineState.h>
 #include <utility>
 
diff --git a/src/igl/tests/ogl/PlatformDevice.cpp b/src/igl/tests/ogl/PlatformDevice.cpp
index 152a0ebc853..8a182938d96 100644
--- a/src/igl/tests/ogl/PlatformDevice.cpp
+++ b/src/igl/tests/ogl/PlatformDevice.cpp
@@ -9,7 +9,6 @@
 #include "../util/TestDevice.h"
 
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/opengl/PlatformDevice.h>
 #if IGL_PLATFORM_IOS
 #include <igl/opengl/ios/PlatformDevice.h>
diff --git a/src/igl/tests/ogl/RenderPipelineReflection.cpp b/src/igl/tests/ogl/RenderPipelineReflection.cpp
index 823f8a8b738..cf6681e5ccd 100644
--- a/src/igl/tests/ogl/RenderPipelineReflection.cpp
+++ b/src/igl/tests/ogl/RenderPipelineReflection.cpp
@@ -9,7 +9,6 @@
 #include "../util/Common.h"
 
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/opengl/Device.h>
 #include <igl/opengl/RenderPipelineReflection.h>
 
diff --git a/src/igl/tests/ogl/TextureTarget.cpp b/src/igl/tests/ogl/TextureTarget.cpp
index 8c98b82e965..23fd068d5d1 100644
--- a/src/igl/tests/ogl/TextureTarget.cpp
+++ b/src/igl/tests/ogl/TextureTarget.cpp
@@ -9,7 +9,6 @@
 
 #include <gtest/gtest.h>
 #include <igl/IGL.h>
-#include <igl/opengl/CommandQueue.h>
 #include <igl/opengl/Device.h>
 #include <igl/opengl/TextureTarget.h>
 #include <string>
diff --git a/src/igl/tests/ogl/UniformBuffer.cpp b/src/igl/tests/ogl/UniformBuffer.cpp
index 6077dfe0afd..af819998e87 100644
--- a/src/igl/tests/ogl/UniformBuffer.cpp
+++ b/src/igl/tests/ogl/UniformBuffer.cpp
@@ -13,7 +13,6 @@
 
 #include <array>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <igl/NameHandle.h>
 #include <igl/opengl/PlatformDevice.h>
 #include <string>
diff --git a/src/igl/tests/util/TestErrorGuard.cpp b/src/igl/tests/util/TestErrorGuard.cpp
index eb60b7fb7c5..3e23628862a 100644
--- a/src/igl/tests/util/TestErrorGuard.cpp
+++ b/src/igl/tests/util/TestErrorGuard.cpp
@@ -10,7 +10,6 @@
 #include <cstdarg>
 #include <cstdio>
 #include <gtest/gtest.h>
-#include <igl/IGL.h>
 #include <string>
 
 igl::tests::util::TestErrorGuard::TestErrorGuard() {
diff --git a/src/igl/tests/vulkan/CommonTest.cpp b/src/igl/tests/vulkan/CommonTest.cpp
index e8db2c66586..89131b5e688 100644
--- a/src/igl/tests/vulkan/CommonTest.cpp
+++ b/src/igl/tests/vulkan/CommonTest.cpp
@@ -16,10 +16,6 @@
 
 #include <igl/tests/util/device/TestDevice.h>
 
-#ifdef __ANDROID__
-#include <vulkan/vulkan_android.h>
-#endif
-
 #if IGL_PLATFORM_WINDOWS || IGL_PLATFORM_ANDROID || IGL_PLATFORM_LINUX
 namespace igl::tests {
 
diff --git a/src/igl/tests/vulkan/EnhancedShaderDebuggingStoreTest.cpp b/src/igl/tests/vulkan/EnhancedShaderDebuggingStoreTest.cpp
index 3cb2d209dc5..52427df5057 100644
--- a/src/igl/tests/vulkan/EnhancedShaderDebuggingStoreTest.cpp
+++ b/src/igl/tests/vulkan/EnhancedShaderDebuggingStoreTest.cpp
@@ -9,16 +9,13 @@
 #include <igl/IGL.h>
 
 #include "../data/ShaderData.h"
-#include "../data/TextureData.h"
 #include "../data/VertexIndexData.h"
 #include "../util/Common.h"
-#include "../util/TestDevice.h"
 
 #if IGL_PLATFORM_WINDOWS || IGL_PLATFORM_ANDROID || IGL_PLATFORM_MACOSX || IGL_PLATFORM_LINUX
 #include <igl/vulkan/CommandBuffer.h>
 #include <igl/vulkan/Device.h>
 #include <igl/vulkan/EnhancedShaderDebuggingStore.h>
-#include <igl/vulkan/HWDevice.h>
 #include <igl/vulkan/VulkanContext.h>
 #include <igl/vulkan/VulkanFeatures.h>
 #endif
diff --git a/src/igl/tests/vulkan/RenderPipelineStateTest.cpp b/src/igl/tests/vulkan/RenderPipelineStateTest.cpp
index 3c33a354584..71bfa929a69 100644
--- a/src/igl/tests/vulkan/RenderPipelineStateTest.cpp
+++ b/src/igl/tests/vulkan/RenderPipelineStateTest.cpp
@@ -8,18 +8,14 @@
 #include <gtest/gtest.h>
 #include <igl/ShaderCreator.h>
 #include <igl/vulkan/CommandBuffer.h>
-#include <igl/vulkan/Common.h>
 #include <igl/vulkan/Device.h>
 #include <igl/vulkan/RenderPipelineState.h>
 #include <igl/vulkan/Texture.h>
 #include <igl/vulkan/VulkanContext.h>
-#include <igl/vulkan/VulkanImage.h>
-#include <igl/vulkan/VulkanTexture.h>
 
 #include <igl/tests/util/device/TestDevice.h>
 
 #ifdef __ANDROID__
-#include <vulkan/vulkan_android.h>
 #endif
 
 #if IGL_PLATFORM_WINDOWS || IGL_PLATFORM_ANDROID || IGL_PLATFORM_LINUX
diff --git a/src/igl/tests/vulkan/VulkanFeaturesTest.cpp b/src/igl/tests/vulkan/VulkanFeaturesTest.cpp
index 83424ac571f..436b4b41882 100644
--- a/src/igl/tests/vulkan/VulkanFeaturesTest.cpp
+++ b/src/igl/tests/vulkan/VulkanFeaturesTest.cpp
@@ -10,10 +10,6 @@
 #include <igl/vulkan/VulkanFeatures.h>
 #include <vulkan/vulkan_core.h>
 
-#ifdef __ANDROID__
-#include <vulkan/vulkan_android.h>
-#endif
-
 namespace igl::tests {
 
 //
diff --git a/src/igl/tests/vulkan/VulkanHelpersTest.cpp b/src/igl/tests/vulkan/VulkanHelpersTest.cpp
index 04b823a5ead..649e9b7e370 100644
--- a/src/igl/tests/vulkan/VulkanHelpersTest.cpp
+++ b/src/igl/tests/vulkan/VulkanHelpersTest.cpp
@@ -11,10 +11,6 @@
 #include <string>
 #include <vulkan/vulkan_core.h>
 
-#ifdef __ANDROID__
-#include <vulkan/vulkan_android.h>
-#endif
-
 namespace igl::tests {
 
 //
diff --git a/src/igl/tests/vulkan/VulkanImageTest.cpp b/src/igl/tests/vulkan/VulkanImageTest.cpp
index 5b60c0803a4..05d9df280c8 100644
--- a/src/igl/tests/vulkan/VulkanImageTest.cpp
+++ b/src/igl/tests/vulkan/VulkanImageTest.cpp
@@ -9,17 +9,12 @@
 #include <gtest/gtest.h>
 #include <igl/vulkan/Common.h>
 #include <igl/vulkan/Device.h>
-#include <igl/vulkan/HWDevice.h>
 #include <igl/vulkan/VulkanContext.h>
 #include <igl/vulkan/VulkanImage.h>
 #include <memory>
 
 #include <igl/tests/util/device/TestDevice.h>
 
-#ifdef __ANDROID__
-#include <vulkan/vulkan_android.h>
-#endif
-
 #if IGL_PLATFORM_WINDOWS || IGL_PLATFORM_ANDROID || IGL_PLATFORM_LINUX
 
 namespace igl::tests {
diff --git a/src/igl/vulkan/VulkanContext.cpp b/src/igl/vulkan/VulkanContext.cpp
index ab3e2404afa..655b0ce1bb3 100644
--- a/src/igl/vulkan/VulkanContext.cpp
+++ b/src/igl/vulkan/VulkanContext.cpp
@@ -13,8 +13,6 @@
 #include <utility>
 #include <vector>
 
-#include <igl/IGLSafeC.h>
-
 // For vk_mem_alloc.h, define this before including VulkanContext.h in exactly
 // one CPP file
 #if defined(IGL_CMAKE_BUILD)
@@ -42,7 +40,6 @@
 #include <igl/vulkan/VulkanExtensions.h>
 #include <igl/vulkan/VulkanImageView.h>
 #include <igl/vulkan/VulkanPipelineBuilder.h>
-#include <igl/vulkan/VulkanSemaphore.h>
 #include <igl/vulkan/VulkanSwapchain.h>
 #include <igl/vulkan/VulkanTexture.h>
 #include <igl/vulkan/VulkanVma.h>