diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc
index de23fd2b..2190a769 100644
--- a/src/FbTk/FbString.cc
+++ b/src/FbTk/FbString.cc
@@ -38,7 +38,11 @@
   #include <stdlib.h>
 #endif
 
-#include <stdio.h>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 
 #include <langinfo.h>
 #include <locale.h>
@@ -47,7 +51,7 @@
 #include <vector>
 
 #ifdef HAVE_FRIBIDI
-#include <fribidi/fribidi.h>
+  #include <fribidi/fribidi.h>
 #endif