diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index d94d43d1..eef21a7a 100644
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -1,20 +1,18 @@
+#include "bsetroot.hh"
+
+#include "../src/i18n.hh"
+
 #ifdef HAVE_CONFIG_H
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
-#ifdef STDC_HEADERS
-#  include <string.h>
-#  include <stdlib.h>
-#endif // STDC_HEADERS
-
-#ifdef HAVE_STDIO_H
-#  include <stdio.h>
-#endif // HAVE_STDIO_H
-
-#include "../src/i18n.hh"
-#include "bsetroot.hh"
+#include <X11/Xatom.h>
 
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 #include <iostream>
+
 using namespace std;
 
 bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
diff --git a/util/bsetroot.hh b/util/bsetroot.hh
index bf550150..41d298b9 100644
--- a/util/bsetroot.hh
+++ b/util/bsetroot.hh
@@ -1,5 +1,5 @@
-#ifndef   __bsetroot2_hh
-#define   __bsetroot2_hh
+#ifndef BSETROOT_HH
+#define BSETROOT_HH
 
 #include "../src/BaseDisplay.hh"
 #include "../src/Image.hh"
@@ -30,4 +30,4 @@ protected:
 };
 
 
-#endif // __bsetroot2_hh
+#endif // BSETROOT_HH