11 files changed, 9 insertions, 18 deletions
diff --git a/ndb/src/kernel/vm/ArrayPool.hpp b/ndb/src/kernel/vm/ArrayPool.hpp
index 4a84047b614..284d29dcefa 100644
--- a/ndb/src/kernel/vm/ArrayPool.hpp
+++ b/ndb/src/kernel/vm/ArrayPool.hpp
@@ -17,12 +17,12 @@
 #ifndef ARRAY_POOL_HPP
 #define ARRAY_POOL_HPP
 
+#include <ndb_global.h>
+
 #include <pc.hpp>
 #include <ErrorReporter.hpp>
 #include <NdbMem.h>
 #include <Bitmask.hpp>
-#include <assert.h>
-#include <stddef.h>
 
 template <class T> class Array;
 template <class T> class SLList;
diff --git a/ndb/src/kernel/vm/ClusterConfiguration.cpp b/ndb/src/kernel/vm/ClusterConfiguration.cpp
index f04081ee3c1..3a6478380d1 100644
--- a/ndb/src/kernel/vm/ClusterConfiguration.cpp
+++ b/ndb/src/kernel/vm/ClusterConfiguration.cpp
@@ -14,6 +14,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <ndb_global.h>
+
 #include "ClusterConfiguration.hpp"
 #include <ErrorHandlingMacros.hpp>
 
@@ -27,9 +29,6 @@
 #include <signaldata/TupSizeAltReq.hpp>
 #include <signaldata/TuxSizeAltReq.hpp>
 
-#include <string.h>
-#include <assert.h>
-
 ClusterConfiguration::ClusterConfiguration()
 {
   for (unsigned i= 0; i< MAX_SIZEALT_BLOCKS; i++)             // initialize
diff --git a/ndb/src/kernel/vm/Configuration.cpp b/ndb/src/kernel/vm/Configuration.cpp
index 03495449787..706d75509f2 100644
--- a/ndb/src/kernel/vm/Configuration.cpp
+++ b/ndb/src/kernel/vm/Configuration.cpp
@@ -24,7 +24,6 @@
 #include <NdbMem.h>
 #include <NdbOut.hpp>
 #include <WatchDog.hpp>
-#include <NdbString.h>
 
 #include <getarg.h>
 
diff --git a/ndb/src/kernel/vm/DLHashTable.hpp b/ndb/src/kernel/vm/DLHashTable.hpp
index f7cd7ae5228..13a9632f8da 100644
--- a/ndb/src/kernel/vm/DLHashTable.hpp
+++ b/ndb/src/kernel/vm/DLHashTable.hpp
@@ -17,9 +17,8 @@
 #ifndef DL_HASHTABLE_HPP
 #define DL_HASHTABLE_HPP
 
+#include <ndb_global.h>
 #include "ArrayList.hpp"
-#include <assert.h>
-#include <stddef.h>
 
 /**
  * DLHashTable implements a hashtable using chaining
diff --git a/ndb/src/kernel/vm/DLHashTable2.hpp b/ndb/src/kernel/vm/DLHashTable2.hpp
index 8386790b0a6..6b166331631 100644
--- a/ndb/src/kernel/vm/DLHashTable2.hpp
+++ b/ndb/src/kernel/vm/DLHashTable2.hpp
@@ -17,10 +17,9 @@
 #ifndef DL_HASHTABLE2_HPP
 #define DL_HASHTABLE2_HPP
 
+#include <ndb_global.h>
+
 #include "ArrayList.hpp"
-#include <assert.h>
-#include <stddef.h>
-#include <new>
 
 /**
  * DLHashTable2 is a DLHashTable variant meant for cases where different
diff --git a/ndb/src/kernel/vm/GlobalData.hpp b/ndb/src/kernel/vm/GlobalData.hpp
index 3d312154c35..99b65727374 100644
--- a/ndb/src/kernel/vm/GlobalData.hpp
+++ b/ndb/src/kernel/vm/GlobalData.hpp
@@ -19,7 +19,6 @@
 
 #include <ndb_global.h>
 #include <kernel_types.h>
-#include <assert.h>
 #include "Prio.hpp"
 #include "VMSignal.hpp"
 
diff --git a/ndb/src/kernel/vm/SimulatedBlock.cpp b/ndb/src/kernel/vm/SimulatedBlock.cpp
index f36b3e43d42..e3f087d7d74 100644
--- a/ndb/src/kernel/vm/SimulatedBlock.cpp
+++ b/ndb/src/kernel/vm/SimulatedBlock.cpp
@@ -14,6 +14,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <ndb_global.h>
+
 #include "SimulatedBlock.hpp"
 #include <NdbOut.hpp>
 #include <GlobalData.hpp>
@@ -24,8 +26,6 @@
 #include <SignalLoggerManager.hpp>
 #include <FastScheduler.hpp>
 #include <NdbMem.h>
-#include <NdbStdio.h>
-#include <stdarg.h>
 #include <signaldata/EventReport.hpp>
 #include <signaldata/ContinueFragmented.hpp>
 #include <signaldata/NodeStateSignalData.hpp>
diff --git a/ndb/src/kernel/vm/al_test/arrayListTest.cpp b/ndb/src/kernel/vm/al_test/arrayListTest.cpp
index 6f2bb7fc312..bb320106653 100644
--- a/ndb/src/kernel/vm/al_test/arrayListTest.cpp
+++ b/ndb/src/kernel/vm/al_test/arrayListTest.cpp
@@ -17,7 +17,6 @@
 
 
 #include <ndb_global.hpp>
-#include <assert.h>
 
 #include <ArrayList.hpp>
 #include <NdbOut.hpp>
diff --git a/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp b/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
index 01cc5ede5f7..e80905121e1 100644
--- a/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
+++ b/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
@@ -17,7 +17,6 @@
 
 
 #include <ndb_global.h>
-#include <assert.h>
 
 #include <ArrayList.hpp>
 #include <NdbOut.hpp>
diff --git a/ndb/src/kernel/vm/al_test/main.cpp b/ndb/src/kernel/vm/al_test/main.cpp
index 48f6d71f4cf..23193b50725 100644
--- a/ndb/src/kernel/vm/al_test/main.cpp
+++ b/ndb/src/kernel/vm/al_test/main.cpp
@@ -15,7 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <ndb_global.h>
-#include <assert.h>
 
 #include <ArrayList.hpp>
 #include <NdbOut.hpp>
diff --git a/ndb/src/kernel/vm/testLongSig/testLongSig.cpp b/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
index 7a1e6a3e93d..af4e2ca6e24 100644
--- a/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
+++ b/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
@@ -16,7 +16,6 @@
 
 
 #include <ndb_global.h>
-#include <assert.h>
 #include <editline/editline.h>
 #include <SignalSender.hpp>