diff --git a/include/Makefile.am b/include/Makefile.am
index cb6da7bbb3a..83cf4290d3d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -16,7 +16,7 @@
 # MA 02111-1307, USA
 
 BUILT_SOURCES =		mysql_version.h m_ctype.h my_config.h
-pkginclude_HEADERS =	dbug.h m_string.h my_sys.h my_list.h \
+pkginclude_HEADERS =	my_dbug.h m_string.h my_sys.h my_list.h \
 			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
 		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
 			errmsg.h my_global.h my_net.h my_alloc.h \
diff --git a/include/dbug.h b/include/my_dbug.h
similarity index 100%
rename from include/dbug.h
rename to include/my_dbug.h
diff --git a/include/my_global.h b/include/my_global.h
index 49ca0e03f89..39b6cada0e3 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -392,7 +392,7 @@ typedef unsigned short ushort;
 #define DBUG_OFF
 #endif
 
-#include <dbug.h>
+#include <my_dbug.h>
 
 #define MIN_ARRAY_SIZE	0	/* Zero or One. Gcc allows zero*/
 #define ASCII_BITS_USED 8	/* Bit char used */
diff --git a/libmysql/get_password.c b/libmysql/get_password.c
index 53eeb1080ce..e6221ea556e 100644
--- a/libmysql/get_password.c
+++ b/libmysql/get_password.c
@@ -23,7 +23,6 @@
 #include "mysql.h"
 #include <m_string.h>
 #include <m_ctype.h>
-#include <dbug.h>
 
 #if defined(HAVE_BROKEN_GETPASS) && !defined(HAVE_GETPASSPHRASE)
 #undef HAVE_GETPASS
diff --git a/libmysqld/lib_vio.c b/libmysqld/lib_vio.c
index 821923fe667..448c11f9abd 100644
--- a/libmysqld/lib_vio.c
+++ b/libmysqld/lib_vio.c
@@ -33,7 +33,6 @@
 #include <my_sys.h>
 #include <my_net.h>
 #include <m_string.h>
-#include <dbug.h>
 #include <assert.h>
 
 #ifndef __WIN__
diff --git a/sql/table.cc b/sql/table.cc
index d1e2c86e5ab..a26ab89bd97 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1180,7 +1180,7 @@ bool check_table_name(const char *name, uint length)
       }
     }
 #endif
-    if (*name == '/' || *name == FN_LIBCHAR || *name == FN_EXTCHAR)
+    if (*name == '/' || *name == '\\' || *name == FN_EXTCHAR)
       return 1;
     name++;
   }