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

ndb/examples/ndbapi_async_example/ndbapi_async.cpp

@@ -63,20 +63,12 @@
  */
 
 
+#include <ndb_global.h>
+
 #include <NdbApi.hpp>
 #include <NdbScanFilter.hpp>
 #include <iostream> // Used for cout
 
-#ifdef SOLARIS
-#include <sys/types.h>
-#include <unistd.h>
-#endif
-
-#if defined LINUX || defined MACOSX
-#include <time.h>
-#include <unistd.h>
-#endif
-
 /**
  * Helper sleep function
  */

ndb/examples/ndbapi_scan_example/ndbapi_scan.cpp

@@ -85,21 +85,13 @@
  */
 
 
+#include <ndb_global.h>
+
 #include <NdbApi.hpp>
 #include <NdbScanFilter.hpp>
 // Used for cout
 #include <iostream>
 
-#ifdef SOLARIS
-#include <sys/types.h>
-#include <unistd.h>
-#endif
-
-#if defined LINUX || defined MACOSX
-#include <time.h>
-#include <unistd.h>
-#endif
-
 /**
  * Helper sleep function
  */

ndb/include/debugger/SignalLoggerManager.hpp

@@ -24,7 +24,6 @@
 #define SignalLoggerManager_H
 
 
-#include <NdbStdio.h>
 #include <kernel_types.h>
 #include <BlockNumbers.h>
 #include <TransporterDefinitions.hpp>

ndb/include/kernel/LogLevel.hpp

@@ -17,8 +17,7 @@
 #ifndef _LOG_LEVEL_HPP
 #define _LOG_LEVEL_HPP
 
-#include <ndb_types.h>
+#include <ndb_global.h>
-#include <assert.h>
 
 /**
  * 

ndb/include/kernel/signaldata/BuildIndx.hpp

@@ -19,7 +19,6 @@
 
 #include "SignalData.hpp"
 #include <NodeBitmask.hpp>
-#include <NdbString.h>
 #include <signaldata/DictTabInfo.hpp>
 
 /**

ndb/include/kernel/signaldata/SignalData.hpp

@@ -20,7 +20,6 @@
 #include <ndb_global.h>
 #include <ndb_limits.h>
 #include <kernel_types.h>
-#include <NdbConstant.hpp>
 
 #ifndef NDB_ASSERT
 #ifdef VM_TRACE

ndb/include/kernel/signaldata/SignalDataPrint.hpp

@@ -17,8 +17,8 @@
 #ifndef SIGNAL_DATA_PRINT_H
 #define SIGNAL_DATA_PRINT_H
 
+#include <ndb_global.h>
 #include <kernel_types.h>
-#include <NdbStdio.h>
 
 /**
  * Typedef for a Signal Data Print Function

ndb/include/logger/LogHandler.hpp

@@ -19,7 +19,6 @@
 
 #include "Logger.hpp"
 
-#include <NdbStdio.h> // Defines NULL
 
 /**
  * This class is the base class for all log handlers. A log handler is 

ndb/include/logger/Logger.hpp

@@ -17,8 +17,8 @@
 #ifndef Logger_H
 #define Logger_H
 
+#include <ndb_global.h>
 #include <BaseString.hpp>
-#include <stdarg.h>
 
 class LogHandler;
 class LogHandlerList;

ndb/include/ndb_global.h

@@ -1,6 +1,72 @@
+
+#ifndef NDBGLOBAL_H
+#define NDBGLOBAL_H
+
 #include <my_global.h>
 #include <m_string.h>
 #include <m_ctype.h>
 #include <ndb_types.h>
 #include <ctype.h>
+#include <stdarg.h>
+#include <time.h>
+#include <fcntl.h>
 #include <sys/param.h>
+#include <sys/stat.h>
+
+#ifndef NDB_MACOSX
+#include <sys/mman.h>
+#endif
+
+#ifdef NDB_WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+
+#define DIR_SEPARATOR "\\"
+#define PATH_MAX 256
+
+#pragma warning(disable: 4503 4786)
+#else
+
+#define DIR_SEPARATOR "/"
+
+#endif
+
+#ifdef NDB_VC98
+#define STATIC_CONST(x) enum { x }
+#else
+#define STATIC_CONST(x) static const Uint32 x
+#endif
+
+#ifdef  __cplusplus
+#include <new>
+#endif
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+	
+#include <assert.h>
+
+#ifndef HAVE_STRDUP
+extern char * strdup(const char *s);
+#endif
+
+#ifndef HAVE_STRLCPY
+extern size_t strlcpy (char *dst, const char *src, size_t dst_sz);
+#endif
+
+#ifndef HAVE_STRLCAT
+extern size_t strlcat (char *dst, const char *src, size_t dst_sz);
+#endif
+
+#ifndef HAVE_STRCASECMP
+extern int strcasecmp(const char *s1, const char *s2);
+extern int strncasecmp(const char *s1, const char *s2, size_t n);
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif

ndb/include/ndb_types.h

@@ -21,11 +21,6 @@
 #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;
 typedef          short Int16;

ndb/include/newtonapi/defs/pcn_types.h

@@ -17,8 +17,7 @@
 #ifndef PCN_TYPES_H
 #define PCN_TYPES_H
 
-#include <stddef.h>
+#include <ndb_global.h>
-#include <NdbUnistd.h>
 
 #ifdef NDB_MACOSX
 typedef unsigned int Size_t;

ndb/include/portlib/NdbConstant.hpp

@@ -1,28 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef NDB_CONSTANT_HPP
-#define NDB_CONSTANT_HPP
-
-#include <ndb_types.h>
-
-#ifdef NDB_VC98
-#define STATIC_CONST(x) enum { x }
-#else
-#define STATIC_CONST(x) static const Uint32 x
-#endif
-
-#endif

ndb/include/portlib/NdbMem.h

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

ndb/include/portlib/NdbStdio.h

@@ -1,36 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* 
- * NdbStdio.h - stdio.h for ndb
- *  
- *
- */
-
-
-#if defined NDB_OSE || defined NDB_SOFTOSE
-/* On OSE Delta the snprintf is declare in outfmt.h */
-#include <outfmt.h>
-#endif
-
-#include <ndb_global.h>
-
-#ifdef NDB_WIN32
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
-#define strtok_r(s1, s2, l) strtok(s1, s2)
-#endif
-

