diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 00e85696fd..60f79998e4 100644
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -41,28 +41,34 @@ extern "C" {
 #include <switch.h>
 #include <switch_platform.h>
 
+#ifdef WIN32
+#define SEP "\\"
+#else
+#define SEP "/"
+#endif
+
 #ifndef SWITCH_PREFIX_DIR
 #define SWITCH_PREFIX_DIR "."
 #endif
 
 #ifndef SWITCH_MOD_DIR
-#define SWITCH_MODDIR "./mod"
+#define SWITCH_MOD_DIR SWITCH_PREFIX_DIR SEP "mod"
 #endif
 
 #ifndef SWITCH_CONF_DIR
-#define SWITCH_CONF_DIR "./conf"
+#define SWITCH_CONF_DIR SWITCH_PREFIX_DIR SEP "conf"
 #endif
 
 #ifndef SWITCH_LOG_DIR
-#define SWITCH_LOG_DIR "./log"
+#define SWITCH_LOG_DIR SWITCH_PREFIX_DIR SEP "log"
 #endif
 
 #ifndef SWITCH_DB_DIR
-#define SWITCH_DB_DIR "./db"
+#define SWITCH_DB_DIR SWITCH_PREFIX_DIR SEP "db"
 #endif
 
 #ifndef SWITCH_SCRIPT_DIR
-#define SWITCH_SCRIPT_DIR "./scripts"
+#define SWITCH_SCRIPT_DIR SWITCH_PREFIX_DIR SEP "scripts"
 #endif
 
 struct switch_directories {
diff --git a/src/switch_core.c b/src/switch_core.c
index 97ddcddcf8..da7eed5daa 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -39,15 +39,6 @@ static char *embedding[] = { "", "-e", "" };
 EXTERN_C void xs_init(pTHX);
 #endif
 
-
-#ifndef SWITCH_DB_DIR
-#ifdef WIN32
-#define SWITCH_DB_DIR ".\\db"
-#else
-#define SWITCH_DB_DIR "/usr/local/freeswitch/db"
-#endif
-#endif
-
 struct switch_core_session {
 	unsigned long id;
 	char name[80];