M src/Ewmh.cc → src/Ewmh.cc

@@ -44,18 +44,8 @@ 
 #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
+#include <cstring>
+#include <cstdlib>
 
 
 using std::cerr;

M src/Window.cc → src/Window.cc

@@ -62,22 +62,10 @@ 
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 
-#ifdef HAVE_CSTRING
-  #include <cstring>
-#else
-  #include <string.h>
-#endif
-#ifdef HAVE_CSTDIO
-  #include <cstdio>
-#else
-  #include <stdio.h>
-#endif
+#include <cstring>
+#include <cstdio>
 #include <iostream>
-#ifdef HAVE_CASSERT
-  #include <cassert>
-#else
-  #include <assert.h>
-#endif
+#include <cassert>
 #include <functional>
 #include <algorithm>
 
@@ -258,7 +246,7 @@ // Helper class for getResizeDirection below
 // Tests whether a point is on an edge or the corner.
 struct TestCornerHelper {
     int corner_size_px, corner_size_pc;
-    inline bool operator()(int xy, int wh)
+    bool operator()(int xy, int wh)
     {
         /* The % checking must be right: 0% must fail, 100% must succeed. */
         return xy < corner_size_px  ||  100 * xy < corner_size_pc * wh;

M src/Window.hh → src/Window.hh

@@ -42,6 +42,7 @@ #include <vector>
 #include <string>
 #include <memory>
 #include <map>
+#include <inttypes.h>
 
 class WinClient;
 class FbWinFrameTheme;

M src/fluxbox.cc → src/fluxbox.cc

@@ -81,21 +81,9 @@ #endif // HAVE_RANDR
 
 // system headers
 
-#ifdef HAVE_CSTDIO
-  #include <cstdio>
-#else
-  #include <stdio.h>
-#endif
-#ifdef HAVE_CSTDLIB
-  #include <cstdlib>
-#else
-  #include <stdlib.h>
-#endif
-#ifdef HAVE_CSTRING
-  #include <cstring>
-#else
-  #include <string.h>
-#endif
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #ifdef HAVE_UNISTD_H
 #include <sys/types.h>
@@ -1302,8 +1290,8 @@ if (FocusControl::focusedWindow() || FocusControl::expectingFocus())
             return; // already handled
 
         Window win;
-        int blah;
-        XGetInputFocus(display(), &win, &blah);
+        int ignore;
+        XGetInputFocus(display(), &win, &ignore);
 
         // we only want to revert focus if it's left dangling, as some other
         // application may have set the focus to an unmanaged window