ndb/include/portlib/NdbTCP.h

@@ -17,6 +17,8 @@
 #ifndef NDB_TCP_H
 #define NDB_TCP_H
 
+#include <ndb_global.h>
+
 #if defined NDB_OSE || defined NDB_SOFTOSE
 /**
  * Include files needed
@@ -24,7 +26,6 @@
 #include "inet.h"
 
 #include <netdb.h>
-#include <errno.h>
 
 #define NDB_NONBLOCK FNDELAY
 #define NDB_SOCKET_TYPE int
@@ -40,20 +41,15 @@ typedef int socklen_t;
 
 #endif
 
-#if defined NDB_SOLARIS || defined NDB_HPUX || defined NDB_IBMAIX || defined NDB_TRU64X
+#if defined NDB_SOLARIS || defined NDB_HPUX || defined NDB_IBMAIX || defined NDB_TRU64X || NDB_LINUX || defined NDB_MACOSX
 /**
  * Include files needed
  */
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
-#include <unistd.h>
 
 #include <netdb.h>
-#include <errno.h>
-#include <fcntl.h>
 
 #define NDB_NONBLOCK O_NONBLOCK
 #define NDB_SOCKET_TYPE int
@@ -64,39 +60,12 @@ typedef int socklen_t;
 
 #endif
 
-#if defined NDB_LINUX || defined NDB_MACOSX
-/**
- * Include files needed
- */
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-
-#include <netdb.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#define NDB_NONBLOCK O_NONBLOCK
-#define NDB_SOCKET_TYPE int
-#define NDB_INVALID_SOCKET -1
-#define NDB_CLOSE_SOCKET(x) close(x)
-
-#define InetErrno errno
-
-#endif
-
-
 #ifdef NDB_WIN32
 /**
  * Include files needed
  */
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <errno.h>
 
 #define InetErrno WSAGetLastError()
 #define EWOULDBLOCK WSAEWOULDBLOCK

