introduced ndb_global.h/my_global.h to replace sytem lib includes e.g. stdio, stdlib

ndb/include/kernel/signaldata/SignalData.hpp

@@ -17,11 +17,10 @@
 #ifndef SIGNAL_DATA_H
 #define SIGNAL_DATA_H
 
+#include <ndb_global.h>
 #include <ndb_limits.h>
 #include <kernel_types.h>
-#include <NdbStdio.h>
 #include <NdbConstant.hpp>
-#include <stdlib.h>
 
 #ifndef NDB_ASSERT
 #ifdef VM_TRACE

ndb/include/mgmcommon/MgmtErrorReporter.hpp

@@ -22,8 +22,8 @@
 //******************************************************************************
 
 
+#include <ndb_global.h> // exit
 #include <NdbOut.hpp>
-#include <stdlib.h> // exit
 
 #define REPORT_WARNING(message) \
    ndbout << "WARNING: " << message << endl

ndb/include/ndb_global.h

 #include <my_global.h>
-/*#include <my_config.h>*/
-
+#include <m_string.h>
+#include <m_ctype.h>
+#include <ndb_types.h>
+#include <ctype.h>
+#include <sys/param.h>

ndb/include/ndb_types.h

@@ -21,8 +21,10 @@
 #ifndef SYS_TYPES_H
 #define SYS_TYPES_H
 
+#if 0
 #include <sys/types.h>
 #include <stddef.h>
+#endif
 
 typedef          char  Int8;
 typedef unsigned char  Uint8;

ndb/include/ndb_version.h

@@ -17,9 +17,6 @@
 #ifndef NDB_VERSION_H
 #define NDB_VERSION_H
 
-#include <stdio.h>
-#include <string.h>
-
 #include <version.h>
 
 #define MAKE_VERSION(A,B,C) (((A) << 16) | ((B) << 8)  | ((C) << 0))

ndb/include/ndbapi/Ndb.hpp

@@ -860,9 +860,9 @@
 
 #include <ndb_types.h>
 #include <ndbapi_limits.h>
-#include "AttrType.hpp"
+#include <AttrType.hpp>
 #include <NdbError.hpp>
-#include "NdbDictionary.hpp"
+#include <NdbDictionary.hpp>
 
 class NdbObjectIdMap;
 class NdbOperation;
