diff --git a/Source/stb_image.h b/Source/ThirdParty/stb_image.h
similarity index 100%
rename from Source/stb_image.h
rename to Source/ThirdParty/stb_image.h
diff --git a/Source/stb_image_write.h b/Source/ThirdParty/stb_image_write.h
similarity index 100%
rename from Source/stb_image_write.h
rename to Source/ThirdParty/stb_image_write.h
diff --git a/Source/tinyexr.h b/Source/ThirdParty/tinyexr.h
similarity index 100%
rename from Source/tinyexr.h
rename to Source/ThirdParty/tinyexr.h
diff --git a/Source/astcenccli_image_external.cpp b/Source/astcenccli_image_external.cpp
index 0c81b8f6c..e41b9abfe 100644
--- a/Source/astcenccli_image_external.cpp
+++ b/Source/astcenccli_image_external.cpp
@@ -66,9 +66,9 @@ static void astcenc_runtime_assert(bool condition)
     }
 }
 
-#include "stb_image.h"
-#include "stb_image_write.h"
-#include "tinyexr.h"
+#include "ThirdParty/stb_image.h"
+#include "ThirdParty/stb_image_write.h"
+#include "ThirdParty/tinyexr.h"
 
 /**
  * @brief Load an image using Wuffs to provide the loader.
diff --git a/Source/astcenccli_image_load_store.cpp b/Source/astcenccli_image_load_store.cpp
index 4076466ac..41ac4de9f 100644
--- a/Source/astcenccli_image_load_store.cpp
+++ b/Source/astcenccli_image_load_store.cpp
@@ -30,9 +30,9 @@
 
 #include "astcenccli_internal.h"
 
-#include "stb_image.h"
-#include "stb_image_write.h"
-#include "tinyexr.h"
+#include "ThirdParty/stb_image.h"
+#include "ThirdParty/stb_image_write.h"
+#include "ThirdParty/tinyexr.h"
 
 /**
  * @brief Determine the output file name to use for a sliced image write.
diff --git a/Utils/Example/astc_api_example.cpp b/Utils/Example/astc_api_example.cpp
index 7e95f7c86..4990cfb9d 100644
--- a/Utils/Example/astc_api_example.cpp
+++ b/Utils/Example/astc_api_example.cpp
@@ -32,10 +32,10 @@
 #include "astcenc.h"
 
 #define STB_IMAGE_IMPLEMENTATION
-#include "stb_image.h"
+#include "ThirdParty/stb_image.h"
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "ThirdParty/stb_image_write.h"
 
 int main(int argc, char **argv)
 {
diff --git a/Utils/astc_blend_test.cpp b/Utils/astc_blend_test.cpp
index 67d27c3d9..3806189c7 100644
--- a/Utils/astc_blend_test.cpp
+++ b/Utils/astc_blend_test.cpp
@@ -24,10 +24,10 @@
 #include "astcenc_mathlib.h"
 
 #define STB_IMAGE_IMPLEMENTATION
-#include "stb_image.h"
+#include "ThirdParty/stb_image.h"
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "ThirdParty/stb_image_write.h"
 
 /**
  * @brief Linearize an sRGB value.
@@ -165,10 +165,10 @@ int main(int argc, char **argv)
 				float g_dst = 1.0f;
 				float b_dst = 0.8f;
 
-				float r_out; 
-				float g_out; 
-				float b_out; 
-				float a_out; 
+				float r_out;
+				float g_out;
+				float b_out;
+				float a_out;
 
 				// Post-multiply blending
 				if (use_post_blend)
@@ -241,10 +241,10 @@ int main(int argc, char **argv)
 				float g_dst = 1.0f;
 				float b_dst = 0.8f;
 
-				float r_out; 
-				float g_out; 
-				float b_out; 
-				float a_out; 
+				float r_out;
+				float g_out;
+				float b_out;
+				float a_out;
 
 				// Post-multiply blending
 				if (use_post_blend)
diff --git a/Utils/astc_rgbm_codec.cpp b/Utils/astc_rgbm_codec.cpp
index 3cad92f1a..6d2760ce6 100644
--- a/Utils/astc_rgbm_codec.cpp
+++ b/Utils/astc_rgbm_codec.cpp
@@ -24,10 +24,10 @@
 #include "astcenc_mathlib.h"
 
 #define STB_IMAGE_IMPLEMENTATION
-#include "stb_image.h"
+#include "ThirdParty/stb_image.h"
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "ThirdParty/stb_image_write.h"
 
 #define MODE_ENCODE 0
 #define MODE_DECODE 1
diff --git a/Utils/astc_test_autoextract.cpp b/Utils/astc_test_autoextract.cpp
index 1d401b722..65758125e 100644
--- a/Utils/astc_test_autoextract.cpp
+++ b/Utils/astc_test_autoextract.cpp
@@ -43,10 +43,10 @@
 #include <stdlib.h>
 
 #define STB_IMAGE_IMPLEMENTATION
-#include "stb_image.h"
+#include "ThirdParty/stb_image.h"
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "ThirdParty/stb_image_write.h"
 
 /**
  * @brief Compute the array offset in a 2D image
diff --git a/Utils/astc_test_autoextract_hdr.cpp b/Utils/astc_test_autoextract_hdr.cpp
index 83474b505..a5d776165 100644
--- a/Utils/astc_test_autoextract_hdr.cpp
+++ b/Utils/astc_test_autoextract_hdr.cpp
@@ -43,10 +43,10 @@
 #include <stdlib.h>
 
 #define STB_IMAGE_IMPLEMENTATION
-#include "stb_image.h"
+#include "ThirdParty/stb_image.h"
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "ThirdParty/stb_image_write.h"
 
 /**
  * @brief Compute the array offset in a 2D image