ndb/include/portlib/NdbUnistd.h

@@ -1,39 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef NDB_UNISTD_H
-#define NDB_UNISTD_H
-
-#ifdef NDB_WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windows.h>
-#include <limits.h>
-
-#define DIR_SEPARATOR "\\"
-#define PATH_MAX 256
-
-#pragma warning(disable: 4503 4786)
-
-#else
-#include <unistd.h>
-#include <limits.h>
-
-#define DIR_SEPARATOR "/"
-
-#endif
-
-#endif

ndb/include/util/Bitmask.hpp

@@ -18,7 +18,6 @@
 #define NDB_BITMASK_H
 
 #include <ndb_global.h>
-#include <NdbConstant.hpp>
 
 #ifndef NDB_ASSERT
 #define NDB_ASSERT(x, s) \

ndb/include/util/File.hpp

@@ -17,8 +17,7 @@
 #ifndef FILE_H
 #define FILE_H
 
-#include <NdbStdio.h>
+#include <ndb_global.h>
-#include <NdbConstant.hpp>
 
 /**
  * This class provides a file abstraction . It has operations

ndb/include/util/NdbString.h

@@ -1,49 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef __NDBSTRING_H_INCLUDED__
-#define __NDBSTRING_H_INCLUDED__
-
-#include <ndb_global.h>
-#include <sys/types.h>
-#include <string.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-	
-#ifndef HAVE_STRDUP
-extern char * strdup(const char *s);
-#endif
-
-#ifndef HAVE_STRLCPY
-extern size_t strlcpy (char *dst, const char *src, size_t dst_sz);
-#endif
-
-#ifndef HAVE_STRLCAT
-extern size_t strlcat (char *dst, const char *src, size_t dst_sz);
-#endif
-
-#ifndef HAVE_STRCASECMP
-extern int strcasecmp(const char *s1, const char *s2);
-extern int strncasecmp(const char *s1, const char *s2, size_t n);
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* !__NDBSTRING_H_INCLUDED__ */

ndb/include/util/SimpleProperties.hpp

@@ -17,8 +17,7 @@
 #ifndef SIMPLE_PROPERTIES_HPP
 #define SIMPLE_PROPERTIES_HPP
 
