diff --git a/Source/exehead/config.h b/Source/exehead/config.h
index b150e8b8..7e981bcf 100644
--- a/Source/exehead/config.h
+++ b/Source/exehead/config.h
@@ -134,8 +134,6 @@
   #define NSIS_DEFAULT_LANG 1033
 #endif
 
-typedef char NSIS_STRING[NSIS_MAX_STRLEN];
-
 #endif//!APSTUDIO_INVOKED
 
 #endif // NSIS_CONFIG_H
diff --git a/Source/exehead/fileform.h b/Source/exehead/fileform.h
index ae94879a..97c13330 100644
--- a/Source/exehead/fileform.h
+++ b/Source/exehead/fileform.h
@@ -255,6 +255,10 @@ enum {
   BLOCKS_NUM
 };
 
+// nsis strings
+
+typedef char NSIS_STRING[NSIS_MAX_STRLEN];
+
 // Settings common to both installers and uninstallers
 typedef struct
 {
diff --git a/Source/exehead/state.h b/Source/exehead/state.h
index 082a893d..35e54280 100644
--- a/Source/exehead/state.h
+++ b/Source/exehead/state.h
@@ -1,3 +1,5 @@
+#include "fileform.h"
+
 extern NSIS_STRING g_usrvars[1];
 
 #define state_command_line        g_usrvars[20]