5 files changed, 37 insertions, 1 deletions

diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index 2575a39..b73de01 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -36,6 +36,17 @@
 #include "FbTk/stringstream.hh"
 #include "FbTk/StringUtil.hh"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif // HAVE_CONFIG_H
+
+#ifdef HAVE_CSTDLIB
+#include <cstdlib>
+#else
+#include <stdlib.h>
+#endif
+
+
 using FbTk::Command;
 
 namespace {
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 4062595..fb1b832 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -39,15 +39,24 @@
 
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
+
 #include <iostream>
 #include <algorithm>
 #include <new>
+
 #ifdef HAVE_CSTRING
   #include <cstring>
 #else
   #include <string.h>
 #endif
 
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+
+
 using std::cerr;
 using std::endl;
 using std::vector;
diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc
index e7e2563..c952403 100644
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@@ -36,6 +36,12 @@
   #include <string.h>
 #endif
 
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+
 #include <X11/Xutil.h>
 
 #ifdef SHAPE
diff --git a/src/WindowState.cc b/src/WindowState.cc
index 1b8647a..d062907 100644
--- a/src/WindowState.cc
+++ b/src/WindowState.cc
@@ -23,7 +23,16 @@
 
 #include "FbTk/StringUtil.hh"
 
-#include <cstdlib>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif // HAVE_CONFIG_H
+
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+
 #include <errno.h>
 
 bool WindowState::useBorder() const {
diff --git a/src/WindowState.hh b/src/WindowState.hh
index 883443a..6409d13 100644
--- a/src/WindowState.hh
+++ b/src/WindowState.hh
@@ -24,6 +24,7 @@
 
 #include "Layer.hh"
 
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
 #include <string>