3 files changed, 8 insertions, 10 deletions
diff --git a/server-tools/instance-manager/listener.cc b/server-tools/instance-manager/listener.cc
index 4d8a33e7db1..4c32d10ab09 100644
--- a/server-tools/instance-manager/listener.cc
+++ b/server-tools/instance-manager/listener.cc
@@ -17,12 +17,12 @@
 #pragma implementation
 #endif
 
-#include "listener.h"
-
 #include <my_global.h>
 #include <mysql.h>
-#include <violite.h>
+#include <my_sys.h>
+#include "listener.h"
 
+#include <violite.h>
 #include <sys/stat.h>
 #ifndef __WIN__
 #include <sys/un.h>
diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc
index bf08f963aa3..de611878bb4 100644
--- a/server-tools/instance-manager/mysql_connection.cc
+++ b/server-tools/instance-manager/mysql_connection.cc
@@ -17,13 +17,12 @@
 #pragma implementation
 #endif
 
-#include "mysql_connection.h"
-
-#include <m_string.h>
-#include <m_string.h>
 #include <my_global.h>
 #include <mysql.h>
 #include <my_sys.h>
+#include "mysql_connection.h"
+
+#include <m_string.h>
 #include <violite.h>
 
 #include "command.h"
@@ -88,7 +87,7 @@ bool Mysql_connection::init()
   {
     ulong seed1= (ulong) &rand_st + rand();
     ulong seed2= (ulong) rand() + (ulong) time(0);
-    randominit(&rand_st, seed1, seed2);
+    my_rnd_init(&rand_st, seed1, seed2);
   }
 
   /* Fill scramble - server's random message used for handshake */
diff --git a/server-tools/instance-manager/mysql_connection.h b/server-tools/instance-manager/mysql_connection.h
index 56bbf76e146..933dd820372 100644
--- a/server-tools/instance-manager/mysql_connection.h
+++ b/server-tools/instance-manager/mysql_connection.h
@@ -17,7 +17,6 @@
 #define INCLUDES_MYSQL_INSTANCE_MANAGER_MYSQL_CONNECTION_H
 
 #include "thread_registry.h"
-#include <mysql_com.h>
 
 #if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
 #pragma interface
@@ -55,7 +54,7 @@ private:
   Thread_registry *thread_registry;
   User_map *user_map;
   NET net;
-  struct rand_struct rand_st;
+  struct my_rnd_struct rand_st;
   char scramble[SCRAMBLE_LENGTH + 1];
   uint status;
   ulong client_capabilities;