--- a/src/FbDesk.cc
+++ b/src/FbDesk.cc
@@ -37,10 +37,11 @@
 #include <iostream>
 #include <fstream>
 #include <algorithm>
 #include <unistd.h>
 #include <cstdio>
+#include <cstring>
 
 using namespace std;
 using namespace FbTk;
 
 
--- a/src/FbTk/FbPixmap.cc
+++ b/src/FbTk/FbPixmap.cc
@@ -28,10 +28,11 @@
 
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <iostream>
 #include <string>
+#include <cstring>
 
 using namespace std;
 
 namespace FbTk {
 
--- a/src/FbTk/KeyUtil.cc
+++ b/src/FbTk/KeyUtil.cc
@@ -23,10 +23,11 @@
 
 #include "KeyUtil.hh"
 #include "App.hh"
 
 #include <string>
+#include <cstring>
 
 namespace {
 
 struct t_modlist{
     char *str;
--- a/src/FbTk/StringUtil.cc
+++ b/src/FbTk/StringUtil.cc
@@ -47,10 +47,11 @@
 
 
 #include <memory>
 #include <algorithm>
 #include <string>
+#include <cstring>
 
 using std::string;
 using std::transform;
 
 namespace FbTk {
--- a/src/FbTk/TextBox.cc
+++ b/src/FbTk/TextBox.cc
@@ -34,10 +34,11 @@
 #endif
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
 
 #include <iostream>
+#include <cstdlib>
 
 namespace FbTk {
 
 TextBox::TextBox(int screen_num,
                  const Font &font, const std::string &text):
--- a/src/FbTk/TextureRender.cc
+++ b/src/FbTk/TextureRender.cc
@@ -31,10 +31,11 @@
 #include "FbPixmap.hh"
 #include "GContext.hh"
 
 #include <iostream>
 #include <string>
+#include <cstring>
 #ifdef HAVE_CSTDIO
   #include <cstdio>
 #else
   #include <stdio.h>
 #endif
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -34,10 +34,11 @@
 #else
   #include <stdio.h>
 #endif
 #include <memory>
 #include <iostream>
+#include <algorithm>
 
 using namespace std;
 
 namespace FbTk {
 
--- a/src/FbTk/ThemeItems.cc
+++ b/src/FbTk/ThemeItems.cc
@@ -46,10 +46,12 @@
   #include <stdio.h>
 #endif
 
 #include <iostream>
 #include <memory>
+#include <cstdlib>
+#include <cstring>
 
 namespace FbTk {
 
 using std::string;
 using std::cerr;
--- a/src/FbTk/XFontImp.cc
+++ b/src/FbTk/XFontImp.cc
@@ -26,10 +26,11 @@
 #include "GContext.hh"
 #include "FbPixmap.hh"
 
 #include <X11/Xutil.h>
 
+#include <cstdlib>
 #include <iostream>
 #include <new>
 #ifdef HAVE_CSTDIO
   #include <cstdio>
 #else
--- a/src/main.cc
+++ b/src/main.cc
@@ -21,14 +21,16 @@
 
 #include "App.hh"
 #include "FbDesk.hh"
 #include "version.h"
 
+#include <cstdlib>
 #include <iostream>
 #include <stdexcept>
 #include <signal.h>
 #include <sys/wait.h>
+#include <cstring>
 
 using namespace std;
 
 ///  handles system signals
 void signalhandler(int sig) {
--- a/src/FbTk/ImagePNG.cc
+++ b/src/FbTk/ImagePNG.cc
@@ -30,6 +30,7 @@
 #include <png.h>
 #include <cstdio>
 #include <iostream>
+#include <cstring>
 using namespace std;
 
 namespace {