diff --git a/src/mod/applications/mod_expr/exprpars.c b/src/mod/applications/mod_expr/exprpars.c
index 1b8620cf30..25e66b8e32 100644
--- a/src/mod/applications/mod_expr/exprpars.c
+++ b/src/mod/applications/mod_expr/exprpars.c
@@ -12,7 +12,6 @@
 
 #include "exprpriv.h"
 #include "exprmem.h"
-#include "switch_utils.h"
 
 /* Data structure used by parser */
 typedef struct _exprToken {
diff --git a/src/mod/applications/mod_expr/exprpriv.h b/src/mod/applications/mod_expr/exprpriv.h
index b3d6d1d714..a166d0dc91 100644
--- a/src/mod/applications/mod_expr/exprpriv.h
+++ b/src/mod/applications/mod_expr/exprpriv.h
@@ -206,6 +206,16 @@ struct _exprNode
 int exprFuncListAddType(exprFuncList *flist, char *name, int type, int min, int max, int refmin, int refmax);
 int exprFuncListGet(exprFuncList *flist, char *name, exprFuncType *ptr, int *type, int *min, int *max, int *refmin, int *refmax);
 
+#ifdef WIN32
+#define SWITCH_DECLARE(type)			__declspec(dllimport) type __stdcall
+#else
+#define SWITCH_DECLARE(type) type 
+#endif
+
+SWITCH_DECLARE(int) switch_isalnum(int c);
+SWITCH_DECLARE(int) switch_isalpha(int c);
+SWITCH_DECLARE(int) switch_isdigit(int c);
+SWITCH_DECLARE(int) switch_isspace(int c);
 
 #ifdef __cplusplus
 }
diff --git a/src/mod/applications/mod_expr/exprutil.c b/src/mod/applications/mod_expr/exprutil.c
index 8bcb2a8a53..6ffba06683 100644
--- a/src/mod/applications/mod_expr/exprutil.c
+++ b/src/mod/applications/mod_expr/exprutil.c
@@ -11,8 +11,6 @@
 #include "exprincl.h"
 
 #include "exprpriv.h"
-#include "switch_utils.h"
-
 
 /* Return the version number */
 void exprGetVersion(int *major, int *minor)