diff --git a/demo/allegro5/nuklear_allegro5.h b/demo/allegro5/nuklear_allegro5.h
index 0e980c7..0e72f16 100644
--- a/demo/allegro5/nuklear_allegro5.h
+++ b/demo/allegro5/nuklear_allegro5.h
@@ -46,6 +46,7 @@ NK_API void                   nk_allegro5_font_set_font(NkAllegro5Font *font);
  * ===============================================================
  */
 #ifdef NK_ALLEGRO5_IMPLEMENTATION
+#include <stdio.h>
 
 #ifndef NK_ALLEGRO5_TEXT_MAX
 #define NK_ALLEGRO5_TEXT_MAX 256
diff --git a/demo/d3d11/nuklear_d3d11.h b/demo/d3d11/nuklear_d3d11.h
index 27fa2c1..c62be56 100644
--- a/demo/d3d11/nuklear_d3d11.h
+++ b/demo/d3d11/nuklear_d3d11.h
@@ -41,6 +41,7 @@ NK_API void nk_d3d11_shutdown(void);
 #define COBJMACROS
 #include <d3d11.h>
 
+#include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <float.h>
diff --git a/demo/d3d12/nuklear_d3d12.h b/demo/d3d12/nuklear_d3d12.h
index 5b86ea1..03560a2 100644
--- a/demo/d3d12/nuklear_d3d12.h
+++ b/demo/d3d12/nuklear_d3d12.h
@@ -88,6 +88,7 @@ NK_API void nk_d3d12_shutdown(void);
 #define COBJMACROS
 #include <d3d12.h>
 
+#include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <float.h>
diff --git a/demo/d3d9/nuklear_d3d9.h b/demo/d3d9/nuklear_d3d9.h
index f967678..8af027f 100644
--- a/demo/d3d9/nuklear_d3d9.h
+++ b/demo/d3d9/nuklear_d3d9.h
@@ -41,6 +41,7 @@ NK_API void nk_d3d9_shutdown(void);
 #define COBJMACROS
 #include <d3d9.h>
 
+#include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 
diff --git a/demo/gdi/nuklear_gdi.h b/demo/gdi/nuklear_gdi.h
index 6bbedb6..ff2ff19 100644
--- a/demo/gdi/nuklear_gdi.h
+++ b/demo/gdi/nuklear_gdi.h
@@ -38,7 +38,7 @@ NK_API void nk_gdi_set_font(GdiFont *font);
  * ===============================================================
  */
 #ifdef NK_GDI_IMPLEMENTATION
-
+#include <string.h>
 #include <stdlib.h>
 #include <malloc.h>
 
diff --git a/demo/gdi_native_nuklear/nuklear_gdi.h b/demo/gdi_native_nuklear/nuklear_gdi.h
index 5c2f1f8..aa91740 100644
--- a/demo/gdi_native_nuklear/nuklear_gdi.h
+++ b/demo/gdi_native_nuklear/nuklear_gdi.h
@@ -50,7 +50,7 @@ NK_API void nk_gdi_set_font(nk_gdi_ctx gdi, GdiFont* font);
  * ===============================================================
  */
 #ifdef NK_GDI_IMPLEMENTATION
-
+#include <string.h>
 #include <stdlib.h>
 #include <malloc.h>
 
