--- a/src/server/util/uri.cpp	Thu Jan 26 18:53:52 2017 +0100
+++ b/src/server/util/uri.cpp	Sat Jan 28 10:38:34 2017 +0100
@@ -31,17 +31,17 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef XP_WIN32
+#define _MBCS
+#include <windows.h>
+#include <mbctype.h>
+#endif
+
 #include "util.h"
 #include "pool.h"
 //include "frame/conf_api.h"
 //include "support/stringvalue.h"
 
-#ifdef WINDOWS
-#define _MBCS
-#include <windows.h>
-#include <mbctype.h>
-#endif
-
 #ifdef XP_WIN32
 static PRBool _getfullpathname = -1;
 #endif /* XP_WIN32 */