@@ -1673,7 +1673,7 @@ private:
    */
   struct StartTransactionNodeSelectionData {
     StartTransactionNodeSelectionData():
-      fragment2PrimaryNodeMap(NULL) {};
+      fragment2PrimaryNodeMap(0) {};
     Uint32 kValue;
     Uint32 hashValueMask;
     Uint32 hashpointerValue;

ndb/include/ndbapi/NdbConnection.hpp

@@ -18,9 +18,8 @@
 #define NdbConnection_H
 
 #include <ndb_types.h>
-#include "AttrType.hpp" 
+#include <AttrType.hpp>
 #include <NdbError.hpp>
-#include <stdlib.h>
 
 class NdbConnection;
 class NdbOperation;

ndb/include/ndbapi/NdbEventOperation.hpp

@@ -157,8 +157,8 @@ public:
    *                    the attribute, or a NULL pointer 
    *                    (indicating error).
    */
-  NdbRecAttr *getValue(const char *anAttrName, char *aValue = NULL);
-  NdbRecAttr *getPreValue(const char *anAttrName, char *aValue = NULL);
+  NdbRecAttr *getValue(const char *anAttrName, char *aValue = 0);
+  NdbRecAttr *getPreValue(const char *anAttrName, char *aValue = 0);
 
   /**
    * Retrieves event resultset if available, inserted into the NdbRecAttrs
@@ -172,7 +172,7 @@ public:
    * overflow and *pOverRun will indicate the number of events that have
    * overwritten.
    */
-  int next(int *pOverRun=NULL);
+  int next(int *pOverRun=0);
 
   /**
    * In the current implementation a nodefailiure may cause loss of events,

ndb/include/ndbapi/NdbOperation.hpp

@@ -17,14 +17,11 @@
 #ifndef NdbOperation_H
 #define NdbOperation_H
 
-#include <stdlib.h>
-#include <assert.h>
-
 #include <ndb_types.h>
-#include "AttrType.hpp"
-#include "NdbError.hpp"
-#include "NdbReceiver.hpp"
-#include <stdlib.h>
+
+#include <AttrType.hpp>
+#include <NdbError.hpp>
+#include <NdbReceiver.hpp>
 
 class Ndb;
 class NdbApiSignal;
@@ -480,8 +477,8 @@ public:
    *                    the attribute, or a NULL pointer 
    *                    (indicating error).
    */
-  NdbRecAttr* 		getValue(const char* anAttrName, char* aValue = NULL);
-  NdbRecAttr* 		getValue(Uint32 anAttrId, char* aValue = NULL);
+  NdbRecAttr* 		getValue(const char* anAttrName, char* aValue = 0);
+  NdbRecAttr* 		getValue(Uint32 anAttrId, char* aValue = 0);
   
   /**
    * Define an attribute to set or update in query.
@@ -925,7 +922,7 @@ protected:
   virtual int equal_impl(const NdbColumnImpl* anAttrObject, 
                          const char* aValue, 
                          Uint32 len);
-  NdbRecAttr* getValue(const NdbColumnImpl* anAttrObject, char* aValue = NULL);
+  NdbRecAttr* getValue(const NdbColumnImpl* anAttrObject, char* aValue = 0);
   int setValue(const NdbColumnImpl* anAttrObject, const char* aValue, Uint32 len);
   int incValue(const NdbColumnImpl* anAttrObject, Uint32 aValue);
   int incValue(const NdbColumnImpl* anAttrObject, Uint64 aValue);

ndb/include/ndbapi/NdbRecAttr.hpp

@@ -17,9 +17,6 @@
 #ifndef NdbRecAttr_H
 #define NdbRecAttr_H
 
-#include <stdlib.h>
-
-#include <ndb_types.h>
 #include <NdbDictionary.hpp>
 #include "AttrType.hpp"
 
@@ -427,9 +424,9 @@ inline
 void
 NdbRecAttr::release()
 {
-  if (theStorageX != NULL) {
+  if (theStorageX != 0) {
     delete [] theStorageX;
-    theStorageX = NULL;
+    theStorageX = 0;
   }
 }
 
@@ -437,10 +434,10 @@ inline
 void
 NdbRecAttr::init()
 {
-  theStorageX = NULL;
-  theValue = NULL;
-  theRef = NULL;
-  theNext = NULL;
+  theStorageX = 0;
+  theValue = 0;
+  theRef = 0;
+  theNext = 0;
   theAttrId = 0xFFFF;
   theNULLind = -1;
 }
@@ -470,7 +467,7 @@ inline
 bool
 NdbRecAttr::copyoutRequired() const
 {
-  return theRef != theValue && theValue != NULL;
+  return theRef != theValue && theValue != 0;
 }
 
 inline

ndb/include/ndbapi/NdbReceiver.hpp

@@ -18,7 +18,7 @@
 #define NdbReceiver_H
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL  // Not part of public interface
 
-#include <stdlib.h>
+#include <ndb_types.h>
 
 class Ndb;
 class NdbReceiver

ndb/include/ndbapi/NdbScanOperation.hpp

@@ -172,25 +172,6 @@ SetValueRec::SetValueRec() :
 {
 }
 
-inline
-SetValueRec::~SetValueRec() 
-{
-  if ((stype == SET_STRING_ATTR1) ||
-      (stype == SET_INT32_ATTR1)  ||
-      (stype == SET_UINT32_ATTR1) ||
-      (stype == SET_INT64_ATTR1) ||
-      (stype == SET_UINT64_ATTR1) ||
-      (stype == SET_FLOAT_ATTR1) ||
-      (stype == SET_DOUBLE_ATTR1))
-    free(anAttrName);
-
-  if ((stype == SET_STRING_ATTR1) ||
-      (stype == SET_STRING_ATTR2))
-    free(stringStruct.aStringValue);
-  if (next) delete next;
-  next = 0;
-}
-
 class SetValueRecList {
 public:
   SetValueRecList();

ndb/include/ndbapi/NdbSchemaOp.hpp

@@ -18,11 +18,9 @@
 #define NdbSchemaOp_H
 #ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
 
-#include <ndb_types.h>
+#include "NdbDictionary.hpp"
 #include "AttrType.hpp"
 #include "NdbSchemaCon.hpp"
-#include <stdlib.h>
-#include "NdbDictionary.hpp"
 
 class NdbApiSignal;
 class Ndb;

ndb/include/ndbapi/ndberror.h

@@ -17,8 +17,6 @@
 #ifndef NDBERROR_H
 #define NDBERROR_H
 
-#include <stdlib.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -91,7 +89,7 @@ typedef  ndberror_classification_enum ndberror_classification;
 const char *ndberror_status_message(ndberror_status);
 const char *ndberror_classification_message(ndberror_classification);
 void ndberror_update(ndberror_struct *);
-int ndb_error_string(int err_no, char *str, size_t size);
+int ndb_error_string(int err_no, char *str, unsigned int size);
 
 #ifdef __cplusplus
 }

ndb/include/newtonapi/dba.h

@@ -102,11 +102,9 @@
 
 /* --- Include files ---- */
 
+#include <ndb_global.h>
 #include <defs/pcn_types.h>
 
-#include <stdio.h>
-
-
 /* --- Types and definitions --- */
 
 /**

ndb/include/portlib/NdbStdio.h

@@ -26,7 +26,7 @@
 #include <outfmt.h>
 #endif
 
-#include <stdio.h>
+#include <ndb_global.h>
 
 #ifdef NDB_WIN32
 #define snprintf _snprintf

ndb/include/transporter/TransporterDefinitions.hpp

@@ -17,8 +17,8 @@
 #ifndef TransporterDefinitions_H
 #define TransporterDefinitions_H
 
+#include <ndb_global.h> 
 #include <kernel_types.h> 
-#include <string.h>
 #include <NdbOut.hpp>
 
 /**

ndb/include/util/BaseString.hpp

@@ -17,9 +17,7 @@
 #ifndef __UTIL_BASESTRING_HPP_INCLUDED__
 #define __UTIL_BASESTRING_HPP_INCLUDED__
 
-#include <ctype.h>
-#include <stdlib.h>
-
+#include <ndb_global.h>
 #include <Vector.hpp>
 
 /**

ndb/include/util/Bitmask.hpp

@@ -17,12 +17,10 @@
 #ifndef NDB_BITMASK_H
 #define NDB_BITMASK_H
 
-#include <ndb_types.h>
+#include <ndb_global.h>
 #include <NdbConstant.hpp>
 
 #ifndef NDB_ASSERT
-#include <stdio.h>
-#include <stdlib.h>
 #define NDB_ASSERT(x, s) \
   do { if (!(x)) { printf("%s\n", s); abort(); } } while (0)
 #endif

ndb/include/util/InputStream.hpp

@@ -17,7 +17,7 @@
 #ifndef INPUT_STREAM_HPP
 #define INPUT_STREAM_HPP
 
-#include <stdio.h>
+#include <ndb_global.h>
 #include <NdbTCP.h>
 
 /**

ndb/include/util/NdbAutoPtr.hpp

@@ -17,7 +17,7 @@
 #ifndef __NDB_AUTO_PTR_HPP
 #define __NDB_AUTO_PTR_HPP
 
-#include <stdlib.h>
+#include <ndb_global.h>
 
 template<typename T>
 class NdbAutoPtr {

ndb/include/util/OutputStream.hpp

@@ -17,7 +17,7 @@
 #ifndef OUTPUT_STREAM_HPP
 #define OUTPUT_STREAM_HPP
 
-#include <stdio.h>
+#include <ndb_global.h>
 #include <NdbTCP.h>
 
 /**

ndb/include/util/Properties.hpp

@@ -17,10 +17,7 @@
 #ifndef PROPERTIES_HPP
 #define PROPERTIES_HPP
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ndb_types.h>
+#include <ndb_global.h>
 #include <BaseString.hpp>
 #include <UtilBuffer.hpp>
 

ndb/include/util/UtilBuffer.hpp

@@ -17,9 +17,7 @@
 #ifndef __BUFFER_HPP_INCLUDED__
 #define __BUFFER_HPP_INCLUDED__
 
-#include <unistd.h>
-#include <errno.h>
-#include <stdlib.h>
+#include <ndb_global.h>
 
 /* This class represents a buffer of binary data, where you can append
  * data at the end, and later read the entire bunch.

ndb/include/util/Vector.hpp

@@ -17,9 +17,8 @@
 #ifndef NDB_VECTOR_HPP
 #define NDB_VECTOR_HPP
 
-#include <stdlib.h>
+#include <ndb_global.h>
 #include <NdbMutex.h>
-#include <string.h>
 
 template<class T>
 struct Vector {

ndb/include/util/uucode.h

@@ -17,7 +17,7 @@
 #ifndef UUCODE_H
 #define UUCODE_H
 
-#include <stdio.h>
+#include <ndb_global.h>
 
 #ifdef	__cplusplus
 extern "C" {

ndb/src/common/debugger/DebuggerNames.cpp

@@ -14,16 +14,14 @@
    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 "DebuggerNames.hpp"
 
 #include <BlockNumbers.h>
 #include <GlobalSignalNumbers.h>
 #include <signaldata/SignalDataPrint.hpp>
 
-#include <NdbStdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 static const char *            localSignalNames[MAX_GSN+1];
 static SignalDataPrintFunction localPrintFunctions[MAX_GSN+1];
 static const char *            localBlockNames[NO_OF_BLOCKS]; 

ndb/src/common/debugger/SignalLoggerManager.cpp

@@ -14,14 +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 "SignalLoggerManager.hpp"
 #include <LongSignal.hpp>
 
-#include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 #include <time.h>
-#include <NdbString.h>
 
 #include <DebuggerNames.hpp>
 

ndb/src/common/editline/editline_internal.h

@@ -19,9 +19,8 @@
 **  Internal header file for editline library.
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <ndb_global.h>
+
 #if	defined(SYS_UNIX)
 #include "unix.h"
 #endif	/* defined(SYS_UNIX) */

ndb/src/common/editline/editline_win32.c

@@ -15,8 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include <stdio.h>
-#include <malloc.h>
+#include <ndb_global.h>
 
 
 char* readline(const char* prompt)

ndb/src/common/editline/test/testit.c

@@ -20,11 +20,7 @@
 **  A "micro-shell" to test editline library.
 **  If given any arguments, commands aren't executed.
 */
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <NdbString.h>
+#include <ndb_global.h>
 #include <editline/editline.h>
 
 int

ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp

@@ -14,6 +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 <ndb_global.h>
+#include <assert.h>
+
 #include "LogHandlerListUnitTest.hpp"
 
 #include <ConsoleLogHandler.hpp>
@@ -22,9 +25,6 @@
 
 #include <NdbOut.hpp>
 
-#include <stdio.h>
-#include <assert.h>
-
 typedef bool (*TESTFUNC)(const char*);
 typedef struct
 {

ndb/src/common/mgmcommon/ConfigRetriever.cpp

@@ -14,6 +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 <ndb_version.h>
+#include <sys/stat.h>
+
 #include <ConfigRetriever.hpp>
 
 #include "LocalConfig.hpp"
@@ -21,21 +25,15 @@
 #include <NdbOut.hpp>
 
 #include <NdbTCP.h>
-#include <string.h>
-#include <NdbStdio.h>
 #include <NdbEnv.h>
 #include "MgmtErrorReporter.hpp"
 
 #include <uucode.h>
 #include <Properties.hpp>
 
-#include <stdio.h>
-#include <NdbString.h>
-#include <sys/stat.h>
 #include <socket_io.h>
 #include <NdbConfig.h>
 
-#include <ndb_version.h>
 
 //****************************************************************************
 //****************************************************************************

ndb/src/common/mgmcommon/InitConfigFileParser.hpp

@@ -17,7 +17,8 @@
 #ifndef InitConfigFileParser_H
 #define InitConfigFileParser_H
 
-#include <stdio.h>
+#include <ndb_global.h>
+
 #include <Properties.hpp>
 
 class Config;

ndb/src/common/mgmcommon/LocalConfig.hpp

@@ -17,10 +17,8 @@
 #ifndef LocalConfig_H
 #define LocalConfig_H
 
-#include <stdlib.h>
-#include <string.h>
+#include <ndb_global.h>
 #include <NdbOut.hpp>
-#include <NdbStdio.h>
 
 //****************************************************************************
 // Description: The class LocalConfig corresponds to the information possible

ndb/src/common/mgmcommon/NdbConfig.c

@@ -14,10 +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 <ndb_global.h>
 #include <NdbConfig.h>
 #include <NdbEnv.h>
-#include <stdlib.h>
-#include <string.h>
 
 const char* 
 NdbConfig_HomePath(char* buf, int buflen){

ndb/src/common/mgmcommon/printConfig/printConfig.cpp

@@ -15,10 +15,11 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+
 #include <NdbMain.h>
 #include <ConfigRetriever.hpp>
 #include <Properties.hpp>
-#include <stdlib.h>
 #include <NdbOut.hpp>
 
 void usage(const char * prg){

ndb/src/common/portlib/memtest/memtest.c

@@ -16,8 +16,7 @@
 
 
 
-#include <stdio.h>
-#include <unistd.h>
+#include <ndb_global.h>
 #include <sys/time.h>
 #include <sys/mman.h>
 long long getMilli();

ndb/src/common/portlib/memtest/munmaptest/munmaptest.cpp

@@ -17,6 +17,9 @@
 
 
 
+#include <ndb_global.h>
+#include <sys/mman.h>
+
 #include <NdbOut.hpp>
 #include <NdbThread.h>
 #include <NdbMutex.h>
@@ -27,13 +30,6 @@
 #include <NdbHost.h>
 #include <NdbMain.h>
 #include <getarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/time.h>
-#include <sys/mman.h>
-
 
 struct ThreadData
 {

ndb/src/common/portlib/mmstest/mmslist.cpp

@@ -14,14 +14,14 @@
    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_common.h>
+
 #include <NdbOut.hpp>
 #include <NdbMain.h>
 
 #include <ose.h>
 #include <mms.sig>
 #include <mms_err.h>
-#include <string.h>
-#include <stdio.h>
 #include <NdbOut.hpp>
 
 /**

ndb/src/common/portlib/mmstest/mmstest.cpp

@@ -14,13 +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 <NdbOut.hpp>
 #include "NdbThread.h"
 #include <NdbMem.h>
 #include <NdbMain.h>
 
-#include <stdlib.h>
-
 NDB_COMMAND(ndbmem, "ndbmem", "ndbmem", "Test the ndbmem functionality", 4096){
 
   ndbout << "Starting test of NdbMem" << endl;

ndb/src/common/portlib/test/NdbPortLibTest.cpp

@@ -20,7 +20,7 @@
  *  TODO - Add tests for NdbMem
  */
 
-
+#include <ndb_global.h>
 
 #include "NdbOut.hpp"
 #include "NdbThread.h"
@@ -32,11 +32,6 @@
 #include "NdbHost.h"
 #include "NdbMain.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 int TestHasFailed;
 int verbose = 0;
 

ndb/src/common/portlib/unix/NdbDaemon.c

@@ -14,28 +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 "NdbDaemon.h"
+#include <ndb_global.h>
 #include <assert.h>
-
-#ifdef NDB_LINUX
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 #include <fcntl.h>
-#include <errno.h>
-#endif
-
-#ifdef NDB_SOLARIS
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#endif
+#include "NdbDaemon.h"
 
 #define NdbDaemon_ErrorSize 500
 #if defined(NDB_LINUX) || defined(NDB_SOLARIS)

ndb/src/common/transporter/Packer.cpp

@@ -14,13 +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 "Packer.hpp"
 #include <TransporterRegistry.hpp>
 #include <TransporterCallback.hpp>
 #include <RefConvert.hpp>
 
-#include <stdio.h>
-
 Uint32
 TransporterRegistry::unpack(Uint32 * readPtr,
 			    Uint32 sizeOfData,

ndb/src/common/transporter/SCI_Transporter.cpp

@@ -14,17 +14,14 @@
    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 "SCI_Transporter.hpp" 
-#include <NdbStdio.h> 
 #include <NdbOut.hpp> 
 #include <NdbSleep.h> 
 #include <NdbTick.h> 
-#include <stdlib.h> 
 #include <NdbTick.h> 
-#if 0 
-#include <malloc.h> 
-#include <sys/time.h> 
-#endif  
+
 #include "TransporterInternalDefinitions.hpp" 
 #include <TransporterCallback.hpp> 
  

ndb/src/common/transporter/SHM_Buffer.hpp

@@ -17,11 +17,11 @@
 #ifndef SHM_BUFFER_HPP
 #define SHM_BUFFER_HPP
 
-#include <stdio.h>
-#include <ndb_types.h>
-#include <NdbSleep.h>
+#include <ndb_global.h>
 #include <assert.h>
 
+#include <NdbSleep.h>
+
 /**
  * These classes implement a circular buffer
  *

ndb/src/common/transporter/SHM_Transporter.cpp

@@ -15,15 +15,14 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+
 #include "SHM_Transporter.hpp"
 #include "TransporterInternalDefinitions.hpp"
 #include <TransporterCallback.hpp>
 #include <NdbSleep.h>
 #include <NdbOut.hpp>
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #ifdef NDB_WIN32
 #include <windows.h>
 #else

ndb/src/common/transporter/SHM_Transporter.unix.cpp

@@ -15,15 +15,14 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+
 #include "SHM_Transporter.hpp"
 #include "TransporterInternalDefinitions.hpp"
 #include <TransporterCallback.hpp>
 #include <NdbSleep.h>
 #include <NdbOut.hpp>
 
-#include <stdio.h>
-
-
 #include <sys/ipc.h>
 #include <sys/shm.h>
 

ndb/src/common/transporter/SHM_Transporter.win32.cpp

@@ -15,14 +15,14 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+
 #include "SHM_Transporter.hpp"
 #include "TransporterInternalDefinitions.hpp"
 #include <TransporterCallback.hpp>
 #include <NdbSleep.h>
 #include <NdbOut.hpp>
 
-#include <stdio.h>
-
 #include <windows.h>
 
 

ndb/src/common/transporter/SendBuffer.hpp

@@ -33,10 +33,9 @@
 
 #include "TransporterDefinitions.hpp"
 #include <TransporterCallback.hpp>
-#include <stdlib.h>
 
 #ifdef DEBUG_TRANSPORTER
-#include <stdio.h>
+#include <ndb_global.h>
 #endif
 
 class SendBuffer {

ndb/src/common/transporter/TCP_Transporter.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 <NdbTCP.h>
 #include "TCP_Transporter.hpp"
 #include <NdbOut.hpp>
@@ -23,13 +25,9 @@
 #if defined NDB_OSE || defined NDB_SOFTOSE
 #define inet_send inet_send
 #else
-#include <NdbStdio.h>
 #define inet_send send
 #endif
 
-#include <stdlib.h>
-
-
 #ifdef NDB_WIN32
 class ndbstrerror
 {

ndb/src/common/transporter/TransporterRegistry.cpp

@@ -14,14 +14,14 @@
    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 <assert.h>
+
 #include "TransporterRegistry.hpp"
 #include "TransporterInternalDefinitions.hpp"
 
 #include "Transporter.hpp"
 
-#include <assert.h>
-#include <stdlib.h>
-
 #ifdef NDB_TCP_TRANSPORTER
 #include "TCP_Transporter.hpp"
 #endif

ndb/src/common/transporter/basictest/basicTransporterTest.cpp

@@ -14,18 +14,17 @@
    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 "TransporterRegistry.hpp"
 #include "TransporterDefinitions.hpp"
 #include "TransporterCallback.hpp"
 #include <RefConvert.hpp>
 
-#include <NdbStdio.h>
-#include <stdlib.h>
 #include <NdbTick.h>
 #include <NdbMain.h>
 #include <NdbOut.hpp>
 #include <NdbSleep.h>
-#include <NdbString.h>
 
 int basePortTCP = 17000;
 

ndb/src/common/transporter/buddy.cpp

@@ -15,9 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "buddy.hpp"
-#include <stdlib.h>
-#include <math.h>
-
 
 void Chunk256::setFree(bool free){
   // Bit 0 of allocationTimeStamp represents if the segment is free or not

ndb/src/common/transporter/buddy.hpp

@@ -17,8 +17,7 @@
 #ifndef BUDDY_H
 #define BUDDY_H
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <ndb_global.h>
 
 typedef unsigned int Uint32;
 typedef unsigned short Uint16;

ndb/src/common/transporter/failoverSCI/failoverSCI.cpp

@@ -14,17 +14,14 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <ndb_global.h>
+
 #include "sisci_types.h"
 #include "sisci_api.h"
 #include "sisci_error.h"
 //#include "sisci_demolib.h"
-#include <strings.h> 
-#include <ndb_types.h>
 #include <NdbTick.h>
-#include "NdbSleep.h"
+#include <NdbSleep.h>
 #define NO_CALLBACK         NULL
 #define NO_FLAGS            0
 #define DATA_TRANSFER_READY 8

ndb/src/common/transporter/perftest/perfTransporterTest.cpp

@@ -14,18 +14,17 @@
    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 "TransporterRegistry.hpp"
 #include "TransporterDefinitions.hpp"
 #include "TransporterCallback.hpp"
 #include <RefConvert.hpp>
 
-#include <NdbStdio.h>
-#include <stdlib.h>
 #include <NdbTick.h>
 #include <NdbMain.h>
 #include <NdbOut.hpp>
 #include <NdbSleep.h>
-#include <NdbString.h>
 
 int basePortTCP = 17000;
 

ndb/src/common/transporter/priotest/prioTransporterTest.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 "TransporterRegistry.hpp"
 #include "TransporterDefinitions.hpp"
 #include "TransporterCallback.hpp"
@@ -21,8 +23,6 @@
 
 #include "prioTransporterTest.hpp"
 
-#include <NdbStdio.h>
-#include <stdlib.h>
 #include <NdbTick.h>
 #include <NdbMain.h>
 #include <NdbOut.hpp>

ndb/src/common/util/Base64.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 <stdio.h>
-#include <string.h>
+#include <ndb_global.h>
 #include <Base64.hpp>
 
 static char base64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"

ndb/src/common/util/BaseString.cpp

@@ -15,11 +15,9 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* -*- c-basic-offset: 4; -*- */
-#include <string.h>
-#include <NdbStdio.h>
+#include <ndb_global.h>
+#include <BaseString.hpp>
 #include <stdarg.h>
-#include "BaseString.hpp"
-#include <stdlib.h>
 
 BaseString::BaseString()
 {

ndb/src/common/util/File.cpp

@@ -16,8 +16,6 @@
 
 #include <File.hpp>
 
-#include <errno.h>
-#include <string.h> 
 #include <sys/stat.h> 
 
 #if defined NDB_OSE || defined NDB_SOFTOSE

ndb/src/common/util/Parser.cpp

@@ -15,12 +15,12 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+#include <assert.h>
+
 #include "Parser.hpp"
-#include <stdio.h>
 #include <NdbOut.hpp>
-#include <string.h>
 #include <Properties.hpp>
-#include <assert.h>
 #include <Base64.hpp>
 
 #define DEBUG(x) ndbout << x << endl;

ndb/src/common/util/Properties.cpp

@@ -14,14 +14,12 @@
    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 <assert.h>
+
 #include <Properties.hpp>
 
 #include <NdbTCP.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <NdbString.h>
-
 #include <NdbOut.hpp>
 
 /**

ndb/src/common/util/SimpleProperties.cpp

@@ -14,9 +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 <SimpleProperties.hpp>
-#include <stdlib.h>
-#include <NdbString.h>
 #include <NdbOut.hpp>
 #include <NdbTCP.h>
 #include <assert.h>

ndb/src/common/util/SocketServer.cpp

@@ -15,17 +15,16 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+#include <assert.h>
+
 #include "SocketServer.hpp"
 
 #include <NdbTCP.h>
-#include <string.h>
 #include <NdbOut.hpp>
 #include <NdbThread.h>
 #include <NdbSleep.h>
 
-#include <stdio.h>
-#include <assert.h>
-
 #define DEBUG(x) ndbout << x << endl;
 
 SocketServer::SocketServer(int maxSessions) :

ndb/src/common/util/getarg.c

@@ -33,11 +33,7 @@
  */
 
 #include <ndb_global.h>
-#include <ndb_types.h>
 
-#include <NdbStdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <time.h>
 #include <ctype.h>
 #include "getarg.h"

ndb/src/common/util/new.cpp

 
-#include <malloc.h>
-#include <stdlib.h>
+#include <ndb_global.h>
 
 extern "C" {
   void (* ndb_new_handler)() = 0;

ndb/src/common/util/random.c

@@ -18,16 +18,8 @@
 * I N C L U D E D   F I L E S                                  *
 ***************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <sys/types.h>
+#include <ndb_global.h>
 
-#ifndef NDB_WIN32
-#include <sys/time.h>
-#endif
-
-#include <ndb_types.h>
 #include <NdbOut.hpp>
 
 #include <random.h>

ndb/src/common/util/strdup.c

@@ -16,7 +16,6 @@
 
 
 #include <ndb_global.h>
-#include <stdlib.h>
 
 #ifndef HAVE_STRDUP
 char *

ndb/src/common/util/testProperties/testProperties.cpp

@@ -14,10 +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 <ndb_global.h>
 #include "Properties.hpp"
 #include <NdbOut.hpp>
-#include <stdlib.h>
-#include <string.h>
 
 #include "uucode.h"
 

ndb/src/common/util/testSimpleProperties/sp_test.cpp

@@ -14,10 +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 <assert.h>
+
 #include "SimpleProperties.hpp"
 #include <NdbOut.hpp>
-#include <assert.h>
-#include <stdio.h>
 
 Uint32 page[8192];
 

ndb/src/common/util/uucode.c

@@ -15,8 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include <stdio.h>
-#include <string.h>
+#include <ndb_global.h>
 
 /* ENC is the basic 1 character encoding function to make a char printing */
 /* DEC is single character decode */

ndb/src/common/util/version.c

@@ -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 <stdio.h>
-#include <string.h>
-#include <ndb_types.h>
+#include <ndb_global.h>
 #include <ndb_version.h>
 #include <version.h>
 

ndb/src/cw/cpcc-win32/C++/StdAfx.h

@@ -48,15 +48,12 @@
 #include <afxtempl.h>
 
 // C RunTime Header Files
-#include <stdlib.h>
-#include <malloc.h>
+#include <ndb_global.h>
 #include <memory.h>
 #include <tchar.h>
 #include <commctrl.h>
 #include <shlwapi.h>
 #include <crtdbg.h>
-#include <string.h>
-#include <stdio.h>
 
 // Local Header Files
 #include "resource.h"

ndb/src/cw/cpcd/Process.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 <sys/types.h>
+#include <ndb_global.h>
 #include <signal.h>
 
 #include <assert.h>
-#include <stdlib.h>
 
-#include <NdbUnistd.h>
 #include <BaseString.hpp>
 #include <InputStream.hpp>
 
@@ -28,8 +26,6 @@
 #include "CPCD.hpp"
 
 #include <pwd.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/resource.h>
 

ndb/src/cw/cpcd/common.hpp

@@ -17,7 +17,7 @@
 #ifndef __CPCD_COMMON_HPP_INCLUDED__
 #define __CPCD_COMMON_HPP_INCLUDED__
 
-#include <stdio.h>
+#include <ndb_global.h>
 #include <logger/Logger.hpp>
 #include <getarg.h>
 

ndb/src/cw/test/socketclient/socketClientTest.cpp

@@ -15,11 +15,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
 #include <NdbOut.hpp>
 #include <Properties.hpp>
 #include <socket_io.h>
-#include <NdbStdio.h>
-#include <stdlib.h>
 #include <NdbTick.h>
 #include <NdbMain.h>
 #include <NdbSleep.h>

ndb/src/cw/util/ClientInterface.hpp

@@ -16,6 +16,7 @@
 
 #ifndef CLIENT_IF_HPP
 #define CLIENT_IF_HPP
+#include <ndb_global.h>
 #include <Parser.hpp>
 #include <InputStream.hpp>
 #include <Parser.hpp>
@@ -23,9 +24,6 @@
 #include <Properties.hpp>
 #include "SocketRegistry.hpp"
 #include "SocketService.hpp"
-#include "string.h"
-#include <stdio.h>
-#include <stdlib.h>
 
 class ClientInterface {
 private:

ndb/src/kernel/blocks/backup/FsBuffer.hpp

@@ -17,10 +17,8 @@
 #ifndef FS_BUFFER_HPP
 #define FS_BUFFER_HPP
 
+#include <ndb_global.h>
 #include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ndb_types.h>
 
 #define DEBUG(x)
 

ndb/src/kernel/blocks/backup/read.cpp

@@ -15,9 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <ndb_global.h>
 
 #include <NdbTCP.h>
 #include <NdbOut.hpp>

ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp

@@ -15,13 +15,12 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include <NdbStdio.h>
+#include <ndb_global.h>
+#include <sys/stat.h>
+
 #include <NdbMain.h>
 #include <NdbOut.hpp>
 #include <SchemaFile.hpp>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
 
 void 
 usage(const char * prg){

ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp

@@ -15,13 +15,12 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include <NdbStdio.h>
+#include <ndb_global.h>
+#include <sys/stat.h>
+
 #include <NdbMain.h>
 #include <NdbOut.hpp>
 #include <Sysfile.hpp>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
 
 void 
 usage(const char * prg){

ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp

@@ -25,11 +25,10 @@
 //----------------------------------------------------------------
 
 
+#include <ndb_global.h>
+
 #include "records.hpp"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+
 #define RETURN_ERROR 1
 #define RETURN_OK 0
 

ndb/src/kernel/blocks/ndbfs/Filename.cpp

@@ -14,10 +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 <stdlib.h>
-#include <string.h>
-#include <NdbStdio.h>
-#include <NdbUnistd.h>
+#include <ndb_global.h>
+
 #include <NdbOut.hpp>
 
 #include "Filename.hpp"

ndb/src/kernel/error/ErrorReporter.hpp

@@ -17,9 +17,10 @@
 #ifndef ERRORREPORTER_H
 #define ERRORREPORTER_H
 
+#include <ndb_global.h>
+
 #include "TimeModule.hpp"
 #include "Error.hpp"
-#include <stdio.h>
 #include <Emulator.hpp>
 
 

ndb/src/kernel/vm/Emulator.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 "Emulator.hpp"
 #include <FastScheduler.hpp>
 #include <SignalLoggerManager.hpp>
@@ -31,7 +33,6 @@
 #include <NdbOut.hpp>
 #include <NdbMutex.h>
 #include <NdbSleep.h>
-#include <stdlib.h>
 #include <new>
 
 extern "C" {

ndb/src/kernel/vm/GlobalData.hpp

@@ -17,11 +17,11 @@
 #ifndef GLOBAL_DATA_H
 #define GLOBAL_DATA_H
 
+#include <ndb_global.h>
 #include <kernel_types.h>
+#include <assert.h>
 #include "Prio.hpp"
 #include "VMSignal.hpp"
-#include <stdlib.h>
-#include <assert.h>
 
 #include <BlockNumbers.h>
 #include <NodeState.hpp>

ndb/src/kernel/vm/TransporterCallback.cpp

@@ -14,12 +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 <TransporterCallback.hpp>
 #include <TransporterRegistry.hpp>
 #include <FastScheduler.hpp>
 #include <Emulator.hpp>
 #include <ErrorHandlingMacros.hpp>
-#include <stdio.h>
 
 #include "LongSignal.hpp"
 

ndb/src/kernel/vm/VMSignal.hpp

@@ -17,14 +17,15 @@
 #ifndef VMSignal_H
 #define VMSignal_H
 
+#include <ndb_global.h>
+#include <ndb_limits.h>
+#include <kernel_types.h>
+
 #include <ErrorReporter.hpp>
 #include <NodeBitmask.hpp>
 
-#include <ndb_limits.h>
-#include <kernel_types.h>
 #include <RefConvert.hpp>
 #include <TransporterDefinitions.hpp>
-#include <stdlib.h>
 
 /**
  * Struct used when sending to multiple blocks

ndb/src/kernel/vm/al_test/arrayListTest.cpp

@@ -16,11 +16,12 @@
 
 
 
+#include <ndb_global.hpp>
+#include <assert.h>
+
 #include <ArrayList.hpp>
-#include <stdlib.h>
 #include <NdbOut.hpp>
 #include <NdbTick.h>
-#include <assert.h>
 
 struct A_Listable_Object {
   Uint32 next;

ndb/src/kernel/vm/al_test/arrayPoolTest.cpp

@@ -16,12 +16,12 @@
 
 
 
+#include <ndb_global.h>
+#include <assert.h>
+
 #include <ArrayList.hpp>
-#include <stdlib.h>
 #include <NdbOut.hpp>
 #include <NdbTick.h>
-#include <assert.h>
-#include <string.h>
 
 struct A_Poolable_Object {
   Uint32 next;

ndb/src/kernel/vm/al_test/main.cpp

@@ -14,11 +14,12 @@
    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 <assert.h>
+
 #include <ArrayList.hpp>
-#include <stdlib.h>
 #include <NdbOut.hpp>
 #include <NdbTick.h>
-#include <assert.h>
 #include <NdbMain.h>
 
 #include "arrayListTest.cpp"

ndb/src/kernel/vm/testCopy/rr.cpp

@@ -15,10 +15,9 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+
 #include <sched.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdio.h>
 
 int
 main(int argc, char * const argv[]){

ndb/src/kernel/vm/testCopy/testCopy.cpp

@@ -15,11 +15,9 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
 #include <NdbOut.hpp>
 #include <NdbTick.h>
-#include <ndb_types.h>
-#include <string.h>
-#include <stdlib.h>
 
 #ifdef __NDB_FORTE6
 #define HAND

ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp

@@ -14,10 +14,12 @@
    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 <NdbTick.h>
 #include <DataBuffer.hpp>
-#include <stdlib.h>
-#include <string.h>
+
+#undef test
 
 struct Buffer {
   Buffer(Uint32 size){ m_sz = size; buffer = new Uint32[m_sz]; m_len = 0;}

ndb/src/kernel/vm/testLongSig/testLongSig.cpp

@@ -15,10 +15,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+#include <assert.h>
 #include <editline/editline.h>
 #include <SignalSender.hpp>
-#include <assert.h>
-#include <stdlib.h>
 
 void
 print_help(){

ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp

@@ -14,12 +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 <NdbTick.h>
 #include <TransporterDefinitions.hpp>
 #include <SimpleProperties.hpp>
 #include <LongSignal.hpp>
-#include <stdlib.h>
-#include <string.h>
+
+#undef test
 
 struct Buffer {
   Buffer(Uint32 size){ m_sz = size; buffer = new Uint32[m_sz]; m_len = 0;}

ndb/src/mgmapi/mgmapi.cpp

@@ -14,17 +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 <NdbTCP.h>
 #include "mgmapi.h"
 #include "mgmapi_debug.h"
 #include <socket_io.h>
 
-#include <stdlib.h>
-
-#include <string.h>
-#include <NdbStdio.h>
-#include <NdbString.h>
-#include <errno.h>
 #include <NdbOut.hpp>
 #include <SocketServer.hpp>
 #include <Parser.hpp>

ndb/src/mgmapi/test/keso.c

@@ -15,6 +15,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include <ndb_global.h>
+
 #include <mgmapi.h>
 
 #ifdef VM_TRACE
@@ -22,9 +24,6 @@
 #endif
 
 #include <NdbOut.hpp>
-#include <NdbStdio.h>
-
-#include <stdlib.h>
 
 static int testConnect(NdbMgmHandle h, struct ndb_mgm_reply* reply);
 static int testDisconnect(NdbMgmHandle h, struct ndb_mgm_reply* reply);

ndb/src/mgmapi/test/mgmSrvApi.cpp

@@ -25,11 +25,9 @@
  *       Server API" document
  *  
  *****************************************************/
+#include <ndb_global.h>
 #include "mgmapi.h"
 #include "mgmapi_commands.h"
-#include <stdlib.h>
-#include <string.h> 
-#include <stdio.h>
 #include <NdbMain.h>
 #include <NdbOut.hpp>