5 files changed, 4 insertions, 12 deletions
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"