diff --git a/sql/updates/4105_8030_03_mangos_npc_trainer.sql b/sql/updates/4105_8030_03_mangos_npc_trainer.sql
index a1a5a45e86..ce6c39f8ef 100644
--- a/sql/updates/4105_8030_03_mangos_npc_trainer.sql
+++ b/sql/updates/4105_8030_03_mangos_npc_trainer.sql
@@ -1,2 +1,4 @@
 -- ALTER TABLE db_version CHANGE COLUMN required_8021_01_mangos_spell_proc_event required_8030_03_mangos_npc_trainer bit;
 
+DELETE FROM npc_trainer WHERE spell = 64904;
+
diff --git a/src/shared/Config/dotconfpp/dotconfpp.cpp b/src/shared/Config/dotconfpp/dotconfpp.cpp
index edb8527374..e779637256 100644
--- a/src/shared/Config/dotconfpp/dotconfpp.cpp
+++ b/src/shared/Config/dotconfpp/dotconfpp.cpp
@@ -3,6 +3,18 @@
 
 #include "dotconfpp.h"
 
+#ifdef WIN32
+#define PATH_MAX _MAX_PATH
+#define strcasecmp stricmp
+#define realpath(path,resolved_path) _fullpath(resolved_path, path, _MAX_PATH)
+#include <io.h>
+#else
+#include <unistd.h>
+#include <limits.h>
+#include <stdint.h>
+#include <strings.h>
+#endif
+
 #if !defined(R_OK)
 #define R_OK 04
 #endif
diff --git a/src/shared/Config/dotconfpp/dotconfpp.h b/src/shared/Config/dotconfpp/dotconfpp.h
index 7887f86ccc..51455854ee 100644
--- a/src/shared/Config/dotconfpp/dotconfpp.h
+++ b/src/shared/Config/dotconfpp/dotconfpp.h
@@ -15,19 +15,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef WIN32
-#define PATH_MAX _MAX_PATH
-#define snprintf _snprintf
-#define strcasecmp stricmp
-#define realpath(path,resolved_path) _fullpath(resolved_path, path, _MAX_PATH)
-#include <io.h>
-#else
-#include <unistd.h>
-#include <limits.h>
-#include <stdint.h>
-#include <strings.h>
-#endif
-
 #include "mempool.h"
 
 class DOTCONFDocument;