diff --git a/src/loadsave.c b/src/loadsave.c
index 354f75b9..b3abaaca 100644
--- a/src/loadsave.c
+++ b/src/loadsave.c
@@ -31,6 +31,9 @@
 #ifndef _MSC_VER
 #include <unistd.h>
 #endif
+#if defined(WIN32)
+#include <windows.h>
+#endif
 #include <limits.h>
 #include <SDL_image.h>
 #include <SDL_endian.h>
diff --git a/src/main.c b/src/main.c
index 3ebdc773..7832da11 100644
--- a/src/main.c
+++ b/src/main.c
@@ -468,7 +468,9 @@ int Init_program(int argc,char * argv[])
   int file_in_command_line;
   T_Gradient_array initial_gradients;
   static char main_filename [MAX_PATH_CHARACTERS];
+#ifdef ENABLE_FILENAMES_ICONV
   static word main_filename_unicode[MAX_PATH_CHARACTERS];
+#endif
   static char main_directory[MAX_PATH_CHARACTERS];
   static char spare_filename [MAX_PATH_CHARACTERS];
   static char spare_directory[MAX_PATH_CHARACTERS];