diff --git a/demo/glfw_opengl2/nuklear_glfw_gl2.h b/demo/glfw_opengl2/nuklear_glfw_gl2.h
index fb8b31e..d74b4f2 100644
--- a/demo/glfw_opengl2/nuklear_glfw_gl2.h
+++ b/demo/glfw_opengl2/nuklear_glfw_gl2.h
@@ -40,6 +40,8 @@ NK_API void                 nk_gflw3_scroll_callback(GLFWwindow *win, double xof
  * ===============================================================
  */
 #ifdef NK_GLFW_GL2_IMPLEMENTATION
+#include <string.h>
+#include <stdlib.h>
 
 #ifndef NK_GLFW_TEXT_MAX
 #define NK_GLFW_TEXT_MAX 256
diff --git a/demo/glfw_opengl3/nuklear_glfw_gl3.h b/demo/glfw_opengl3/nuklear_glfw_gl3.h
index cef59e5..8ba361c 100644
--- a/demo/glfw_opengl3/nuklear_glfw_gl3.h
+++ b/demo/glfw_opengl3/nuklear_glfw_gl3.h
@@ -78,6 +78,9 @@ NK_API void                 nk_glfw3_mouse_button_callback(GLFWwindow *win, int
  * ===============================================================
  */
 #ifdef NK_GLFW_GL3_IMPLEMENTATION
+#include <string.h>
+#include <stdlib.h>
+#include <assert.h>
 
 #ifndef NK_GLFW_DOUBLE_CLICK_LO
 #define NK_GLFW_DOUBLE_CLICK_LO 0.02
diff --git a/demo/glfw_opengl4/nuklear_glfw_gl4.h b/demo/glfw_opengl4/nuklear_glfw_gl4.h
index 781bfc3..b4df990 100644
--- a/demo/glfw_opengl4/nuklear_glfw_gl4.h
+++ b/demo/glfw_opengl4/nuklear_glfw_gl4.h
@@ -50,6 +50,9 @@ NK_API void                 nk_glfw3_destroy_texture(int tex_index);
  */
 #ifdef NK_GLFW_GL4_IMPLEMENTATION
 #undef NK_GLFW_GL4_IMPLEMENTATION
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
 
 #ifndef NK_GLFW_TEXT_MAX
 #define NK_GLFW_TEXT_MAX 256
diff --git a/demo/glfw_vulkan/nuklear_glfw_vulkan.h b/demo/glfw_vulkan/nuklear_glfw_vulkan.h
index f411872..3c1e358 100644
--- a/demo/glfw_vulkan/nuklear_glfw_vulkan.h
+++ b/demo/glfw_vulkan/nuklear_glfw_vulkan.h
@@ -247,6 +247,7 @@ unsigned char nuklearshaders_nuklear_frag_spv[] = {
 };
 unsigned int nuklearshaders_nuklear_frag_spv_len = 860;
 
+#include <assert.h>
 #include <stddef.h>
 #include <string.h>
 #define GLFW_INCLUDE_VULKAN
@@ -294,6 +295,7 @@ NK_API void nk_glfw3_mouse_button_callback(GLFWwindow *win, int button,
  */
 #ifdef NK_GLFW_VULKAN_IMPLEMENTATION
 #undef NK_GLFW_VULKAN_IMPLEMENTATION
+#include <stdlib.h>
 
 #ifndef NK_GLFW_TEXT_MAX
 #define NK_GLFW_TEXT_MAX 256
diff --git a/demo/glfw_vulkan/src/nuklear_glfw_vulkan.in.h b/demo/glfw_vulkan/src/nuklear_glfw_vulkan.in.h
index 78a1f6c..ea86e5b 100644
--- a/demo/glfw_vulkan/src/nuklear_glfw_vulkan.in.h
+++ b/demo/glfw_vulkan/src/nuklear_glfw_vulkan.in.h
@@ -71,6 +71,8 @@ NK_API void nk_glfw3_mouse_button_callback(GLFWwindow *win, int button,
  */
 #ifdef NK_GLFW_VULKAN_IMPLEMENTATION
 #undef NK_GLFW_VULKAN_IMPLEMENTATION
+#include <assert.h>
+#include <stdlib.h>
 
 #ifndef NK_GLFW_TEXT_MAX
 #define NK_GLFW_TEXT_MAX 256
diff --git a/demo/sdl2surface_rawfb/sdl2surface_rawfb.h b/demo/sdl2surface_rawfb/sdl2surface_rawfb.h
index 6e2eb59..7b4b1cf 100644
--- a/demo/sdl2surface_rawfb/sdl2surface_rawfb.h
+++ b/demo/sdl2surface_rawfb/sdl2surface_rawfb.h
@@ -49,6 +49,10 @@ void                  nk_sdlsurface_shutdown(struct sdlsurface_context *sdlsurfa
  * ===============================================================
  */
 #ifdef NK_SDLSURFACE_IMPLEMENTATION
+#include <string.h>
+#include <stdlib.h>
+#include <assert.h>
+
 struct sdlsurface_context {
     struct nk_context ctx;
     struct nk_rect scissors;
diff --git a/demo/sdl_opengl2/nuklear_sdl_gl2.h b/demo/sdl_opengl2/nuklear_sdl_gl2.h
index 0c6a2fb..819723c 100644
--- a/demo/sdl_opengl2/nuklear_sdl_gl2.h
+++ b/demo/sdl_opengl2/nuklear_sdl_gl2.h
@@ -30,6 +30,8 @@ NK_API void                 nk_sdl_shutdown(void);
  * ===============================================================
  */
 #ifdef NK_SDL_GL2_IMPLEMENTATION
+#include <string.h>
+#include <stdlib.h>
 
 struct nk_sdl_device {
     struct nk_buffer cmds;
diff --git a/demo/sdl_opengl3/nuklear_sdl_gl3.h b/demo/sdl_opengl3/nuklear_sdl_gl3.h
index cac8629..4e7df6b 100644
--- a/demo/sdl_opengl3/nuklear_sdl_gl3.h
+++ b/demo/sdl_opengl3/nuklear_sdl_gl3.h
@@ -36,6 +36,8 @@ NK_API void                 nk_sdl_device_create(void);
  */
 #ifdef NK_SDL_GL3_IMPLEMENTATION
 
+#include <stdlib.h>
+#include <assert.h>
 #include <string.h>
 
 struct nk_sdl_device {
diff --git a/demo/sdl_opengles2/nuklear_sdl_gles2.h b/demo/sdl_opengles2/nuklear_sdl_gles2.h
index 595d7a7..39a444d 100644
--- a/demo/sdl_opengles2/nuklear_sdl_gles2.h
+++ b/demo/sdl_opengles2/nuklear_sdl_gles2.h
@@ -38,7 +38,8 @@ NK_API void                 nk_sdl_device_create(void);
  * ===============================================================
  */
 #ifdef NK_SDL_GLES2_IMPLEMENTATION
-
+#include <stdlib.h>
+#include <assert.h>
 #include <string.h>
 
 struct nk_sdl_device {
diff --git a/demo/sdl_renderer/nuklear_sdl_renderer.h b/demo/sdl_renderer/nuklear_sdl_renderer.h
index 672b81b..fbea3cf 100644
--- a/demo/sdl_renderer/nuklear_sdl_renderer.h
+++ b/demo/sdl_renderer/nuklear_sdl_renderer.h
@@ -39,8 +39,8 @@ NK_API void                 nk_sdl_shutdown(void);
  * ===============================================================
  */
 #ifdef NK_SDL_RENDERER_IMPLEMENTATION
-
-#include <strings.h>
+#include <string.h>
+#include <stdlib.h>
 
 struct nk_sdl_device {
     struct nk_buffer cmds;
diff --git a/demo/sfml_opengl2/nuklear_sfml_gl2.h b/demo/sfml_opengl2/nuklear_sfml_gl2.h
index f168bab..5677405 100644
--- a/demo/sfml_opengl2/nuklear_sfml_gl2.h
+++ b/demo/sfml_opengl2/nuklear_sfml_gl2.h
@@ -31,6 +31,8 @@ NK_API void                 nk_sfml_shutdown(void);
  * ===============================================================
  */
  #ifdef NK_SFML_GL2_IMPLEMENTATION
+#include <cstdlib>
+#include <cstring>
 
 struct nk_sfml_device {
     struct nk_buffer cmds;
diff --git a/demo/sfml_opengl3/nuklear_sfml_gl3.h b/demo/sfml_opengl3/nuklear_sfml_gl3.h
index 286cfc1..c58bde7 100644
--- a/demo/sfml_opengl3/nuklear_sfml_gl3.h
+++ b/demo/sfml_opengl3/nuklear_sfml_gl3.h
@@ -38,7 +38,8 @@ NK_API void                 nk_sfml_device_destroy(void);
  * ===============================================================
  */
  #ifdef NK_SFML_GL3_IMPLEMENTATION
-
+#include <cstring>
+#include <assert.h>
 #include <string>
 
 struct nk_sfml_device {
diff --git a/demo/wayland_rawfb/nuklear_raw_wayland.h b/demo/wayland_rawfb/nuklear_raw_wayland.h
index 49082c5..1a465fc 100644
--- a/demo/wayland_rawfb/nuklear_raw_wayland.h
+++ b/demo/wayland_rawfb/nuklear_raw_wayland.h
@@ -1,6 +1,10 @@
 #ifndef NK_RAW_WAYLAND_H_
 #define NK_RAW_WAYLAND_H_
 
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
 #define WIDTH 800
 #define HEIGHT 600
 
diff --git a/demo/x11/nuklear_xlib.h b/demo/x11/nuklear_xlib.h
index 9b3a861..28fb4cc 100644
--- a/demo/x11/nuklear_xlib.h
+++ b/demo/x11/nuklear_xlib.h
@@ -44,6 +44,9 @@ NK_API void                 nk_xfont_del(Display *dpy, XFont *font);
  * ===============================================================
  */
 #ifdef NK_XLIB_IMPLEMENTATION
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
diff --git a/demo/x11_opengl3/nuklear_xlib_gl3.h b/demo/x11_opengl3/nuklear_xlib_gl3.h
index 9dd0181..c343bb5 100644
--- a/demo/x11_opengl3/nuklear_xlib_gl3.h
+++ b/demo/x11_opengl3/nuklear_xlib_gl3.h
@@ -32,6 +32,7 @@ NK_API void                 nk_x11_device_destroy(void);
  * ===============================================================
  */
 #ifdef NK_XLIB_GL3_IMPLEMENTATION
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/demo/x11_rawfb/nuklear_rawfb.h b/demo/x11_rawfb/nuklear_rawfb.h
index ce84222..6aece67 100644
--- a/demo/x11_rawfb/nuklear_rawfb.h
+++ b/demo/x11_rawfb/nuklear_rawfb.h
@@ -55,6 +55,10 @@ NK_API void                  nk_rawfb_resize_fb(struct rawfb_context *rawfb, voi
  * ===============================================================
  */
 #ifdef NK_RAWFB_IMPLEMENTATION
+#include <string.h>
+#include <stdlib.h>
+#include <assert.h>
+
 struct rawfb_image {
     void *pixels;
     int w, h, pitch;
diff --git a/demo/x11_rawfb/nuklear_xlib.h b/demo/x11_rawfb/nuklear_xlib.h
index 0d23135..3174e24 100644
--- a/demo/x11_rawfb/nuklear_xlib.h
+++ b/demo/x11_rawfb/nuklear_xlib.h
@@ -49,6 +49,9 @@ NK_API void nk_xlib_shutdown(void);
  * ===============================================================
  */
 #ifdef NK_XLIBSHM_IMPLEMENTATION
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
diff --git a/demo/x11_xft/nuklear_xlib.h b/demo/x11_xft/nuklear_xlib.h
index 9526e3e..f0fb074 100644
--- a/demo/x11_xft/nuklear_xlib.h
+++ b/demo/x11_xft/nuklear_xlib.h
@@ -48,6 +48,9 @@ NK_API void                 nk_xfont_del(Display *dpy, XFont *font);
  * ===============================================================
  */
 #ifdef NK_XLIB_IMPLEMENTATION
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>