diff --git a/examples/10-font/font.cpp b/examples/10-font/font.cpp
index 938cb144..0309defb 100644
--- a/examples/10-font/font.cpp
+++ b/examples/10-font/font.cpp
@@ -6,6 +6,7 @@
 #include <bgfx.h>
 #include <bx/bx.h>
 #include <bx/timer.h>
+#include <bx/countof.h> 
 #include "../common/entry.h"
 #include "../common/dbg.h"
 #include "../common/math.h"
@@ -15,7 +16,6 @@
 #include "../common/font/text_buffer_manager.h"
 
 #include <stdio.h>
-#include <string.h>
 
 int _main_(int /*_argc*/, char** /*_argv*/)
 {
@@ -154,7 +154,8 @@ int _main_(int /*_argc*/, char** /*_argv*/)
 		//Use transient text to display debug information
 		//Code below is similar to commented code above
 		wchar_t fpsText[64];
-		swprintf(fpsText,L"Frame: % 7.3f[ms]", double(frameTime)*toMs);
+		//swprintf(fpsText,L"Frame: % 7.3f[ms]", double(frameTime)*toMs);
+		swprintf(fpsText, countof(fpsText), L"Frame: % 7.3f[ms]", double(frameTime)*toMs);
 		
 		textBufferManager->clearTextBuffer(transientText);
 		textBufferManager->setPenPosition(transientText, 20.0, 4.0f);		
diff --git a/examples/11-fontsdf/fontsdf.cpp b/examples/11-fontsdf/fontsdf.cpp
index 0a56fc59..c1f9d860 100644
--- a/examples/11-fontsdf/fontsdf.cpp
+++ b/examples/11-fontsdf/fontsdf.cpp
@@ -14,9 +14,6 @@
 #include "../common/font/font_manager.h"
 #include "../common/font/text_buffer_manager.h"
 
-#include <stdio.h>
-#include <string.h>
-
 inline void mtxTranslate(float* _result, float x, float y, float z)
 {
 	memset(_result, 0, sizeof(float)*16);
diff --git a/examples/common/font/font_manager.cpp b/examples/common/font/font_manager.cpp
index 17201a6d..782bd89c 100644
--- a/examples/common/font/font_manager.cpp
+++ b/examples/common/font/font_manager.cpp
@@ -21,7 +21,6 @@
 
 #include <edtaa3/edtaa3func.h>
 #include <edtaa3/edtaa3func.cpp>
-#include <math.h>
 #include <bx/bx.h>
 
 
diff --git a/examples/common/font/text_buffer_manager.cpp b/examples/common/font/text_buffer_manager.cpp
index 3ed7c4a2..c5047c3f 100644
--- a/examples/common/font/text_buffer_manager.cpp
+++ b/examples/common/font/text_buffer_manager.cpp
@@ -7,9 +7,6 @@
 #include "../cube_atlas.h"
 
 #include <bx/bx.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
 #include <stddef.h>     /* offsetof */
 
 #include "vs_font_basic.bin.h"