4 files changed, 20 insertions, 0 deletions

diff --git a/src/FocusableList.cc b/src/FocusableList.cc
index 258a43b..70f415e 100644
--- a/src/FocusableList.cc
+++ b/src/FocusableList.cc
@@ -31,6 +31,12 @@
 
 #include <vector>
 
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
+
 using std::string;
 using std::vector;
 
diff --git a/src/FocusableList.hh b/src/FocusableList.hh
index 91eb6a4..d46fe48 100644
--- a/src/FocusableList.hh
+++ b/src/FocusableList.hh
@@ -30,6 +30,7 @@
 
 #include <list>
 #include <string>
+#include <memory>
 
 class BScreen;
 class Focusable;
diff --git a/src/Layer.hh b/src/Layer.hh
index bbda950..58fb5b6 100644
--- a/src/Layer.hh
+++ b/src/Layer.hh
@@ -25,6 +25,12 @@
 #include <string>
 #include <cstdio>
 
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
+
 using std::string;
 
 /** 
diff --git a/src/Xutil.cc b/src/Xutil.cc
index 44fceaf..a1744c4 100644
--- a/src/Xutil.cc
+++ b/src/Xutil.cc
@@ -29,7 +29,14 @@
 #include <X11/Xatom.h>
 #include <iostream>
 
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
+
 using std::string;
+using std::strlen;
 
 #ifdef DEBUG
 using std::cerr;