more removing of "system" files and introducing ndb_global/my_global

BitKeeper/deleted/.del-NdbStdio.h~17be17a4f591c671:
  Delete: ndb/include/portlib/NdbStdio.h
BitKeeper/deleted/.del-NdbString.h~1f9f26341ce5f5f:
  Delete: ndb/include/util/NdbString.h
BitKeeper/deleted/.del-NdbConstant.hpp~de1038c1758cc1f9:
  Delete: ndb/include/portlib/NdbConstant.hpp
BitKeeper/deleted/.del-NdbUnistd.h~a1b3840adcd49985:
  Delete: ndb/include/portlib/NdbUnistd.h

115 files changed, 66 insertions, 240 deletions

diff --git a/ndb/src/client/odbc/common/Ctx.cpp b/ndb/src/client/odbc/common/Ctx.cpp
index 85edbd1a63f..44689657788 100644
--- a/ndb/src/client/odbc/common/Ctx.cpp
+++ b/ndb/src/client/odbc/common/Ctx.cpp
@@ -14,11 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <NdbUnistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <NdbStdio.h>
-#include <stdarg.h>
+#include <ndb_global.h>
 #include <NdbApi.hpp>
 #include <common/common.hpp>
 #include "DiagArea.hpp"
diff --git a/ndb/src/client/odbc/common/DataField.cpp b/ndb/src/client/odbc/common/DataField.cpp
index 5853f90c08f..dfd4137ffd9 100644
--- a/ndb/src/client/odbc/common/DataField.cpp
+++ b/ndb/src/client/odbc/common/DataField.cpp
@@ -14,14 +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 <NdbUnistd.h>
-#include <NdbStdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <limits.h>
-#include <math.h>
+#include <ndb_global.h>
 #include "DataField.hpp"
-#include <time.h>
 
 #ifndef INT_MAX
 #define INT_MAX		(2147483647)
diff --git a/ndb/src/client/odbc/common/DataType.cpp b/ndb/src/client/odbc/common/DataType.cpp
index 62bd622b9b5..9c9629f1d24 100644
--- a/ndb/src/client/odbc/common/DataType.cpp
+++ b/ndb/src/client/odbc/common/DataType.cpp
@@ -15,7 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "DataType.hpp"
-#include <NdbStdio.h>
 
 // SqlType
 
diff --git a/ndb/src/client/odbc/common/OdbcData.cpp b/ndb/src/client/odbc/common/OdbcData.cpp
index d2402c7e0ab..2e1bd768aec 100644
--- a/ndb/src/client/odbc/common/OdbcData.cpp
+++ b/ndb/src/client/odbc/common/OdbcData.cpp
@@ -14,9 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <new>
-#include <string.h>
-#include <NdbStdio.h>
+#include <ndb_global.h>
 #include "OdbcData.hpp"
 
 OdbcData::OdbcData() :
diff --git a/ndb/src/common/debugger/EventLogger.cpp b/ndb/src/common/debugger/EventLogger.cpp
index 12f01890c54..dd957d67383 100644
--- a/ndb/src/common/debugger/EventLogger.cpp
+++ b/ndb/src/common/debugger/EventLogger.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 "EventLogger.hpp"
 
 #include <NdbConfig.h>
@@ -22,10 +24,6 @@
 #include <GrepEvent.hpp>
 #include <NodeState.hpp>
 #include <version.h>
-#include <NdbStdio.h>
-
-#include <string.h>
-#include <ctype.h>
 
 //
 // PUBLIC
diff --git a/ndb/src/common/debugger/SignalLoggerManager.cpp b/ndb/src/common/debugger/SignalLoggerManager.cpp
index 35e49f3c1eb..3839a348222 100644
--- a/ndb/src/common/debugger/SignalLoggerManager.cpp
+++ b/ndb/src/common/debugger/SignalLoggerManager.cpp
@@ -19,9 +19,6 @@
 #include "SignalLoggerManager.hpp"
 #include <LongSignal.hpp>
 
-#include <assert.h>
-#include <time.h>
-
 #include <DebuggerNames.hpp>
 
 SignalLoggerManager::SignalLoggerManager()
diff --git a/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp b/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
index 11ee0948c17..84410a2b2db 100644
--- a/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
+++ b/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
@@ -15,7 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include <NdbStdio.h>
 #include <kernel_types.h>
 #include <BlockNumbers.h>
 #include <signaldata/CloseComReqConf.hpp>
diff --git a/ndb/src/common/debugger/signaldata/ContinueB.cpp b/ndb/src/common/debugger/signaldata/ContinueB.cpp
index 054909d961e..1be6da86cb1 100644
--- a/ndb/src/common/debugger/signaldata/ContinueB.cpp
+++ b/ndb/src/common/debugger/signaldata/ContinueB.cpp
@@ -15,7 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include <NdbStdio.h>
 #include <kernel_types.h>
 #include <BlockNumbers.h>
 #include <signaldata/DihContinueB.hpp>
diff --git a/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp b/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
index f3b4b97f0fd..2e900de8f70 100644
--- a/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
+++ b/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
@@ -15,7 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include <NdbStdio.h>
 #include <kernel_types.h>
 #include <BlockNumbers.h>
 #include <signaldata/PrepFailReqRef.hpp>
diff --git a/ndb/src/common/debugger/signaldata/SystemError.cpp b/ndb/src/common/debugger/signaldata/SystemError.cpp
index 5ed7dc6b18d..549c34710a0 100644
--- a/ndb/src/common/debugger/signaldata/SystemError.cpp
+++ b/ndb/src/common/debugger/signaldata/SystemError.cpp
@@ -15,7 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include <NdbStdio.h>
 #include <kernel_types.h>
 #include <BlockNumbers.h>
 #include <signaldata/SystemError.hpp>
diff --git a/ndb/src/common/logger/FileLogHandler.cpp b/ndb/src/common/logger/FileLogHandler.cpp
index 8e83510788b..d13dd7b2a78 100644
--- a/ndb/src/common/logger/FileLogHandler.cpp
+++ b/ndb/src/common/logger/FileLogHandler.cpp
@@ -18,12 +18,6 @@
 
 #include <File.hpp>
 
-#include <NdbStdio.h>
-#include <sys/param.h>
-
-#include <errno.h>
-#include <string.h>
-
 //
 // PUBLIC
 //
diff --git a/ndb/src/common/logger/LogHandler.cpp b/ndb/src/common/logger/LogHandler.cpp
index d1445555e87..83d479c82fd 100644
--- a/ndb/src/common/logger/LogHandler.cpp
+++ b/ndb/src/common/logger/LogHandler.cpp
@@ -17,9 +17,6 @@
 #include "LogHandler.hpp"
 
 #include <NdbTick.h>
-#include <NdbString.h>
-
-#include <time.h>
 
 //
 // PUBLIC
diff --git a/ndb/src/common/logger/LogHandlerList.cpp b/ndb/src/common/logger/LogHandlerList.cpp
index f020ad23e56..62495d7566b 100644
--- a/ndb/src/common/logger/LogHandlerList.cpp
+++ b/ndb/src/common/logger/LogHandlerList.cpp
@@ -17,8 +17,6 @@
 #include "LogHandlerList.hpp"
 
 #include <LogHandler.hpp>
-#include <NdbStdio.h>
-#include <ndb_types.h>
 
 //
 // PUBLIC