-#include <ndb_types.h>
+#include <ndb_global.h>
-#include <stddef.h> // offsetof
 #include <NdbOut.hpp>
 
 /**

ndb/include/util/getarg.h

@@ -52,7 +52,7 @@
 #ifndef __GETARG_H__
 #define __GETARG_H__
 
-#include <stddef.h>
+#include <ndb_global.h>
 
 #ifdef __cplusplus
 extern "C" {

ndb/include/util/socket_io.h

@@ -17,8 +17,9 @@
 #ifndef _SOCKET_IO_H
 #define _SOCKET_IO_H
 
+#include <ndb_global.h>
+
 #include <NdbTCP.h>
-#include <stdarg.h>
 
 #ifdef  __cplusplus
 extern "C" {

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 <ndb_global.h>
-#include <stdlib.h>
-#include <string.h>
-#include <NdbStdio.h>
-#include <stdarg.h>
 #include <NdbApi.hpp>
 #include <common/common.hpp>
 #include "DiagArea.hpp"

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 <ndb_global.h>
-#include <NdbStdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <limits.h>
-#include <math.h>
 #include "DataField.hpp"
-#include <time.h>
 
 #ifndef INT_MAX
 #define INT_MAX		(2147483647)

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
 

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 <ndb_global.h>
-#include <string.h>
-#include <NdbStdio.h>
 #include "OdbcData.hpp"
 
 OdbcData::OdbcData() :

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

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()

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>

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>

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>

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>

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
 //

ndb/src/common/logger/LogHandler.cpp

@@ -17,9 +17,6 @@
 #include "LogHandler.hpp"
 
 #include <NdbTick.h>
-#include <NdbString.h>
-
-#include <time.h>
 
 //
 // PUBLIC

ndb/src/common/logger/LogHandlerList.cpp

@@ -17,8 +17,6 @@
 #include "LogHandlerList.hpp"
 
 #include <LogHandler.hpp>
-#include <NdbStdio.h>
-#include <ndb_types.h>
 
 //
 // PUBLIC

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
 //

ndb/src/common/logger/SysLogHandler.cpp

@@ -17,7 +17,6 @@
 #include "SysLogHandler.hpp"
 
 #include <syslog.h>
-#include <NdbString.h>
 
 //
 // PUBLIC

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"
 

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
 {

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>
 
 /**

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 *);

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>
 

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>
 
 

ndb/src/common/portlib/ose/NdbMutex.c

@@ -19,7 +19,6 @@
 
 #include <pthread.h>
 #include <stdlib.h>
-#include <assert.h>
 
 
 NdbMutex* NdbMutex_Create(void)

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 <ndb_global.h>
-#include <NdbStdio.h>
-#include <stdarg.h>
-#include <NdbUnistd.h>
-#include <string.h>
 
+#include "NdbOut.hpp"
 
 #if defined NDB_SOFTOSE
 #include <dbgprintf.h>

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>
 

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 <ndb_global.h>
-#include <pthread.h>
-#include <assert.h>
-#include <sys/types.h>
-#if defined NDB_MACOSX
-#include <stdlib.h>
-#else
-#include <malloc.h>
-#endif
 
+#include <NdbCondition.h>
+#include <NdbThread.h>
 #include <NdbMutex.h>
 
 struct NdbCondition

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

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 <ndb_global.h>
-#include <string.h>
+
-#include <stdlib.h>
+#include <NdbEnv.h>
 
 const char* NdbEnv_GetEnv(const char* name, char * buf, int buflen)
 {

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 <NdbMem.h>
-#include <assert.h>
-#include <stdlib.h>
-#ifndef NDB_MACOSX
-#include <sys/mman.h>
-#endif
 
 void NdbMem_Create()
 {

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 <NdbThread.h>
-#include <stdlib.h>
+#include <NdbMutex.h>
-#include <assert.h>
 
 NdbMutex* NdbMutex_Create(void)
 {

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
 

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"

ndb/src/common/portlib/win32/NdbMem.c

@@ -16,8 +16,6 @@
 
 
 #include <windows.h>
-#include <assert.h>
-#include <NdbStdio.h>
 
 #include "NdbMem.h"
 

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"
 

ndb/src/common/portlib/win32/NdbThread.c

@@ -17,7 +17,6 @@
 
 #include <windows.h>
 #include <process.h>
-#include <assert.h>
 
 #include "NdbThread.h"
 

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,

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,

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>
 

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, 

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"

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 \

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);
 

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"

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 <ndb_global.h>
-#include <NdbStdio.h>
+
-#include <stdarg.h>
+#include <NdbOut.hpp>
-#include <NdbUnistd.h>
-#include <string.h>
 #include <OutputStream.hpp>
 
 static FileOutputStream ndbouts_fileoutputstream(stdout);

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>
 

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){

ndb/src/common/util/Parser.cpp

@@ -16,7 +16,6 @@
 
 
 #include <ndb_global.h>
-#include <assert.h>
 
 #include "Parser.hpp"
 #include <NdbOut.hpp>

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>
 

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

ndb/src/common/util/SocketServer.cpp

@@ -16,7 +16,6 @@
 
 
 #include <ndb_global.h>
-#include <assert.h>
 
 #include "SocketServer.hpp"
 

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*);
 

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

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
 

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>

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>
 
 /**

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"

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"

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>

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)
 

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>
 

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>

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>

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>

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> 

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

@@ -52,8 +52,8 @@
 //
 //===========================================================================
 
+#include <ndb_global.h>
 #include <kernel_types.h>
-#include <NdbUnistd.h>
 
 class Filename
 {

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

ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp

@@ -65,7 +65,6 @@
 #include "NdbMutex.h"
 #include "NdbCondition.h"
 
-#include <assert.h>
 
 
 

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 <ndb_global.h>
-#include <errno.h>
 
 #include "Ndbfs.hpp"
 #include "AsyncFile.hpp"

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

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
 

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;

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

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>
 

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

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

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"
 

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>

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>