diff --git a/examples/00-helloworld/helloworld.cpp b/examples/00-helloworld/helloworld.cpp
index 03d64e0bb..b1f762ea7 100644
--- a/examples/00-helloworld/helloworld.cpp
+++ b/examples/00-helloworld/helloworld.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "common.h"
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/uint32_t.h>
 #include "logo.h"
 
diff --git a/examples/02-metaballs/metaballs.cpp b/examples/02-metaballs/metaballs.cpp
index b7dc4654d..105f81172 100644
--- a/examples/02-metaballs/metaballs.cpp
+++ b/examples/02-metaballs/metaballs.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "common.h"
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 // embedded shaders
 #include "vs_metaballs.bin.h"
diff --git a/examples/10-font/font.cpp b/examples/10-font/font.cpp
index 7b8166353..660ff2998 100644
--- a/examples/10-font/font.cpp
+++ b/examples/10-font/font.cpp
@@ -5,7 +5,7 @@
 
 #include "common.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/string.h>
 #include <bx/fpumath.h>
diff --git a/examples/11-fontsdf/fontsdf.cpp b/examples/11-fontsdf/fontsdf.cpp
index f74c38858..d54d4756c 100644
--- a/examples/11-fontsdf/fontsdf.cpp
+++ b/examples/11-fontsdf/fontsdf.cpp
@@ -6,7 +6,7 @@
 #include "common.h"
 #include "bgfx_utils.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/fpumath.h>
 
diff --git a/examples/13-stencil/stencil.cpp b/examples/13-stencil/stencil.cpp
index 2551306e7..7a1e90d28 100644
--- a/examples/13-stencil/stencil.cpp
+++ b/examples/13-stencil/stencil.cpp
@@ -9,7 +9,7 @@
 #include "common.h"
 #include "bgfx_utils.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/readerwriter.h>
 #include <bx/fpumath.h>
diff --git a/examples/14-shadowvolumes/shadowvolumes.cpp b/examples/14-shadowvolumes/shadowvolumes.cpp
index 1ab279cc5..17a19ab56 100644
--- a/examples/14-shadowvolumes/shadowvolumes.cpp
+++ b/examples/14-shadowvolumes/shadowvolumes.cpp
@@ -19,7 +19,7 @@ using namespace std::tr1;
 #include "common.h"
 #include "bgfx_utils.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/readerwriter.h>
 #include <bx/allocator.h>
diff --git a/examples/15-shadowmaps-simple/shadowmaps_simple.cpp b/examples/15-shadowmaps-simple/shadowmaps_simple.cpp
index c361c8601..13d86afb7 100644
--- a/examples/15-shadowmaps-simple/shadowmaps_simple.cpp
+++ b/examples/15-shadowmaps-simple/shadowmaps_simple.cpp
@@ -9,7 +9,7 @@
 
 #include "common.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/readerwriter.h>
 #include <bx/fpumath.h>
diff --git a/examples/16-shadowmaps/shadowmaps.cpp b/examples/16-shadowmaps/shadowmaps.cpp
index ad0dbc26d..34ce52c36 100644
--- a/examples/16-shadowmaps/shadowmaps.cpp
+++ b/examples/16-shadowmaps/shadowmaps.cpp
@@ -10,7 +10,7 @@
 #include "common.h"
 #include "bgfx_utils.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/readerwriter.h>
 #include <bx/fpumath.h>
diff --git a/examples/17-drawstress/drawstress.cpp b/examples/17-drawstress/drawstress.cpp
index de08f68b3..b8171a3eb 100644
--- a/examples/17-drawstress/drawstress.cpp
+++ b/examples/17-drawstress/drawstress.cpp
@@ -3,7 +3,7 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/uint32_t.h>
 
 #include "common.h"
