X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=89e541aa7d29e4a18a60a963f938d86466ae8320;hb=c88451f0c1e2586a5a06babb69b060bf808c9148;hp=24b3278615bed12dfec0a3679567e103c6d0607e;hpb=17b0266979137ad957a701c7093a14841a8c2091;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 24b32786..89e541aa 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -1,8 +1,6 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
 
 #include "openbox.hh"
 #include "client.hh"
@@ -20,14 +18,6 @@
 extern "C" {
 #include <X11/cursorfont.h>
 
-#ifdef    HAVE_STDIO_H
-#  include <stdio.h>
-#endif // HAVE_STDIO_H
-
-#ifdef    HAVE_STDLIB_H
-#  include <stdlib.h>
-#endif // HAVE_STDLIB_H
-
 #ifdef    HAVE_SIGNAL_H
 #  include <signal.h>
 #endif // HAVE_SIGNAL_H
@@ -45,6 +35,8 @@ extern "C" {
 }
 
 #include <algorithm>
+#include <cstdio>
+#include <cstdlib>
 
 namespace ob {
 
@@ -366,7 +358,7 @@ void Openbox::setFocusedClient(Client *c)
   // sometimes this is called with the already-focused window, this is
   // important for the python scripts to work (eg, c = 0 twice). don't just
   // return if _focused_client == c
-  
+
   assert(_focused_screen);
 
   // uninstall the old colormap