diff --git a/SAX/Makefile b/SAX/Makefile
index 37c399bf..a6ac9040 100644
--- a/SAX/Makefile
+++ b/SAX/Makefile
@@ -56,13 +56,13 @@ libArabica$(LIBSUFFIX) : $(OBJS)
 ####
 # the .S files depends on symbols defined in this Makefile, hence
 # this slightly wacky rule
-saxlib.cpp : ParserConfig.h ArabicaConfig.h
+saxlib.cpp : ParserConfig.h ArabicaConfig.h saxlib.S
 	$(CPP) $(PARSER_CONFIG) -o saxlib.cpp saxlib.S 
 
-ParserConfig.h : Makefile ../Makefile.header
+ParserConfig.h : Makefile ../Makefile.header ParserConfig.S
 	$(CPP) $(PARSER_CONFIG) -o ParserConfig.h ParserConfig.S
 
-ArabicaConfig.h : Makefile ../Makefile.header
+ArabicaConfig.h : Makefile ../Makefile.header ArabicaConfig.S
 	$(CPP) $(PARSER_CONFIG) -o ArabicaConfig.h ArabicaConfig.S
 
 %.cpp : ArabicaConfig.h ParserConfig.h
diff --git a/SAX/saxlib.S b/SAX/saxlib.S
index 988cc5e8..b7f504ab 100644
--- a/SAX/saxlib.S
+++ b/SAX/saxlib.S
@@ -15,6 +15,8 @@
 #pragma warning(disable: 4786)
 #endif 
 
+include <SAX/ArabicaConfig.h>
+
 define NO_DEFAULT_PARSER
 include <SAX/XMLReader.h>
 
@@ -53,6 +55,10 @@ message("Pulling in Expat wrappers.")
 #endif	
 #endif
 
+ifndef ARABICA_NO_CODECVT_SPECIALISATIONS
+include <Utils/impl/codecvt_specialisations.cpp>
+endif
+
 #ifdef __GNUWIN32__
 #ifdef _LIB
 include <windows.h>
diff --git a/Utils/impl/codecvt_specialisations.cpp b/Utils/impl/codecvt_specialisations.cpp
new file mode 100644
index 00000000..2a59b696
--- /dev/null
+++ b/Utils/impl/codecvt_specialisations.cpp
@@ -0,0 +1,4 @@
+
+#include "codecvt_specialisations.h"
+
+std::locale::id std::codecvt<char, wchar_t, std::mbstate_t>::id;