X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffont.cc;h=2d983d0cab614c4b3d1af4000d7f9ec8756655a5;hb=916b58f99c332f4710574bf7726aba344943c73f;hp=4fc09fcfdbad1fee17e0a615ecff4e371cb792e8;hpb=e64d90be4d5b86a497ed8f03c6ba40512765e239;p=chaz%2Fopenbox

diff --git a/otk/font.cc b/otk/font.cc
index 4fc09fcf..2d983d0c 100644
--- a/otk/font.cc
+++ b/otk/font.cc
@@ -1,17 +1,6 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef    HAVE_CONFIG_H
-#  include "../config.h"
-#endif // HAVE_CONFIG_H
-
-extern "C" {
-#ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-#endif // HAVE_STDLIB_H
-}
-
-#include <iostream>
-#include <algorithm>
+#include "config.h"
 
 #include "font.hh"
 #include "surface.hh"
@@ -20,14 +9,15 @@ extern "C" {
 #include "screeninfo.hh"
 
 extern "C" {
-#ifdef    HAVE_STDIO_H
-#  include <stdio.h>
-#endif // HAVE_STDIO_H
-
-#include "gettext.h"
+#include "../src/gettext.h"
 #define _(str) gettext(str)
 }
 
+#include <cstdio>
+#include <cstdlib>
+#include <iostream>
+#include <algorithm>
+
 namespace otk {
 
 std::string Font::_fallback_font = "fixed";