diff --git a/examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp b/examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
index 7912b3c49..349e5eca4 100644
--- a/examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
+++ b/examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
@@ -6,7 +6,7 @@
 #include "../ImportObjDemo/Wavefront2GLInstanceGraphicsShape.h"
 #include "../../Utils/b3ResourcePath.h"
 #include "Bullet3Common/b3FileUtils.h"
-#include "../../ThirdPartyLibs/stb_image/stb_image.h"
+#include "stb_image/stb_image.h"
 #include "../ImportObjDemo/LoadMeshFromObj.h"
 bool b3ImportMeshUtility::loadAndRegisterMeshFromFileInternal(const std::string& fileName, b3ImportMeshData& meshData)
 {
diff --git a/examples/OpenGLWindow/CMakeLists.txt b/examples/OpenGLWindow/CMakeLists.txt
index 55b53b053..5d1f37d9b 100644
--- a/examples/OpenGLWindow/CMakeLists.txt
+++ b/examples/OpenGLWindow/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 INCLUDE_DIRECTORIES(
 	..
+	../ThirdPartyLibs
 	../../src
 )
 
diff --git a/examples/OpenGLWindow/GLInstancingRenderer.cpp b/examples/OpenGLWindow/GLInstancingRenderer.cpp
index b73b9c823..c7fffa36b 100644
--- a/examples/OpenGLWindow/GLInstancingRenderer.cpp
+++ b/examples/OpenGLWindow/GLInstancingRenderer.cpp
@@ -1406,7 +1406,7 @@ void GLInstancingRenderer::updateCamera(int upAxis)
 
 
 //#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "stb_image/stb_image_write.h"
 void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName, int numComponents)
 {
 
diff --git a/examples/OpenGLWindow/SimpleOpenGL3App.cpp b/examples/OpenGLWindow/SimpleOpenGL3App.cpp
index e4475f535..c37e10db6 100644
--- a/examples/OpenGLWindow/SimpleOpenGL3App.cpp
+++ b/examples/OpenGLWindow/SimpleOpenGL3App.cpp
@@ -919,7 +919,7 @@ void SimpleOpenGL3App::getScreenPixels(unsigned char* rgbaBuffer, int bufferSize
 }
 
 //#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "stb_image/stb_image_write.h"
 static void writeTextureToFile(int textureWidth, int textureHeight, const char* fileName, FILE* ffmpegVideo)
 {
 	int numComponents = 4;
diff --git a/examples/OpenGLWindow/fontstash.cpp b/examples/OpenGLWindow/fontstash.cpp
index 3cd6df848..518b320e0 100644
--- a/examples/OpenGLWindow/fontstash.cpp
+++ b/examples/OpenGLWindow/fontstash.cpp
@@ -37,7 +37,7 @@
 #define STB_TRUETYPE_IMPLEMENTATION
 #define STBTT_malloc(x,u)    malloc(x)
 #define STBTT_free(x,u)      free(x)
-#include "stb_truetype.h"
+#include "stb_image/stb_truetype.h"
 
 #define HASH_LUT_SIZE 256
 
diff --git a/examples/OpenGLWindow/opengl_fontstashcallbacks.cpp b/examples/OpenGLWindow/opengl_fontstashcallbacks.cpp
index 90e4bebca..ba67c064d 100644
--- a/examples/OpenGLWindow/opengl_fontstashcallbacks.cpp
+++ b/examples/OpenGLWindow/opengl_fontstashcallbacks.cpp
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "stb_image/stb_image_write.h"
 
 
 static unsigned int s_indexData[INDEX_COUNT];
diff --git a/examples/OpenGLWindow/premake4.lua b/examples/OpenGLWindow/premake4.lua
index 6328c418b..17dfdda09 100644
--- a/examples/OpenGLWindow/premake4.lua
+++ b/examples/OpenGLWindow/premake4.lua
@@ -9,7 +9,7 @@
 		initGlew()
 
 		includedirs {
-		 	
+		 	"../ThirdPartyLibs",
 		 	"../../src",
 		}
 		
diff --git a/examples/SharedMemory/TinyRendererVisualShapeConverter.cpp b/examples/SharedMemory/TinyRendererVisualShapeConverter.cpp
index c8b1b2221..f18becf58 100644
--- a/examples/SharedMemory/TinyRendererVisualShapeConverter.cpp
+++ b/examples/SharedMemory/TinyRendererVisualShapeConverter.cpp
@@ -34,7 +34,7 @@ subject to the following restrictions:
 #include "../Importers/ImportURDFDemo/UrdfParser.h"
 #include "../SharedMemory/SharedMemoryPublic.h"//for b3VisualShapeData
 #include "../TinyRenderer/model.h"
-#include "../ThirdPartyLibs/stb_image/stb_image.h"
+#include "stb_image/stb_image.h"
 
 struct MyTexture2
 {
diff --git a/examples/OpenGLWindow/stb_image_write.h b/examples/ThirdPartyLibs/stb_image/stb_image_write.h
similarity index 100%
rename from examples/OpenGLWindow/stb_image_write.h
rename to examples/ThirdPartyLibs/stb_image/stb_image_write.h
diff --git a/examples/OpenGLWindow/stb_truetype.h b/examples/ThirdPartyLibs/stb_image/stb_truetype.h
similarity index 100%
rename from examples/OpenGLWindow/stb_truetype.h
rename to examples/ThirdPartyLibs/stb_image/stb_truetype.h
diff --git a/test/InverseDynamics/CMakeLists.txt b/test/InverseDynamics/CMakeLists.txt
index 217655b09..eb9ccae4a 100644
--- a/test/InverseDynamics/CMakeLists.txt
+++ b/test/InverseDynamics/CMakeLists.txt
@@ -37,6 +37,7 @@ INCLUDE_DIRECTORIES(
         ../../src
         ../gtest-1.7.0/include
         ../../Extras/InverseDynamics
+        ../../examples/ThirdPartyLibs
 )
 
 
diff --git a/test/InverseDynamics/premake4.lua b/test/InverseDynamics/premake4.lua
index 1892a0206..b87ecc573 100644
--- a/test/InverseDynamics/premake4.lua
+++ b/test/InverseDynamics/premake4.lua
@@ -85,8 +85,8 @@
                 "../../examples/InverseDynamics",
                 "../../examples/ThirdPartyLibs",
                 "../../Extras/InverseDynamics",
-                "../gtest-1.7.0/include"
-
+                "../gtest-1.7.0/include",
+                "../../examples/ThirdPartyLibs",
         }