diff --git a/examples/20-nanovg/nanovg.cpp b/examples/20-nanovg/nanovg.cpp
index c505b8425..2f4060a40 100644
--- a/examples/20-nanovg/nanovg.cpp
+++ b/examples/20-nanovg/nanovg.cpp
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/string.h>
 #include <bx/timer.h>
 #include "entry/entry.h"
diff --git a/examples/23-vectordisplay/vectordisplay.h b/examples/23-vectordisplay/vectordisplay.h
index 88a71b83a..0b8c78a8e 100644
--- a/examples/23-vectordisplay/vectordisplay.h
+++ b/examples/23-vectordisplay/vectordisplay.h
@@ -12,7 +12,7 @@
 #ifndef __VECTORDISPLAY_H__
 #define __VECTORDISPLAY_H__
 
-#include "bgfx.h"
+#include <bgfx/bgfx.h>
 
 #include <tinystl/allocator.h>
 #include <tinystl/vector.h>
diff --git a/examples/24-nbody/nbody.cpp b/examples/24-nbody/nbody.cpp
index da7e7a44d..854a55a7a 100644
--- a/examples/24-nbody/nbody.cpp
+++ b/examples/24-nbody/nbody.cpp
@@ -7,7 +7,7 @@
 #include "bgfx_utils.h"
 #include "imgui/imgui.h"
 #include "camera.h"
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 struct u_paramsDataStruct
 {
diff --git a/examples/25-c99/helloworld.c b/examples/25-c99/helloworld.c
index b2e809c6d..a362736b4 100644
--- a/examples/25-c99/helloworld.c
+++ b/examples/25-c99/helloworld.c
@@ -3,7 +3,7 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#include <bgfx.c99.h>
+#include <bgfx/c99/bgfx.h>
 #include "../00-helloworld/logo.h"
 
 extern bool entry_process_events(uint32_t* _width, uint32_t* _height, uint32_t* _debug, uint32_t* _reset);
diff --git a/examples/common/bgfx_utils.cpp b/examples/common/bgfx_utils.cpp
index ad1ca9fc4..386062c06 100644
--- a/examples/common/bgfx_utils.cpp
+++ b/examples/common/bgfx_utils.cpp
@@ -12,7 +12,7 @@
 #include <tinystl/string.h>
 namespace stl = tinystl;
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/readerwriter.h>
 #include <bx/fpumath.h>
 #include <bx/string.h>
diff --git a/examples/common/bgfx_utils.h b/examples/common/bgfx_utils.h
index 6b7d1f05d..2938abff1 100644
--- a/examples/common/bgfx_utils.h
+++ b/examples/common/bgfx_utils.h
@@ -6,7 +6,7 @@
 #ifndef BGFX_UTILS_H_HEADER_GUARD
 #define BGFX_UTILS_H_HEADER_GUARD
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 void* load(const char* _filePath, uint32_t* _size = NULL);
 void unload(void* _ptr);
diff --git a/examples/common/cube_atlas.cpp b/examples/common/cube_atlas.cpp
index c0303d0ba..1d762b654 100644
--- a/examples/common/cube_atlas.cpp
+++ b/examples/common/cube_atlas.cpp
@@ -4,7 +4,7 @@
 */
 
 #include "common.h"
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 #include <limits.h> // INT_MAX
 #include <memory.h> // memset
diff --git a/examples/common/cube_atlas.h b/examples/common/cube_atlas.h
index 903221e7a..5efde0485 100644
--- a/examples/common/cube_atlas.h
+++ b/examples/common/cube_atlas.h
@@ -15,7 +15,7 @@
 /// algorithm based on C++ sources provided by Jukka Jylänki at:
 /// http://clb.demon.fi/files/RectangleBinPack/
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 struct AtlasRegion
 {
diff --git a/examples/common/entry/entry.cpp b/examples/common/entry/entry.cpp
index fa83cce89..61dbe0b3c 100644
--- a/examples/common/entry/entry.cpp
+++ b/examples/common/entry/entry.cpp
@@ -3,7 +3,7 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/string.h>
 #include <bx/readerwriter.h>
 
diff --git a/examples/common/entry/entry_android.cpp b/examples/common/entry/entry_android.cpp
index f16b1e5da..aef9fee93 100644
--- a/examples/common/entry/entry_android.cpp
+++ b/examples/common/entry/entry_android.cpp
@@ -7,7 +7,7 @@
 
 #if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_ANDROID
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #include <stdio.h>
 #include <bx/thread.h>
diff --git a/examples/common/entry/entry_glfw.cpp b/examples/common/entry/entry_glfw.cpp
index 42a7bc6f0..615d828ce 100644
--- a/examples/common/entry/entry_glfw.cpp
+++ b/examples/common/entry/entry_glfw.cpp
@@ -9,7 +9,7 @@
 
 #define GLFW_DLL
 #include <GLFW/glfw3.h>
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 #include "dbg.h"
 
 // This is just trivial implementation of GLFW3 integration.
diff --git a/examples/common/entry/entry_ios.mm b/examples/common/entry/entry_ios.mm
index d2392d898..1a10d26f7 100644
--- a/examples/common/entry/entry_ios.mm
+++ b/examples/common/entry/entry_ios.mm
@@ -17,7 +17,7 @@
 //#   define HAS_METAL_SDK
 #endif
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #include <bx/uint32_t.h>
 #include <bx/thread.h>
diff --git a/examples/common/entry/entry_nacl.cpp b/examples/common/entry/entry_nacl.cpp
index 8d6fac7ba..bc476290d 100644
--- a/examples/common/entry/entry_nacl.cpp
+++ b/examples/common/entry/entry_nacl.cpp
@@ -7,7 +7,7 @@
 
 #if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_NACL
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -29,7 +29,7 @@
 #include <ppapi/c/ppp_instance.h>
 #include <ppapi/gles2/gl2ext_ppapi.h>
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 #include <bx/thread.h>
 
 #include "entry.h"
diff --git a/examples/common/entry/entry_osx.mm b/examples/common/entry/entry_osx.mm
index c0cec19d9..5b59fe06c 100644
--- a/examples/common/entry/entry_osx.mm
+++ b/examples/common/entry/entry_osx.mm
@@ -9,7 +9,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #include <bx/uint32_t.h>
 #include <bx/thread.h>
diff --git a/examples/common/entry/entry_sdl.cpp b/examples/common/entry/entry_sdl.cpp
index b9094e8c3..a9faec69e 100644
--- a/examples/common/entry/entry_sdl.cpp
+++ b/examples/common/entry/entry_sdl.cpp
@@ -13,7 +13,7 @@
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_syswm.h>
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #include <stdio.h>
 #include <bx/thread.h>
diff --git a/examples/common/entry/entry_windows.cpp b/examples/common/entry/entry_windows.cpp
index a6a5ff2c9..0a210853e 100644
--- a/examples/common/entry/entry_windows.cpp
+++ b/examples/common/entry/entry_windows.cpp
@@ -7,7 +7,7 @@
 
 #if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_WINDOWS
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #include <bx/uint32_t.h>
 #include <bx/thread.h>
diff --git a/examples/common/entry/entry_winrt.cpp b/examples/common/entry/entry_winrt.cpp
index 44fb92a4e..042c032d6 100644
--- a/examples/common/entry/entry_winrt.cpp
+++ b/examples/common/entry/entry_winrt.cpp
@@ -7,7 +7,7 @@
 
 #if BX_PLATFORM_WINRT
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 #include <bx/thread.h>
 
 using namespace Windows::ApplicationModel;
diff --git a/examples/common/entry/entry_x11.cpp b/examples/common/entry/entry_x11.cpp
index e02548841..898728a83 100644
--- a/examples/common/entry/entry_x11.cpp
+++ b/examples/common/entry/entry_x11.cpp
@@ -11,7 +11,7 @@
 #define XK_LATIN1
 #include <X11/keysymdef.h>
 #include <X11/Xlib.h> // will include X11 which #defines None... Don't mess with order of includes.
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #undef None
 #include <bx/thread.h>
diff --git a/examples/common/font/font_manager.cpp b/examples/common/font/font_manager.cpp
index 8532a534e..053f7c95f 100644
--- a/examples/common/font/font_manager.cpp
+++ b/examples/common/font/font_manager.cpp
@@ -25,7 +25,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
 
 #include "../common.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <math.h>
 
 #if USE_EDTAA3
diff --git a/examples/common/font/font_manager.h b/examples/common/font/font_manager.h
index 73d471203..978440a8f 100644
--- a/examples/common/font/font_manager.h
+++ b/examples/common/font/font_manager.h
@@ -7,7 +7,7 @@
 #define FONT_MANAGER_H_HEADER_GUARD
 
 #include <bx/handlealloc.h>
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 class Atlas;
 
diff --git a/examples/common/font/text_buffer_manager.cpp b/examples/common/font/text_buffer_manager.cpp
index d42e0cb8d..af1a3852e 100644
--- a/examples/common/font/text_buffer_manager.cpp
+++ b/examples/common/font/text_buffer_manager.cpp
@@ -5,7 +5,7 @@
 
 #include "../common.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <stddef.h> // offsetof
 #include <memory.h> // memcpy
 #include <wchar.h>  // wcslen
diff --git a/examples/common/imgui/imgui.h b/examples/common/imgui/imgui.h
index acd6e6daf..d6d9cdff0 100644
--- a/examples/common/imgui/imgui.h
+++ b/examples/common/imgui/imgui.h
@@ -26,7 +26,7 @@
 #ifndef IMGUI_H_HEADER_GUARD
 #define IMGUI_H_HEADER_GUARD
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <ocornut-imgui/imgui.h>
 
 #define IMGUI_MBUT_LEFT   0x01
diff --git a/examples/common/imgui/ocornut_imgui.cpp b/examples/common/imgui/ocornut_imgui.cpp
index aff41ac37..367896c8e 100644
--- a/examples/common/imgui/ocornut_imgui.cpp
+++ b/examples/common/imgui/ocornut_imgui.cpp
@@ -3,7 +3,7 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/allocator.h>
 #include <bx/fpumath.h>
 #include <bx/timer.h>
diff --git a/examples/common/nanovg/nanovg_bgfx.cpp b/examples/common/nanovg/nanovg_bgfx.cpp
index 817457dbc..8a7d83f4b 100644
--- a/examples/common/nanovg/nanovg_bgfx.cpp
+++ b/examples/common/nanovg/nanovg_bgfx.cpp
@@ -28,7 +28,7 @@
 #include <math.h>
 #include "nanovg.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 #include <bx/bx.h>
 
diff --git a/include/bgfx.h b/include/bgfx/bgfx.h
similarity index 99%
rename from include/bgfx.h
rename to include/bgfx/bgfx.h
index 2bdc5b2ef..13c7b58f5 100644
--- a/include/bgfx.h
+++ b/include/bgfx/bgfx.h
@@ -10,7 +10,7 @@
 #include <stdint.h> // uint32_t
 #include <stdlib.h> // size_t
 
-#include "bgfxdefines.h"
+#include <bgfx/bgfxdefines.h>
 
 ///
 #define BGFX_HANDLE(_name) \
diff --git a/include/bgfxdefines.h b/include/bgfx/bgfxdefines.h
similarity index 100%
rename from include/bgfxdefines.h
rename to include/bgfx/bgfxdefines.h
diff --git a/include/bgfxplatform.h b/include/bgfx/bgfxplatform.h
similarity index 100%
rename from include/bgfxplatform.h
rename to include/bgfx/bgfxplatform.h
diff --git a/include/bgfx.c99.h b/include/bgfx/c99/bgfx.h
similarity index 99%
rename from include/bgfx.c99.h
rename to include/bgfx/c99/bgfx.h
index 23849bb5c..0fbfd46bb 100644
--- a/include/bgfx.c99.h
+++ b/include/bgfx/c99/bgfx.h
@@ -13,7 +13,7 @@
 #include <stdint.h>  // uint32_t
 #include <stdlib.h>  // size_t
 
-#include "bgfxdefines.h"
+#include <bgfx/bgfxdefines.h>
 
 typedef enum bgfx_renderer_type
 {
diff --git a/include/bgfxplatform.c99.h b/include/bgfx/c99/bgfxplatform.h
similarity index 100%
rename from include/bgfxplatform.c99.h
rename to include/bgfx/c99/bgfxplatform.h
diff --git a/src/bgfx.cpp b/src/bgfx.cpp
index bda36695d..71d521b6c 100644
--- a/src/bgfx.cpp
+++ b/src/bgfx.cpp
@@ -3217,8 +3217,8 @@ again:
 	}
 } // namespace bgfx
 
-#include <bgfx.c99.h>
-#include <bgfxplatform.c99.h>
+#include <bgfx/c99/bgfx.h>
+#include <bgfx/c99/bgfxplatform.h>
 
 BX_STATIC_ASSERT(bgfx::Fatal::Count         == bgfx::Fatal::Enum(BGFX_FATAL_COUNT) );
 BX_STATIC_ASSERT(bgfx::RendererType::Count  == bgfx::RendererType::Enum(BGFX_RENDERER_TYPE_COUNT) );
diff --git a/src/bgfx_p.h b/src/bgfx_p.h
index 9f758349e..26de034be 100644
--- a/src/bgfx_p.h
+++ b/src/bgfx_p.h
@@ -19,7 +19,7 @@
 #	define BX_CONFIG_ALLOCATOR_DEBUG 1
 #endif // BGFX_CONFIG_DEBUG
 
-#include "bgfx.h"
+#include <bgfx/bgfx.h>
 #include "config.h"
 
 #include <inttypes.h>
@@ -108,7 +108,7 @@ namespace bgfx
 #include <bx/string.h>
 #include <bx/os.h>
 
-#include "bgfxplatform.h"
+#include <bgfx/bgfxplatform.h>
 #include "image.h"
 
 #define BGFX_CHUNK_MAGIC_CSH BX_MAKEFOURCC('C', 'S', 'H', 0x2)
diff --git a/src/glcontext_ppapi.cpp b/src/glcontext_ppapi.cpp
index bdbb50680..fb17a11ff 100644
--- a/src/glcontext_ppapi.cpp
+++ b/src/glcontext_ppapi.cpp
@@ -6,7 +6,7 @@
 #include "bgfx_p.h"
 
 #if BX_PLATFORM_NACL && (BGFX_CONFIG_RENDERER_OPENGLES || BGFX_CONFIG_RENDERER_OPENGL)
-#	include <bgfxplatform.h>
+#	include <bgfx/bgfxplatform.h>
 #	include "renderer_gl.h"
 
 namespace bgfx { namespace gl
diff --git a/src/vertexdecl.h b/src/vertexdecl.h
index 6ba12417b..460255275 100644
--- a/src/vertexdecl.h
+++ b/src/vertexdecl.h
@@ -6,7 +6,7 @@
 #ifndef BGFX_VERTEXDECL_H_HEADER_GUARD
 #define BGFX_VERTEXDECL_H_HEADER_GUARD
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/readerwriter.h>
 
 namespace bgfx
diff --git a/tools/geometryc/geometryc.cpp b/tools/geometryc/geometryc.cpp
index d55d4a2e0..9e85a4c69 100644
--- a/tools/geometryc/geometryc.cpp
+++ b/tools/geometryc/geometryc.cpp
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include "../../src/vertexdecl.h"
 
 #include <tinystl/allocator.h>