diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index aec789c46..7e652002d 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -17,7 +17,6 @@ noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a
 
 libneutrino_driver_a_SOURCES = \
 	abstime.c \
-	encoding.cpp \
 	fontrenderer.cpp \
 	framebuffer.cpp \
 	fb_window.cpp \
diff --git a/src/system/settings.h b/src/system/settings.h
index 862990db5..7ca4c9990 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -35,6 +35,7 @@
 #include <system/localize.h>
 #include <configfile.h>
 #include <zapit/client/zapitclient.h>
+#include <zapit/client/zapittools.h>
 
 #include <string>
 
@@ -420,7 +421,7 @@ struct SNeutrinoSettings
 	int led_blink;
 #define FILESYSTEM_ENCODING_TO_UTF8(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a).c_str())
 #define UTF8_TO_FILESYSTEM_ENCODING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::UTF8_to_Latin1(a).c_str())
-#define FILESYSTEM_ENCODING_TO_UTF8_STRING(a) (g_settings.filesystem_is_utf8 ? (a) : Latin1_to_UTF8(a))
+#define FILESYSTEM_ENCODING_TO_UTF8_STRING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a))
 
 
 #if 0