diff --git a/ndb/src/common/logger/Logger.cpp b/ndb/src/common/logger/Logger.cpp
index 6eaafd91854..9c9f1eece18 100644
--- a/ndb/src/common/logger/Logger.cpp
+++ b/ndb/src/common/logger/Logger.cpp
@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <stdarg.h>
+#include <ndb_global.h>
 
 #include "Logger.hpp"
 
@@ -27,12 +27,6 @@
 #include <SysLogHandler.hpp>
 #endif
 
-#include <NdbStdio.h>
-#include <ndb_types.h>
-#include <NdbString.h>
-
-#include <assert.h>
-
 //
 // PUBLIC
 //
diff --git a/ndb/src/common/logger/SysLogHandler.cpp b/ndb/src/common/logger/SysLogHandler.cpp
index f3511bf5638..a300c487eb9 100644
--- a/ndb/src/common/logger/SysLogHandler.cpp
+++ b/ndb/src/common/logger/SysLogHandler.cpp
@@ -17,7 +17,6 @@
 #include "SysLogHandler.hpp"
 
 #include <syslog.h>
-#include <NdbString.h>
 
 //
 // PUBLIC
diff --git a/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp b/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp
index 36aac5d0e15..44ee11717b4 100644
--- a/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp
+++ b/ndb/src/common/logger/listtest/LogHandlerListUnitTest.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 "LogHandlerListUnitTest.hpp"
 
diff --git a/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp b/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp
index 4b0241a0b03..017dcb79c1f 100644
--- a/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp
+++ b/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp
@@ -25,12 +25,8 @@
 #endif
 
 #include <NdbOut.hpp>
-#include <NdbStdio.h>
 #include <NdbMain.h>
 
