use the c++ std cheaders

7 files changed, 15 insertions, 46 deletions

diff --git a/src/actions.cc b/src/actions.cc
index bb5088e9..3eb29215 100644
--- a/src/actions.cc
+++ b/src/actions.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 "actions.hh"
 #include "openbox.hh"
@@ -13,7 +11,7 @@
 #include "bindings.hh"
 #include "otk/display.hh"
 
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 
 namespace ob {
diff --git a/src/bindings.cc b/src/bindings.cc
index 167d0a85..138aba81 100644
--- a/src/bindings.cc
+++ b/src/bindings.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 "bindings.hh"
 #include "screen.hh"
diff --git a/src/client.cc b/src/client.cc
index e2c2dcb4..25434573 100644
--- a/src/client.cc
+++ b/src/client.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 "client.hh"
 #include "frame.hh"
diff --git a/src/frame.cc b/src/frame.cc
index 17ebdb65..5f63d17c 100644
--- a/src/frame.cc
+++ b/src/frame.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"
 
 extern "C" {
 #ifdef    SHAPE
diff --git a/src/main.cc b/src/main.cc
index 83cbf516..13047780 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -4,19 +4,9 @@
   @brief Main entry point for the application
 */
 
-#ifdef    HAVE_CONFIG_H
-#  include "../config.h"
-#endif // HAVE_CONFIG_H
+#include "config.h"
 
 extern "C" {
-#ifdef    HAVE_LOCALE_H
-# include <locale.h>
-#endif // HAVE_LOCALE_H
-
-#ifdef    HAVE_STDIO_H
-# include <stdio.h>
-#endif // HAVE_STDIO_H
-
 #ifdef    HAVE_UNISTD_H
 #  include <sys/types.h>
 #  include <unistd.h>
@@ -28,6 +18,9 @@ extern "C" {
 #include "openbox.hh"
 #include "otk/util.hh"
 
+#include <clocale>
+#include <cstdio>
+
 int main(int argc, char **argv) {
   // initialize the locale
   if (!setlocale(LC_ALL, ""))
diff --git a/src/openbox.cc b/src/openbox.cc
index 24b32786..9c1041ac 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 {
 
diff --git a/src/screen.cc b/src/screen.cc
index 4878d7b6..024c5094 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -1,18 +1,8 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
 
 extern "C" {
-#ifdef    HAVE_STDIO_H
-#  include <stdio.h>
-#endif // HAVE_STDIO_H
-
-#ifdef    HAVE_STRING_H
-#  include <string.h>
-#endif // HAVE_STRING_H
-
 #ifdef    HAVE_UNISTD_H
 #  include <sys/types.h>
 #  include <unistd.h>
@@ -33,6 +23,8 @@ extern "C" {
 
 #include <vector>
 #include <algorithm>
+#include <cstdio>
+#include <cstring>
 
 static bool running;
 static int anotherWMRunning(Display *display, XErrorEvent *) {