3 files changed, 5 insertions, 12 deletions

diff --git a/src/IconbarTheme.cc b/src/IconbarTheme.cc
index 0be9cd1..cead9c8 100644
--- a/src/IconbarTheme.cc
+++ b/src/IconbarTheme.cc
@@ -64,15 +64,13 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) {
                 || tm.loadItem(item, "toolbar", "toolbar"));
     } else if (item.name() == m_name + ".borderWidth")
         // don't fallback for base border, for theme backwards compatibility
-        return (tm.loadItem(item, base + ".borderWidth",
-                            altbase + ".BorderWidth") ||
+        return (tm.loadItem(item, base + ".borderWidth", altbase + ".BorderWidth") ||
                 tm.loadItem(item, "window.borderWidth", "Window.BorderWidth") ||
                 tm.loadItem(item, "borderWidth", "BorderWidth"));
 
     else if (item.name() == m_name + ".borderColor")
 
-        return (tm.loadItem(item, base + ".borderColor",
-                            altbase + ".BorderColor") ||
+        return (tm.loadItem(item, base + ".borderColor", altbase + ".BorderColor") ||
                 tm.loadItem(item, "window.borderColor", "Window.BorderColor") ||
                 tm.loadItem(item, "borderColor", "BorderColor"));
 
diff --git a/src/WindowState.cc b/src/WindowState.cc
index 2f1ee0e..e684992 100644
--- a/src/WindowState.cc
+++ b/src/WindowState.cc
@@ -23,13 +23,8 @@
 
 #include "FbTk/StringUtil.hh"
 
-#ifdef HAVE_CSTDLIB
-  #include <cstdlib>
-#else
-  #include <stdlib.h>
-#endif
-
-#include <errno.h>
+#include <cstdlib>
+#include <cerrno>
 
 bool WindowState::useBorder() const {
     return !fullscreen && maximized != MAX_FULL && deco_mask & DECORM_BORDER;
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index c5d85a6..87c4c46 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -239,7 +239,7 @@ bool Fluxbox::haveShape() const { return s_have_shape; }
 int Fluxbox::shapeEventbase() const { return s_shape_eventbase; }
 Fluxbox* Fluxbox::instance() { return s_singleton; }
 
-Fluxbox::Config::Config(FbTk::ResourceManager& rm, const std::string& path) : 
+Fluxbox::Config::Config(FbTk::ResourceManager& rm, const std::string& path) :
     ignore_border(rm, false, "session.ignoreBorder", "Session.IgnoreBorder"),
     pseudotrans(rm, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"),
     colors_per_channel(rm, 4, "session.colorsPerChannel", "Session.ColorsPerChannel"),