2 files changed, 5 insertions, 17 deletions

diff --git a/util/fbsetroot.cc b/util/fbsetroot.cc
index c787619..28ad26e 100644
--- a/util/fbsetroot.cc
+++ b/util/fbsetroot.cc
@@ -28,21 +28,9 @@
 
 #include <X11/Xatom.h>
 
-#ifdef HAVE_CSTRING
-  #include <cstring>
-#else
-  #include <string.h>
-#endif
-#ifdef HAVE_CSTDLIB
-  #include <cstdlib>
-#else
-  #include <stdlib.h>
-#endif
-#ifdef HAVE_CSTDIO
-  #include <cstdio>
-#else
-  #include <stdio.h>
-#endif
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 #include <iostream>
 
 using std::cout;
@@ -382,7 +370,7 @@ int main(int argc, char **argv) {
     char *display_name = (char *) 0;
     int i = 1;
 
-    FbTk::NLSInit("fluxbox.cat");
+    FbTk::I18n::init("fluxbox.cat");
 
     for (; i < argc; i++) {
         if (!strcmp(argv[i], "-display") || !strcmp(argv[i], "--display")) {
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index 07b7102..a7d3d4a 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -565,7 +565,7 @@ int main(int argc, char **argv) {
     bool check = 0;
     pid_t fb_pid = 0;
 
-    FbTk::NLSInit("fluxbox.cat");
+    FbTk::I18n::init("fluxbox.cat");
     _FB_USES_NLS;
 
     for (; i < argc; i++) {