-#include <string.h>
-#include <assert.h>
-
 typedef bool (*TESTFUNC)(const char*);
 typedef struct
 {
diff --git a/ndb/src/common/mgmcommon/Config.hpp b/ndb/src/common/mgmcommon/Config.hpp
index 1314abe004a..284256d9ed6 100644
--- a/ndb/src/common/mgmcommon/Config.hpp
+++ b/ndb/src/common/mgmcommon/Config.hpp
@@ -23,9 +23,7 @@
 #include <kernel_types.h>
 
 #include <NdbOut.hpp>
-#include <NdbStdio.h>
 #include <ndb_limits.h>
-#include <NdbConstant.hpp>
 #include <Properties.hpp>
 
 /**
diff --git a/ndb/src/common/mgmcommon/InitConfigFileParser.cpp b/ndb/src/common/mgmcommon/InitConfigFileParser.cpp
index 33652fa472c..62c4bd28857 100644
--- a/ndb/src/common/mgmcommon/InitConfigFileParser.cpp
+++ b/ndb/src/common/mgmcommon/InitConfigFileParser.cpp
@@ -14,16 +14,13 @@
    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 "InitConfigFileParser.hpp"
-#include <string.h>
-#include <errno.h>
 #include "Config.hpp"
 #include "MgmtErrorReporter.hpp"
 #include <NdbOut.hpp>
 #include "ConfigInfo.hpp"
-#include <stdarg.h>
-#include <ctype.h>
-#include <NdbString.h>
 
 const int MAX_LINE_LENGTH = 120;  // Max length of line of text in config file
 static void trim(char *);
diff --git a/ndb/src/common/portlib/ose/NdbCondition.c b/ndb/src/common/portlib/ose/NdbCondition.c
index 2ab6e49006b..73a2dbc5d66 100644
--- a/ndb/src/common/portlib/ose/NdbCondition.c
+++ b/ndb/src/common/portlib/ose/NdbCondition.c
@@ -17,7 +17,6 @@
 
 #include "NdbCondition.h"
 #include <pthread.h>
-#include <assert.h>
 #include <sys/types.h>
 #include <malloc.h>
 
diff --git a/ndb/src/common/portlib/ose/NdbMem.c b/ndb/src/common/portlib/ose/NdbMem.c
index 6d922e4c073..0e38024bbb4 100644
--- a/ndb/src/common/portlib/ose/NdbMem.c
+++ b/ndb/src/common/portlib/ose/NdbMem.c
@@ -17,7 +17,6 @@
 
 #include "NdbMem.h"
 
-#include <assert.h>
 
 #if defined NDB_OSE
 #include <ose.h>
@@ -134,7 +133,6 @@ int NdbMem_MemUnlockAll(){
 }
 
 #else
-#include <assert.h>
 #include <stdlib.h>
 
 
diff --git a/ndb/src/common/portlib/ose/NdbMutex.c b/ndb/src/common/portlib/ose/NdbMutex.c
index 859ddefd536..253c0e412ff 100644
--- a/ndb/src/common/portlib/ose/NdbMutex.c
+++ b/ndb/src/common/portlib/ose/NdbMutex.c
@@ -19,7 +19,6 @@
 
 #include <pthread.h>
 #include <stdlib.h>
-#include <assert.h>
 
 
 NdbMutex* NdbMutex_Create(void)
diff --git a/ndb/src/common/portlib/ose/NdbOut.cpp b/ndb/src/common/portlib/ose/NdbOut.cpp
index 0ee12249ff5..eb81bc9d971 100644
--- a/ndb/src/common/portlib/ose/NdbOut.cpp
+++ b/ndb/src/common/portlib/ose/NdbOut.cpp
@@ -14,12 +14,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include "NdbOut.hpp"
-#include <NdbStdio.h>
-#include <stdarg.h>
-#include <NdbUnistd.h>
-#include <string.h>
+#include <ndb_global.h>
 
+#include "NdbOut.hpp"
 
 #if defined NDB_SOFTOSE
 #include <dbgprintf.h>
diff --git a/ndb/src/common/portlib/ose/NdbThread.c b/ndb/src/common/portlib/ose/NdbThread.c
index 41a5f181c40..e46903a5cce 100644
--- a/ndb/src/common/portlib/ose/NdbThread.c
+++ b/ndb/src/common/portlib/ose/NdbThread.c
@@ -18,7 +18,6 @@
 #include "NdbThread.h"
 #include <pthread.h>
 #include <malloc.h>
-#include <assert.h>
 #include <string.h>
 #include <NdbOut.hpp>
 
diff --git a/ndb/src/common/portlib/unix/NdbCondition.c b/ndb/src/common/portlib/unix/NdbCondition.c
index 35b80821052..024c6b433f3 100644
--- a/ndb/src/common/portlib/unix/NdbCondition.c
+++ b/ndb/src/common/portlib/unix/NdbCondition.c
@@ -15,16 +15,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include <NdbCondition.h>
-#include <pthread.h>
-#include <assert.h>
-#include <sys/types.h>
-#if defined NDB_MACOSX
-#include <stdlib.h>
-#else
-#include <malloc.h>
-#endif
+#include <ndb_global.h>
 
+#include <NdbCondition.h>
+#include <NdbThread.h>
 #include <NdbMutex.h>
 
 struct NdbCondition
diff --git a/ndb/src/common/portlib/unix/NdbDaemon.c b/ndb/src/common/portlib/unix/NdbDaemon.c
index eb3ca339fa4..fbe684598f2 100644
--- a/ndb/src/common/portlib/unix/NdbDaemon.c
+++ b/ndb/src/common/portlib/unix/NdbDaemon.c
@@ -15,8 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <ndb_global.h>
-#include <assert.h>
-#include <fcntl.h>
 #include "NdbDaemon.h"
 
 #define NdbDaemon_ErrorSize 500
diff --git a/ndb/src/common/portlib/unix/NdbEnv.c b/ndb/src/common/portlib/unix/NdbEnv.c
index b01e3b239ca..d294e0b52ca 100644
--- a/ndb/src/common/portlib/unix/NdbEnv.c
+++ b/ndb/src/common/portlib/unix/NdbEnv.c
@@ -15,9 +15,9 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "NdbEnv.h"
-#include <string.h>
-#include <stdlib.h>
+#include <ndb_global.h>
+
+#include <NdbEnv.h>
 
 const char* NdbEnv_GetEnv(const char* name, char * buf, int buflen)
 {
diff --git a/ndb/src/common/portlib/unix/NdbMem.c b/ndb/src/common/portlib/unix/NdbMem.c
index 3b47494967f..cdc5412815d 100644
--- a/ndb/src/common/portlib/unix/NdbMem.c
+++ b/ndb/src/common/portlib/unix/NdbMem.c
@@ -15,14 +15,9 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "NdbMem.h"
+#include <ndb_global.h>
 
-#include <assert.h>
-#include <assert.h>
-#include <stdlib.h>
-#ifndef NDB_MACOSX
-#include <sys/mman.h>
-#endif
+#include <NdbMem.h>
 
 void NdbMem_Create()
 {
diff --git a/ndb/src/common/portlib/unix/NdbMutex.c b/ndb/src/common/portlib/unix/NdbMutex.c
index 3cadc0667e7..50f314d2683 100644
--- a/ndb/src/common/portlib/unix/NdbMutex.c
+++ b/ndb/src/common/portlib/unix/NdbMutex.c
@@ -15,11 +15,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "NdbMutex.h"
+#include <ndb_global.h>
 
-#include <pthread.h>
-#include <stdlib.h>
-#include <assert.h>
+#include <NdbThread.h>
+#include <NdbMutex.h>
 
 NdbMutex* NdbMutex_Create(void)
 {
diff --git a/ndb/src/common/portlib/unix/NdbThread.c b/ndb/src/common/portlib/unix/NdbThread.c
index 3665c4c9159..d18c0769b98 100644
--- a/ndb/src/common/portlib/unix/NdbThread.c
+++ b/ndb/src/common/portlib/unix/NdbThread.c
@@ -15,16 +15,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+
 #include "NdbThread.h"
 #include <pthread.h>
-#ifdef NDB_MACOSX
-#include <stdlib.h>
-#else
-#include <malloc.h>
-#endif
-#include <assert.h>
-#include <string.h>
-#include <NdbStdio.h>
 
 #define MAX_THREAD_NAME 16
 
diff --git a/ndb/src/common/portlib/win32/NdbCondition.c b/ndb/src/common/portlib/win32/NdbCondition.c
index 12b508cf33b..77869b673de 100644
--- a/ndb/src/common/portlib/win32/NdbCondition.c
+++ b/ndb/src/common/portlib/win32/NdbCondition.c
@@ -18,7 +18,6 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <windows.h>
-#include <assert.h>
 #include <sys/types.h>
 
 #include "NdbCondition.h"
diff --git a/ndb/src/common/portlib/win32/NdbMem.c b/ndb/src/common/portlib/win32/NdbMem.c
index 274dc31353f..ab7123b0a29 100644
--- a/ndb/src/common/portlib/win32/NdbMem.c
+++ b/ndb/src/common/portlib/win32/NdbMem.c
@@ -16,8 +16,6 @@
 
 
 #include <windows.h>
-#include <assert.h>
-#include <NdbStdio.h>
 
 #include "NdbMem.h"
 
diff --git a/ndb/src/common/portlib/win32/NdbMutex.c b/ndb/src/common/portlib/win32/NdbMutex.c
index c93384d91db..e797024d5bb 100644
--- a/ndb/src/common/portlib/win32/NdbMutex.c
+++ b/ndb/src/common/portlib/win32/NdbMutex.c
@@ -19,7 +19,6 @@
 #include <ws2tcpip.h>
 #include <windows.h>
 #include <time.h>
-#include <assert.h>
 
 #include "NdbMutex.h"
 
diff --git a/ndb/src/common/portlib/win32/NdbThread.c b/ndb/src/common/portlib/win32/NdbThread.c
index ae3c74be70d..1f052f034e8 100644
--- a/ndb/src/common/portlib/win32/NdbThread.c
+++ b/ndb/src/common/portlib/win32/NdbThread.c
@@ -17,7 +17,6 @@
 
 #include <windows.h>
 #include <process.h>
-#include <assert.h>
 
 #include "NdbThread.h"
 
diff --git a/ndb/src/common/transporter/OSE_Receiver.cpp b/ndb/src/common/transporter/OSE_Receiver.cpp
index 558dee92d8d..b7d47b2f88c 100644
--- a/ndb/src/common/transporter/OSE_Receiver.cpp
+++ b/ndb/src/common/transporter/OSE_Receiver.cpp
@@ -20,7 +20,6 @@
 #include "TransporterCallback.hpp"
 #include <TransporterRegistry.hpp>
 #include "TransporterInternalDefinitions.hpp"
-#include <NdbStdio.h>
 
 OSE_Receiver::OSE_Receiver(TransporterRegistry * tr,
 			   int _recBufSize,
diff --git a/ndb/src/common/transporter/OSE_Transporter.cpp b/ndb/src/common/transporter/OSE_Transporter.cpp
index a7a5ed81ce2..c9b0f777319 100644
--- a/ndb/src/common/transporter/OSE_Transporter.cpp
+++ b/ndb/src/common/transporter/OSE_Transporter.cpp
@@ -23,11 +23,9 @@
 
 #include <NdbMutex.h>
 
-#include <NdbStdio.h>
 #include <NdbHost.h>
 #include <NdbOut.hpp>
 #include <time.h>
-#include <assert.h>
 
 OSE_Transporter::OSE_Transporter(int _prioASignalSize,
                                  int _prioBSignalSize,
diff --git a/ndb/src/common/transporter/SHM_Buffer.hpp b/ndb/src/common/transporter/SHM_Buffer.hpp
index 6dd6b4672a1..32e59dd57a2 100644
--- a/ndb/src/common/transporter/SHM_Buffer.hpp
+++ b/ndb/src/common/transporter/SHM_Buffer.hpp
@@ -18,7 +18,6 @@
 #define SHM_BUFFER_HPP
 
 #include <ndb_global.h>
-#include <assert.h>
 
 #include <NdbSleep.h>
 
diff --git a/ndb/src/common/transporter/Transporter.cpp b/ndb/src/common/transporter/Transporter.cpp
index 1e19a8375ba..5ca523d5185 100644
--- a/ndb/src/common/transporter/Transporter.cpp
+++ b/ndb/src/common/transporter/Transporter.cpp
@@ -17,7 +17,6 @@
 
 #include "Transporter.hpp"
 #include "TransporterInternalDefinitions.hpp"
-#include <NdbStdio.h>
 #include <NdbSleep.h>
 
 Transporter::Transporter(NodeId lNodeId, NodeId rNodeId, 
diff --git a/ndb/src/common/transporter/TransporterRegistry.cpp b/ndb/src/common/transporter/TransporterRegistry.cpp
index 482e8d40b9b..3f98eeed89e 100644
--- a/ndb/src/common/transporter/TransporterRegistry.cpp
+++ b/ndb/src/common/transporter/TransporterRegistry.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 "TransporterRegistry.hpp"
 #include "TransporterInternalDefinitions.hpp"
diff --git a/ndb/src/common/util/BaseString.cpp b/ndb/src/common/util/BaseString.cpp
index 186642cbfa8..d15249adf72 100644
--- a/ndb/src/common/util/BaseString.cpp
+++ b/ndb/src/common/util/BaseString.cpp
@@ -17,7 +17,6 @@
 /* -*- c-basic-offset: 4; -*- */
 #include <ndb_global.h>
 #include <BaseString.hpp>
-#include <stdarg.h>
 
 BaseString::BaseString()
 {
@@ -338,7 +337,6 @@ BaseString::trim(char * str, const char * delim){
 
 
 #ifdef TEST_BASE_STRING
-#include <assert.h>
 
 /*
 g++ -g -Wall -o tbs -DTEST_BASE_STRING -I$NDB_TOP/include/util \
diff --git a/ndb/src/common/util/InputStream.cpp b/ndb/src/common/util/InputStream.cpp
index c52b594225d..410e9a70e9c 100644
--- a/ndb/src/common/util/InputStream.cpp
+++ b/ndb/src/common/util/InputStream.cpp
@@ -15,10 +15,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+
 #include "InputStream.hpp"
 #include <socket_io.h>
-#include <assert.h>
-#include <string.h>
 
 FileInputStream Stdin(stdin);
 
diff --git a/ndb/src/common/util/NdbErrHnd.cpp b/ndb/src/common/util/NdbErrHnd.cpp
index 53df5d702ca..f1c28a7bbdd 100644
--- a/ndb/src/common/util/NdbErrHnd.cpp
+++ b/ndb/src/common/util/NdbErrHnd.cpp
@@ -18,7 +18,6 @@
 #if defined NDB_OSE || defined NDB_SOFTOSE
 
 #include <NdbOut.hpp>
-#include <NdbStdio.h>
 #include <ndb_types.h>
 
 #include "ose.h"
diff --git a/ndb/src/common/util/NdbOut.cpp b/ndb/src/common/util/NdbOut.cpp
index 2624bfa04bd..6d76cf22402 100644
--- a/ndb/src/common/util/NdbOut.cpp
+++ b/ndb/src/common/util/NdbOut.cpp
@@ -14,11 +14,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include "NdbOut.hpp"
-#include <NdbStdio.h>
-#include <stdarg.h>
-#include <NdbUnistd.h>
-#include <string.h>
+#include <ndb_global.h>
+
+#include <NdbOut.hpp>
 #include <OutputStream.hpp>
 
 static FileOutputStream ndbouts_fileoutputstream(stdout);
diff --git a/ndb/src/common/util/NdbSqlUtil.cpp b/ndb/src/common/util/NdbSqlUtil.cpp
index dba7012cc0f..e91ade374cf 100644
--- a/ndb/src/common/util/NdbSqlUtil.cpp
+++ b/ndb/src/common/util/NdbSqlUtil.cpp
@@ -286,7 +286,6 @@ NdbSqlUtil::cmpTimespec(const Uint32* p1, const Uint32* p2, Uint32 full, Uint32
 
 #ifdef NDB_SQL_UTIL_TEST
 
-#include <assert.h>
 #include <NdbTick.h>
 #include <NdbOut.hpp>
 
diff --git a/ndb/src/common/util/OutputStream.cpp b/ndb/src/common/util/OutputStream.cpp
index 1143fe00fd1..bf3599dbac9 100644
--- a/ndb/src/common/util/OutputStream.cpp
+++ b/ndb/src/common/util/OutputStream.cpp
@@ -15,8 +15,9 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+
 #include <OutputStream.hpp>
-#include <stdarg.h>
 #include <socket_io.h>
 
 FileOutputStream::FileOutputStream(FILE * file){
diff --git a/ndb/src/common/util/Parser.cpp b/ndb/src/common/util/Parser.cpp
index ff6d290ae52..cd8cae29a7c 100644
--- a/ndb/src/common/util/Parser.cpp
+++ b/ndb/src/common/util/Parser.cpp
@@ -16,7 +16,6 @@
 
 
 #include <ndb_global.h>
-#include <assert.h>
 
 #include "Parser.hpp"
 #include <NdbOut.hpp>
diff --git a/ndb/src/common/util/Properties.cpp b/ndb/src/common/util/Properties.cpp
index 05d8b56329b..2ab008142ba 100644
--- a/ndb/src/common/util/Properties.cpp
+++ b/ndb/src/common/util/Properties.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 <Properties.hpp>
 
diff --git a/ndb/src/common/util/SimpleProperties.cpp b/ndb/src/common/util/SimpleProperties.cpp
index 34a9d2719b6..c3980f03c4d 100644
--- a/ndb/src/common/util/SimpleProperties.cpp
+++ b/ndb/src/common/util/SimpleProperties.cpp
@@ -18,7 +18,6 @@
 #include <SimpleProperties.hpp>
 #include <NdbOut.hpp>
 #include <NdbTCP.h>
-#include <assert.h>
 #include <UtilBuffer.hpp>
 
 bool
diff --git a/ndb/src/common/util/SocketServer.cpp b/ndb/src/common/util/SocketServer.cpp
index 21f4cd513b9..a0ec0aaa676 100644
--- a/ndb/src/common/util/SocketServer.cpp
+++ b/ndb/src/common/util/SocketServer.cpp
@@ -16,7 +16,6 @@
 
 
 #include <ndb_global.h>
-#include <assert.h>
 
 #include "SocketServer.hpp"
 
diff --git a/ndb/src/common/util/filetest/FileUnitTest.cpp b/ndb/src/common/util/filetest/FileUnitTest.cpp
index ebcca26d3d2..b6e7b7e8ec0 100644
--- a/ndb/src/common/util/filetest/FileUnitTest.cpp
+++ b/ndb/src/common/util/filetest/FileUnitTest.cpp
@@ -18,7 +18,6 @@
 #include <File.hpp>
 
 #include <NdbOut.hpp>
-#include <assert.h>
 
 typedef bool (*TESTFUNC)(const char*);
 
diff --git a/ndb/src/common/util/socket_io.cpp b/ndb/src/common/util/socket_io.cpp
index 878a9059512..8def7ebe91b 100644
--- a/ndb/src/common/util/socket_io.cpp
+++ b/ndb/src/common/util/socket_io.cpp
@@ -14,13 +14,11 @@
    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 <NdbTCP.h>
 #include <socket_io.h>
-#include <stdarg.h>
-#include <string.h>
-#include <NdbStdio.h>
 #include <NdbOut.hpp>
-#include <NdbString.h>
 
 extern "C"
 int
diff --git a/ndb/src/common/util/strlcat.c b/ndb/src/common/util/strlcat.c
index 0235e9adf55..3da47dee6f5 100644
--- a/ndb/src/common/util/strlcat.c
+++ b/ndb/src/common/util/strlcat.c
@@ -36,7 +36,6 @@
 
 /* RCSID("$KTH: strlcat.c,v 1.1 2000/08/16 01:23:47 lha Exp $"); */
 
-//#include <NdbString.h>
 
 #ifndef HAVE_STRLCAT
 
diff --git a/ndb/src/common/util/testSimpleProperties/sp_test.cpp b/ndb/src/common/util/testSimpleProperties/sp_test.cpp
index 22b92c9a80c..d4052b64132 100644
--- a/ndb/src/common/util/testSimpleProperties/sp_test.cpp
+++ b/ndb/src/common/util/testSimpleProperties/sp_test.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 "SimpleProperties.hpp"
 #include <NdbOut.hpp>
diff --git a/ndb/src/cw/cpcd/APIService.cpp b/ndb/src/cw/cpcd/APIService.cpp
index 9cf17addcc2..caf19ddba0e 100644
--- a/ndb/src/cw/cpcd/APIService.cpp
+++ b/ndb/src/cw/cpcd/APIService.cpp
@@ -23,7 +23,6 @@
 #include "APIService.hpp"
 #include "CPCD.hpp"
 #include <NdbMutex.h>
-#include <NdbStdio.h>
 #include <OutputStream.hpp>
 
 /**
diff --git a/ndb/src/cw/cpcd/CPCD.cpp b/ndb/src/cw/cpcd/CPCD.cpp
index 8864ccf6e4e..f2878b7dea1 100644
--- a/ndb/src/cw/cpcd/CPCD.cpp
+++ b/ndb/src/cw/cpcd/CPCD.cpp
@@ -15,11 +15,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include <string.h>
+#include <ndb_global.h>
 #include <NdbOut.hpp>
-#include <NdbUnistd.h>
-#include <NdbStdio.h>
-#include <errno.h>
 
 #include "APIService.hpp"
 #include "CPCD.hpp"
diff --git a/ndb/src/cw/cpcd/Monitor.cpp b/ndb/src/cw/cpcd/Monitor.cpp
index a96f3509ee8..2935cd0a648 100644
--- a/ndb/src/cw/cpcd/Monitor.cpp
+++ b/ndb/src/cw/cpcd/Monitor.cpp
@@ -14,9 +14,10 @@
    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 <NdbThread.h>
 #include <NdbOut.hpp>
-#include <NdbUnistd.h>
 #include <NdbSleep.h>
 
 #include "CPCD.hpp"
diff --git a/ndb/src/cw/cpcd/Process.cpp b/ndb/src/cw/cpcd/Process.cpp
index e35f9d6037a..2c9a74ed20b 100644
--- a/ndb/src/cw/cpcd/Process.cpp
+++ b/ndb/src/cw/cpcd/Process.cpp
@@ -17,7 +17,6 @@
 #include <ndb_global.h>
 #include <signal.h>
 
-#include <assert.h>
 
 #include <BaseString.hpp>
 #include <InputStream.hpp>
diff --git a/ndb/src/kernel/blocks/backup/FsBuffer.hpp b/ndb/src/kernel/blocks/backup/FsBuffer.hpp
index cbc03ffd11b..2f3c7daae43 100644
--- a/ndb/src/kernel/blocks/backup/FsBuffer.hpp
+++ b/ndb/src/kernel/blocks/backup/FsBuffer.hpp
@@ -18,7 +18,6 @@
 #define FS_BUFFER_HPP
 
 #include <ndb_global.h>
-#include <assert.h>
 
 #define DEBUG(x)
 
diff --git a/ndb/src/kernel/blocks/backup/restore/Restore.cpp b/ndb/src/kernel/blocks/backup/restore/Restore.cpp
index 50eb0df7c56..4a4c861993b 100644
--- a/ndb/src/kernel/blocks/backup/restore/Restore.cpp
+++ b/ndb/src/kernel/blocks/backup/restore/Restore.cpp
@@ -14,11 +14,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <assert.h>
 #include "Restore.hpp"
 #include "BackupFormat.hpp"
 #include <NdbTCP.h>
-#include <NdbStdio.h>
 #include <OutputStream.hpp>
 #include <Bitmask.hpp>
 
diff --git a/ndb/src/kernel/blocks/backup/restore/Restore.hpp b/ndb/src/kernel/blocks/backup/restore/Restore.hpp
index f1a73bb18b9..0c075e18933 100644
--- a/ndb/src/kernel/blocks/backup/restore/Restore.hpp
+++ b/ndb/src/kernel/blocks/backup/restore/Restore.hpp
@@ -17,16 +17,13 @@
 #ifndef RESTORE_H
 #define RESTORE_H
 
-#include <stddef.h>
+#include <ndb_global.h>
 #include <BackupFormat.hpp>
 #include <NdbApi.hpp>
 #include <AttrType.hpp>
 
 #include <NdbOut.hpp>
 #include "myVector.hpp"
-#include <NdbStdio.h>
-#include <NdbUnistd.h>
-#include <NdbString.h>
 
 #include <ndb_version.h>
 #include <version.h>
diff --git a/ndb/src/kernel/blocks/backup/restore/main.cpp b/ndb/src/kernel/blocks/backup/restore/main.cpp
index b38f6ab751b..4c15785d5c2 100644
--- a/ndb/src/kernel/blocks/backup/restore/main.cpp
+++ b/ndb/src/kernel/blocks/backup/restore/main.cpp
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <assert.h>
 #include "Restore.hpp"
 #include <getarg.h>
 #include <NdbSleep.h>
diff --git a/ndb/src/kernel/blocks/dbutil/DbUtil.cpp b/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
index 2cb129bc591..d1859396289 100644
--- a/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
+++ b/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
@@ -14,10 +14,10 @@
    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 "DbUtil.hpp"
 
-#include <new>
-#include <stddef.h>
 #include <ndb_version.h>
 
 #include <signaldata/WaitGCP.hpp>
diff --git a/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp b/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
index 0e2aa4c6903..bb09956832a 100644
--- a/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
+++ b/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
@@ -23,20 +23,17 @@
 #endif
 #endif
 
+#include <ndb_global.h>
+
 #include "Error.hpp"
 #include "AsyncFile.hpp"
 
 #include <ErrorHandlingMacros.hpp>
 #include <kernel_types.h>
-#include <string.h>
 #include <NdbMem.h>
 #include <NdbThread.h>
 #include <signaldata/FsOpenReq.hpp>
 
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
 #ifdef NDB_LINUX
 // This is for pread and pwrite
 #ifndef __USE_UNIX98
@@ -44,9 +41,7 @@
 #endif
 #endif
 
-#include <NdbUnistd.h>
 #if defined NDB_WIN32 || defined NDB_OSE || defined NDB_SOFTOSE
-#include <NdbStdio.h>
 #else
 // For readv and writev
 #include <sys/uio.h> 
diff --git a/ndb/src/kernel/blocks/ndbfs/Filename.hpp b/ndb/src/kernel/blocks/ndbfs/Filename.hpp
index 4c3569b5485..29aba79c9dc 100644
--- a/ndb/src/kernel/blocks/ndbfs/Filename.hpp
+++ b/ndb/src/kernel/blocks/ndbfs/Filename.hpp
@@ -52,8 +52,8 @@
 //
 //===========================================================================
 
+#include <ndb_global.h>
 #include <kernel_types.h>
-#include <NdbUnistd.h>
 
 class Filename
 {
diff --git a/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp b/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
index 6e0c2721ca0..435a6a6b208 100644
--- a/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
+++ b/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
@@ -76,7 +76,6 @@
 #include "NdbCondition.h"
 #include <NdbOut.hpp>
 
-#include <assert.h>
 
 template <class T>
 class MemoryChannel
diff --git a/ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp b/ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp
index 9f70efcadf7..ca90bc60153 100644
--- a/ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp
+++ b/ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp
@@ -65,7 +65,6 @@
 #include "NdbMutex.h"
 #include "NdbCondition.h"
 
-#include <assert.h>
 
 
 
diff --git a/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp b/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
index 8992a2104e9..9c1cf5021b3 100644
--- a/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
+++ b/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
@@ -14,8 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <limits.h>
-#include <errno.h>
+#include <ndb_global.h>
 
 #include "Ndbfs.hpp"
 #include "AsyncFile.hpp"
diff --git a/ndb/src/kernel/error/ErrorReporter.cpp b/ndb/src/kernel/error/ErrorReporter.cpp
index 1aa937f4675..56627cba46f 100644
--- a/ndb/src/kernel/error/ErrorReporter.cpp
+++ b/ndb/src/kernel/error/ErrorReporter.cpp
@@ -15,17 +15,16 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+
 #include "Error.hpp"
 #include "ErrorReporter.hpp"
 #include "ErrorMessages.hpp"
 
 #include <FastScheduler.hpp>
 #include <DebuggerNames.hpp>
-#include <NdbUnistd.h>
-#include <NdbStdio.h>
 #include <NdbHost.h>
 #include <NdbConfig.h>
-#include <string.h>
 #include <Configuration.hpp>
 
 #define MESSAGE_LENGTH 400
diff --git a/ndb/src/kernel/ndb-main/Main.cpp b/ndb/src/kernel/ndb-main/Main.cpp
index 88fd9d177de..aa66de583a9 100644
--- a/ndb/src/kernel/ndb-main/Main.cpp
+++ b/ndb/src/kernel/ndb-main/Main.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 <ndb_version.h>
 #include "Configuration.hpp"
 #include <TransporterRegistry.hpp>
@@ -32,7 +34,6 @@
 #include <NodeState.hpp>
 
 #if defined NDB_SOLARIS
-#include <sys/types.h>     // For system information
 #include <sys/processor.h> // For system informatio
 #endif
 
@@ -42,7 +43,6 @@
 
 extern EventLogger g_eventLogger;
 #if defined (NDB_LINUX) || defined (NDB_SOLARIS)
-#include <sys/types.h>
 #include <sys/wait.h>
 #endif
 
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>
 
diff --git a/ndb/src/mgmclient/CommandInterpreter.hpp b/ndb/src/mgmclient/CommandInterpreter.hpp
index 104da3ce254..796a4e4838e 100644
--- a/ndb/src/mgmclient/CommandInterpreter.hpp
+++ b/ndb/src/mgmclient/CommandInterpreter.hpp
@@ -23,7 +23,6 @@
 //*****************************************************************************
 
 #include <ndb_global.h>
-#include <NdbStdio.h>
 #include <Vector.hpp>
 #include <editline/editline.h>
 
diff --git a/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp b/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
index b8429c6b7d7..6c030b102bc 100644
--- a/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
+++ b/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
@@ -18,7 +18,6 @@
 #include <ndb_global.h>
 #include "../CpcClient.hpp"
 #include <Vector.hpp>
-#include <assert.h>
 
 SimpleCpcClient g_client("localhost", 1234);
 Vector<SimpleCpcClient::Process> g_procs;
diff --git a/ndb/src/mgmsrv/CommandInterpreter.hpp b/ndb/src/mgmsrv/CommandInterpreter.hpp
index 2989f31bd36..3466ee76226 100644
--- a/ndb/src/mgmsrv/CommandInterpreter.hpp
+++ b/ndb/src/mgmsrv/CommandInterpreter.hpp
@@ -22,7 +22,6 @@
 //*****************************************************************************
 
 #include <ndb_global.h>
-#include <NdbStdio.h>
 #include <Vector.hpp>
 #include <editline/editline.h>
 #include <BaseString.hpp>
diff --git a/ndb/src/mgmsrv/MgmtSrvr.hpp b/ndb/src/mgmsrv/MgmtSrvr.hpp
index 4fdf3c99d43..ce8765d6c73 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.hpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.hpp
@@ -20,7 +20,6 @@
 #include <kernel_types.h>
 #include "Config.hpp"
 #include <NdbCondition.h>
-#include <NdbConstant.hpp>
 #include <mgmapi.h>
 
 
diff --git a/ndb/src/mgmsrv/NodeLogLevel.hpp b/ndb/src/mgmsrv/NodeLogLevel.hpp
index 3e631e57901..3ad758cde99 100644
--- a/ndb/src/mgmsrv/NodeLogLevel.hpp
+++ b/ndb/src/mgmsrv/NodeLogLevel.hpp
@@ -17,7 +17,8 @@
 #ifndef NODELOGLEVEL_H
 #define NODELOGLEVEL_H
 
-#include <portlib/NdbConstant.hpp>
+#include <ndb_global.h>
+
 #include <signaldata/SetLogLevelOrd.hpp>
 
 /**
diff --git a/ndb/src/mgmsrv/NodeLogLevelList.cpp b/ndb/src/mgmsrv/NodeLogLevelList.cpp
index 7cf6dcc4b7e..6c7c091c1a8 100644
--- a/ndb/src/mgmsrv/NodeLogLevelList.cpp
+++ b/ndb/src/mgmsrv/NodeLogLevelList.cpp
@@ -14,10 +14,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include "NodeLogLevelList.hpp"
+#include <ndb_global.h>
 
+#include "NodeLogLevelList.hpp"
 #include "NodeLogLevel.hpp"
-#include "NdbStdio.h"
 
 //
 // PUBLIC
diff --git a/ndb/src/mgmsrv/mkconfig/mkconfig.cpp b/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
index c3f247bced6..224c82aa8a1 100644
--- a/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
+++ b/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
@@ -22,7 +22,6 @@
 
 #include "InitConfigFileParser.hpp"
 #include <Config.hpp>
-#include <assert.h>
 
 void usage(const char * prg){
   ndbout << "Usage " << prg << ": <Init config> <Binary file>" << endl;
diff --git a/ndb/src/ndbapi/ClusterMgr.cpp b/ndb/src/ndbapi/ClusterMgr.cpp
index 744dec62881..1b536b6d741 100644
--- a/ndb/src/ndbapi/ClusterMgr.cpp
+++ b/ndb/src/ndbapi/ClusterMgr.cpp
@@ -28,7 +28,6 @@
 #include <NdbOut.hpp>
 #include <NdbTick.h>
 
-#include <assert.h>
 
 #include <signaldata/NodeFailRep.hpp>
 #include <signaldata/NFCompleteRep.hpp>
diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp
index c45c43b2638..68f49b975ee 100644
--- a/ndb/src/ndbapi/Ndb.cpp
+++ b/ndb/src/ndbapi/Ndb.cpp
@@ -21,6 +21,8 @@
 Name:          Ndb.cpp
 ******************************************************************************/
 
+#include <ndb_global.h>
+
 #include "NdbApiSignal.hpp"
 #include "NdbImpl.hpp"
 #include "NdbSchemaOp.hpp"
@@ -1221,7 +1223,6 @@ Ndb::pollEvents(int aMillisecondNumber)
 
 #ifdef VM_TRACE
 #include <NdbMutex.h>
-#include <stdarg.h>
 static NdbMutex print_state_mutex = NDB_MUTEX_INITIALIZER;
 static bool
 checkdups(NdbConnection** list, unsigned no)
diff --git a/ndb/src/ndbapi/NdbConnectionScan.cpp b/ndb/src/ndbapi/NdbConnectionScan.cpp
index 5810dd8942a..962acc0bdac 100644
--- a/ndb/src/ndbapi/NdbConnectionScan.cpp
+++ b/ndb/src/ndbapi/NdbConnectionScan.cpp
@@ -28,7 +28,6 @@
  * Adjust:  2000-06-12  UABRONM   First version.
  ****************************************************************************/
 #include <ndb_global.h>
-#include <assert.h>
 
 #include <Ndb.hpp>
 #include <NdbConnection.hpp>
diff --git a/ndb/src/ndbapi/NdbDictionary.cpp b/ndb/src/ndbapi/NdbDictionary.cpp
index ec9a56cda62..b068ea6460f 100644
--- a/ndb/src/ndbapi/NdbDictionary.cpp
+++ b/ndb/src/ndbapi/NdbDictionary.cpp
@@ -646,7 +646,6 @@ NdbDictionary::Dictionary::Dictionary(NdbDictionaryImpl & impl)
   : m_impl(impl) 
 {
 }
-#include <assert.h>
 NdbDictionary::Dictionary::~Dictionary(){
   NdbDictionaryImpl * tmp = &m_impl;  
   if(this != tmp){
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/ndb/src/ndbapi/NdbDictionaryImpl.cpp
index bd94ba9b080..02e3ee23f9c 100644
--- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp
@@ -35,7 +35,6 @@
 #include <AttributeList.hpp>
 #include <NdbEventOperation.hpp>
 #include "NdbEventOperationImpl.hpp"
-#include <assert.h>
 
 #define DEBUG_PRINT 0
 #define INCOMPATIBLE_VERSION -2
diff --git a/ndb/src/ndbapi/NdbErrorOut.cpp b/ndb/src/ndbapi/NdbErrorOut.cpp
index 01d5f63599b..07e0b2fe6e8 100644
--- a/ndb/src/ndbapi/NdbErrorOut.cpp
+++ b/ndb/src/ndbapi/NdbErrorOut.cpp
@@ -15,10 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include <NdbStdio.h> 
-#include <stdarg.h>
-
-#include <assert.h>
+#include <ndb_global.h>
 
 #include <NdbOut.hpp>
 
diff --git a/ndb/src/ndbapi/NdbOperation.cpp b/ndb/src/ndbapi/NdbOperation.cpp
index eaa2b35965b..ccbfa767542 100644
--- a/ndb/src/ndbapi/NdbOperation.cpp
+++ b/ndb/src/ndbapi/NdbOperation.cpp
@@ -37,7 +37,6 @@
 
 #include "API.hpp"
 #include <NdbOut.hpp>
-#include <assert.h>
 
 
 /******************************************************************************
diff --git a/ndb/src/ndbapi/NdbOperationExec.cpp b/ndb/src/ndbapi/NdbOperationExec.cpp
index c0ec1b0aeb9..b2a6f99880c 100644
--- a/ndb/src/ndbapi/NdbOperationExec.cpp
+++ b/ndb/src/ndbapi/NdbOperationExec.cpp
@@ -25,7 +25,6 @@ Version:       1.2
 Description:   
 Documentation:
 ***************************************************************************/
-#include <assert.h>
 
 #include <NdbOperation.hpp>
 #include <NdbConnection.hpp>
diff --git a/ndb/src/ndbapi/NdbPoolImpl.cpp b/ndb/src/ndbapi/NdbPoolImpl.cpp
index 08252d26d79..131edc74246 100644
--- a/ndb/src/ndbapi/NdbPoolImpl.cpp
+++ b/ndb/src/ndbapi/NdbPoolImpl.cpp
@@ -15,8 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "NdbPoolImpl.hpp"
-#include <assert.h>
-#include <string.h>
 
 NdbMutex *NdbPool::pool_mutex = NULL;
 NdbPool *the_pool = NULL;
diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp
index 0f2154edec3..4db0f30f56c 100644
--- a/ndb/src/ndbapi/NdbScanOperation.cpp
+++ b/ndb/src/ndbapi/NdbScanOperation.cpp
@@ -34,10 +34,6 @@
 #include "NdbApiSignal.hpp"
 #include <NdbOut.hpp>
 #include "NdbDictionaryImpl.hpp"
-#include <NdbString.h>
-#ifndef NDB_MACOSX
-#include <malloc.h>
-#endif
 
 NdbScanOperation::NdbScanOperation(Ndb* aNdb) :
   NdbCursorOperation(aNdb),
diff --git a/ndb/src/ndbapi/NdbScanReceiver.hpp b/ndb/src/ndbapi/NdbScanReceiver.hpp
index 5e316719194..72f9e48f02c 100644
--- a/ndb/src/ndbapi/NdbScanReceiver.hpp
+++ b/ndb/src/ndbapi/NdbScanReceiver.hpp
@@ -24,7 +24,6 @@
 #include "NdbReceiver.hpp"
 #include <NdbOut.hpp>
 
-#include <assert.h>
 
 class NdbScanReceiver
 {
diff --git a/ndb/src/ndbapi/Ndbif.cpp b/ndb/src/ndbapi/Ndbif.cpp
index e334c1bcc39..696dfe68e40 100644
--- a/ndb/src/ndbapi/Ndbif.cpp
+++ b/ndb/src/ndbapi/Ndbif.cpp
@@ -40,7 +40,6 @@
 #include <NdbOut.hpp>
 #include <NdbTick.h>
 
-#include <assert.h>
 
 /******************************************************************************
  * int init( int aNrOfCon, int aNrOfOp );
diff --git a/ndb/src/ndbapi/TransporterFacade.cpp b/ndb/src/ndbapi/TransporterFacade.cpp
index 843eab133bb..f4a3ae3e87d 100644
--- a/ndb/src/ndbapi/TransporterFacade.cpp
+++ b/ndb/src/ndbapi/TransporterFacade.cpp
@@ -26,7 +26,6 @@
 #include <NdbOut.hpp>
 #include <NdbEnv.h>
 #include <NdbSleep.h>
-#include <assert.h>
 
 #include "API.hpp"
 #include <ConfigRetriever.hpp>
diff --git a/ndb/src/ndbapi/ndberror.c b/ndb/src/ndbapi/ndberror.c
index 6e732272bcf..ea7cf4de426 100644
--- a/ndb/src/ndbapi/ndberror.c
+++ b/ndb/src/ndbapi/ndberror.c
@@ -16,8 +16,6 @@
 
 
 #include <ndb_global.h>
-#include <stdarg.h>
-#include <assert.h>
 
 #include <ndberror.h>
 
diff --git a/ndb/src/ndbapi/signal-sender/SignalSender.cpp b/ndb/src/ndbapi/signal-sender/SignalSender.cpp
index d60f6240a9c..e642848dcee 100644
--- a/ndb/src/ndbapi/signal-sender/SignalSender.cpp
+++ b/ndb/src/ndbapi/signal-sender/SignalSender.cpp
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <assert.h>
 #include "SignalSender.hpp"
 #include "ConfigRetriever.hpp"
 #include <NdbSleep.h>
diff --git a/ndb/src/newtonapi/dba_error.cpp b/ndb/src/newtonapi/dba_error.cpp
index 0a154ac1314..f05446522b0 100644
--- a/ndb/src/newtonapi/dba_error.cpp
+++ b/ndb/src/newtonapi/dba_error.cpp
@@ -15,9 +15,9 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+
 #include "dba_internal.hpp"
-#include <NdbStdio.h>
-#include <stdarg.h>
 
 static DBA_Error_t latestError = DBA_NO_ERROR;
 static DBA_ErrorCode_t latestNdbError = 0;
diff --git a/ndb/src/rep/RepApiService.cpp b/ndb/src/rep/RepApiService.cpp
index f5d51f7990e..d07f7a59375 100644
--- a/ndb/src/rep/RepApiService.cpp
+++ b/ndb/src/rep/RepApiService.cpp
@@ -23,10 +23,8 @@
 #include "RepApiInterpreter.hpp"
 #include "repapi/repapi.h"
 #include <NdbMutex.h>
-#include <NdbStdio.h>
 #include <OutputStream.hpp>
 
-#include <NdbString.h>
 /**
    const char * name;
    const char * realName;
diff --git a/ndb/src/rep/RepMain.cpp b/ndb/src/rep/RepMain.cpp
index f454832bda8..d9f057be9a1 100644
--- a/ndb/src/rep/RepMain.cpp
+++ b/ndb/src/rep/RepMain.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 <NdbApiSignal.hpp>
 #include <getarg.h>
diff --git a/ndb/src/rep/Requestor.cpp b/ndb/src/rep/Requestor.cpp
index af16fc33844..3c93a6394a4 100644
--- a/ndb/src/rep/Requestor.cpp
+++ b/ndb/src/rep/Requestor.cpp
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <assert.h>
 #include "Requestor.hpp"
 #include "ConfigRetriever.hpp"
 
diff --git a/ndb/src/rep/adapters/AppNDB.hpp b/ndb/src/rep/adapters/AppNDB.hpp
index c24774d4ed3..9563a1e41ab 100644
--- a/ndb/src/rep/adapters/AppNDB.hpp
+++ b/ndb/src/rep/adapters/AppNDB.hpp
@@ -18,13 +18,9 @@
 #define APPNDB_HPP
 #include "NdbApi.hpp"
 
-#include <string.h>
-#include <assert.h>
-
 #include <NdbMain.h>
 #include <NdbOut.hpp>
 #include <NdbSleep.h>
-#include <NdbStdio.h>
 #include <NdbTick.h>
 
 #include <NdbThread.h>
diff --git a/ndb/src/rep/adapters/ExtNDB.cpp b/ndb/src/rep/adapters/ExtNDB.cpp
index 5ba6bfbbe6e..eb541cdced9 100644
--- a/ndb/src/rep/adapters/ExtNDB.cpp
+++ b/ndb/src/rep/adapters/ExtNDB.cpp
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <assert.h>
 #include "ExtNDB.hpp"
 #include "ConfigRetriever.hpp"
 #include <NdbSleep.h>
diff --git a/ndb/src/rep/dbug_hack.cpp b/ndb/src/rep/dbug_hack.cpp
index 794852a3a23..74e5f080777 100644
--- a/ndb/src/rep/dbug_hack.cpp
+++ b/ndb/src/rep/dbug_hack.cpp
@@ -14,8 +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 <stdarg.h>
-#include <string.h>
+#include <ndb_global.h>
+
 #include <OutputStream.hpp>
 #include "NdbOut.hpp"
 #include "rep_version.hpp"
diff --git a/ndb/src/rep/storage/GCIBuffer.cpp b/ndb/src/rep/storage/GCIBuffer.cpp
index 5073e62c550..013600b30a5 100644
--- a/ndb/src/rep/storage/GCIBuffer.cpp
+++ b/ndb/src/rep/storage/GCIBuffer.cpp
@@ -16,7 +16,6 @@
 
 #include <ndb_global.h>
 #include "GCIBuffer.hpp"
-#include <assert.h>
 
 /*****************************************************************************
  * Constructor / Destructor
diff --git a/ndb/src/rep/storage/NodeGroupInfo.hpp b/ndb/src/rep/storage/NodeGroupInfo.hpp
index 605ccf76a38..3d0499d4425 100644
--- a/ndb/src/rep/storage/NodeGroupInfo.hpp
+++ b/ndb/src/rep/storage/NodeGroupInfo.hpp
@@ -18,12 +18,10 @@
 #define NODE_GROUPINFO_HPP
 
 #include <Vector.hpp>
-#include <NdbStdio.h>
 #include <NdbTick.h>
 #include <NdbMain.h>
 #include <NdbOut.hpp>
 //#include <NdbSleep.h>
-#include <NdbString.h>
 
 #include "NodeGroup.hpp"
 #include <rep/rep_version.hpp>
diff --git a/ndb/src/rep/transfer/TransPS.cpp b/ndb/src/rep/transfer/TransPS.cpp
index 7af53f24415..1f65e95850d 100644
--- a/ndb/src/rep/transfer/TransPS.cpp
+++ b/ndb/src/rep/transfer/TransPS.cpp
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <assert.h>
 
 #include "ConfigRetriever.hpp"
 #include <NdbSleep.h>
diff --git a/ndb/src/rep/transfer/TransPS.hpp b/ndb/src/rep/transfer/TransPS.hpp
index 35823f1eb19..b47f1acfca2 100644
--- a/ndb/src/rep/transfer/TransPS.hpp
+++ b/ndb/src/rep/transfer/TransPS.hpp
@@ -17,12 +17,10 @@
 #ifndef TransPS_HPP
 #define TransPS_HPP
 
-#include <NdbStdio.h>
 #include <NdbTick.h>
 #include <NdbMain.h>
 #include <NdbOut.hpp>
 #include <NdbSleep.h>
-#include <NdbString.h>
 
 #include <TransporterDefinitions.hpp>
 #include <TransporterFacade.hpp>
diff --git a/ndb/src/rep/transfer/TransSS.cpp b/ndb/src/rep/transfer/TransSS.cpp
index 5399bfb4e3f..83f4b570330 100644
--- a/ndb/src/rep/transfer/TransSS.cpp
+++ b/ndb/src/rep/transfer/TransSS.cpp
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <assert.h>
 
 #include "ConfigRetriever.hpp"
 
diff --git a/ndb/src/rep/transfer/TransSS.hpp b/ndb/src/rep/transfer/TransSS.hpp
index 90f320a079e..6f2089e46ac 100644
--- a/ndb/src/rep/transfer/TransSS.hpp
+++ b/ndb/src/rep/transfer/TransSS.hpp
@@ -17,12 +17,10 @@
 #ifndef TransSS_HPP
 #define TransSS_HPP
 
-#include <NdbStdio.h>
 #include <NdbTick.h>
 #include <NdbMain.h>
 #include <NdbOut.hpp>
 #include <NdbSleep.h>
-#include <NdbString.h>
 
 #include <TransporterDefinitions.hpp>
 #include <TransporterFacade.hpp>