diff --git a/src/BC1/BC1Decoder.cpp b/src/BC1/BC1Decoder.cpp
index 862bf1d..860c734 100644
--- a/src/BC1/BC1Decoder.cpp
+++ b/src/BC1/BC1Decoder.cpp
@@ -19,8 +19,14 @@
 
 #include "BC1Decoder.h"
 
+#include <assert.h>
+#include <stdint.h>
+#include <array>
 #include "../ColorBlock.h"
 #include "../blocks.h"
+#include "../Color.h"
+#include "../interpolator.h"
+#include "../ndebug.h"
 
 namespace rgbcx {
 void BC1Decoder::DecodeBlock(Color4x4 dest, BC1Block *const block) const noexcept(ndebug) {
diff --git a/src/BC1/BC1Decoder.h b/src/BC1/BC1Decoder.h
index 836ad89..741cd26 100644
--- a/src/BC1/BC1Decoder.h
+++ b/src/BC1/BC1Decoder.h
@@ -23,6 +23,7 @@
 #include "../blocks.h"
 #include "../interpolator.h"
 #include "../ndebug.h"
+#include "../ColorBlock.h"
 
 namespace rgbcx {
 class BC1Decoder final : public BlockDecoder<BC1Block, 4, 4> {
diff --git a/src/BC3/BC3Decoder.cpp b/src/BC3/BC3Decoder.cpp
index a25bf6c..c343eb6 100644
--- a/src/BC3/BC3Decoder.cpp
+++ b/src/BC3/BC3Decoder.cpp
@@ -19,8 +19,11 @@
 
 #include "BC3Decoder.h"
 
+#include "../BC1/BC1Decoder.h"
+#include "../BC4/BC4Decoder.h"
 #include "../ColorBlock.h"
 #include "../blocks.h"
+#include "../ndebug.h"
 
 namespace rgbcx {
 
diff --git a/src/BC3/BC3Decoder.h b/src/BC3/BC3Decoder.h
index c0e1907..1520fc7 100644
--- a/src/BC3/BC3Decoder.h
+++ b/src/BC3/BC3Decoder.h
@@ -22,6 +22,7 @@
 #include "../BC1/BC1Decoder.h"
 #include "../BC4/BC4Decoder.h"
 #include "../BlockDecoder.h"
+#include "../ColorBlock.h"
 #include "../blocks.h"
 #include "../interpolator.h"
 #include "../ndebug.h"
diff --git a/src/BC4/BC4Decoder.cpp b/src/BC4/BC4Decoder.cpp
index d285373..730ce79 100644
--- a/src/BC4/BC4Decoder.cpp
+++ b/src/BC4/BC4Decoder.cpp
@@ -19,8 +19,14 @@
 
 #include "BC4Decoder.h"
 
-#include "../ColorBlock.h"
-#include "../blocks.h"
+#include <assert.h>  // for assert
+
+#include <array>  // for array
+
+#include "../Color.h"       // for Color
+#include "../ColorBlock.h"  // for ColorBlock
+#include "../blocks.h"      // for BC4Block
+#include "../ndebug.h"      // for ndebug
 
 void rgbcx::BC4Decoder::DecodeBlock(Color4x4 dest, BC4Block *const block, size_t channel) const noexcept(ndebug) {
     auto l = block->GetLowAlpha();
diff --git a/src/BC4/BC4Decoder.h b/src/BC4/BC4Decoder.h
index b162958..7009aa9 100644
--- a/src/BC4/BC4Decoder.h
+++ b/src/BC4/BC4Decoder.h
@@ -19,9 +19,11 @@
 
 #pragma once
 
+#include <stddef.h>
+
 #include "../BlockDecoder.h"
+#include "../ColorBlock.h"
 #include "../blocks.h"
-#include "../interpolator.h"
 #include "../ndebug.h"
 
 namespace rgbcx {
diff --git a/src/BC5/BC5Decoder.cpp b/src/BC5/BC5Decoder.cpp
index e343b53..75310d5 100644
--- a/src/BC5/BC5Decoder.cpp
+++ b/src/BC5/BC5Decoder.cpp
@@ -19,8 +19,10 @@
 
 #include "BC5Decoder.h"
 
+#include "../BC4/BC4Decoder.h"
 #include "../ColorBlock.h"
 #include "../blocks.h"
+#include "../ndebug.h"
 
 namespace rgbcx {
 
diff --git a/src/BC5/BC5Decoder.h b/src/BC5/BC5Decoder.h
index 9b9faea..7da6579 100644
--- a/src/BC5/BC5Decoder.h
+++ b/src/BC5/BC5Decoder.h
@@ -19,12 +19,13 @@
 
 #pragma once
 
-#include "../BC1/BC1Decoder.h"
+#include <stddef.h>
+
 #include "../BC4/BC4Decoder.h"
 #include "../BlockDecoder.h"
-#include "../blocks.h"
-#include "../interpolator.h"
+#include "../ColorBlock.h"
 #include "../ndebug.h"
+#include "../blocks.h"
 
 namespace rgbcx {
 class BC5Decoder : public BlockDecoder<BC5Block, 4, 4> {
diff --git a/src/Color.cpp b/src/Color.cpp
index d51065e..745feba 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -19,10 +19,9 @@
 
 #include "Color.h"
 
-#include <algorithm>
-#include <cassert>
+#include <algorithm>  // for max, min
 
-#include "util.h"
+#include "util.h"  // for scale5To8, scale8To5, Assert5Bit, scale6To8
 
 // region Color implementation
 Color::Color() { SetRGBA(0, 0, 0, 0xFF); }
diff --git a/src/Color.h b/src/Color.h
index 312a10b..1ffa8a4 100644
--- a/src/Color.h
+++ b/src/Color.h
@@ -18,8 +18,10 @@
  */
 
 #pragma once
-#include <array>
-#include <cstdint>
+#include <assert.h>  // for assert
+#include <stddef.h>  // for size_t
+
+#include <cstdint>  // for uint8_t, uint16_t
 
 #pragma pack(push, 1)
 class Color {
diff --git a/src/interpolator.h b/src/interpolator.h
index b2c8000..5469659 100644
--- a/src/interpolator.h
+++ b/src/interpolator.h
@@ -18,14 +18,11 @@
  */
 
 #pragma once
-#include <array>
-#include <cassert>
-#include <cstdint>
-#include <memory>
-
-#include "Color.h"
-#include "ndebug.h"
-#include "util.h"
+#include <array>    // for array
+#include <cstdint>  // for uint8_t, uint16_t
+#include <memory>   // for unique_ptr
+
+#include "Color.h"  // for Color
 
 namespace rgbcx {
 
diff --git a/src/test/bc7enc.c b/src/test/bc7enc.c
index 87a8559..d2deb43 100644
--- a/src/test/bc7enc.c
+++ b/src/test/bc7enc.c
@@ -1,6 +1,8 @@
 // File: bc7enc.c - Richard Geldreich, Jr. 3/31/2020 - MIT license or public domain (see end of file)
 // Currently supports modes 1, 6 for RGB blocks, and modes 5, 6, 7 for RGBA blocks.
 // NOTE: This module is still a work in progress as of 3/31/2020. It needs to support more modes for RGB content.
+#pragma GCC diagnostic ignored "-Weverything"
+
 #include "bc7enc.h"
 #include <math.h>
 #include <memory.h>