diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c
index c32abce20d3..010c4380fdd 100644
--- a/netware/mysql_test_run.c
+++ b/netware/mysql_test_run.c
@@ -25,6 +25,7 @@
 #include <sys/stat.h>
 #include <sys/mode.h>
 #include "my_manage.h"
+#include "mysql_version.h"
 #ifdef __NETWARE__
 #define strindex(a,b) ((char*)strindex(a,b))
 #define strstr(a,b)   ((char*)strstr(a,b))
diff --git a/netware/mysqld_safe.c b/netware/mysqld_safe.c
index 00e7d1bcd51..6ed04c9ff0d 100644
--- a/netware/mysqld_safe.c
+++ b/netware/mysqld_safe.c
@@ -28,6 +28,7 @@
 
 #include "my_config.h"
 #include "my_manage.h"
+#include "mysql_version.h"
 
 /******************************************************************************
 
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 2e36593a126..bae85d8c092 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -482,7 +482,7 @@ sp_head::operator new(size_t size) throw()
 }
 
 void 
-sp_head::operator delete(void *ptr, size_t size)
+sp_head::operator delete(void *ptr, size_t size) throw()
 {
   DBUG_ENTER("sp_head::operator delete");
   MEM_ROOT own_root;