diff --git a/ndb/include/ndb_global.h b/ndb/include/ndb_global.h
index 2975d0a5f78..038950a7a32 100644
--- a/ndb/include/ndb_global.h
+++ b/ndb/include/ndb_global.h
@@ -3,9 +3,11 @@
 #define NDBGLOBAL_H
 
 #include <my_global.h>
-
 #define NDB_BASE_PORT 2200
 
+/** signal & SIG_PIPE */
+#include <my_alarm.h>
+
 #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
 #define NDB_WIN32
 #else
diff --git a/ndb/src/cw/cpcd/Process.cpp b/ndb/src/cw/cpcd/Process.cpp
index a67dba95dc7..0a986f63fda 100644
--- a/ndb/src/cw/cpcd/Process.cpp
+++ b/ndb/src/cw/cpcd/Process.cpp
@@ -15,8 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <ndb_global.h>
-#include <signal.h>
-
 
 #include <BaseString.hpp>
 #include <InputStream.hpp>
diff --git a/ndb/src/cw/cpcd/main.cpp b/ndb/src/cw/cpcd/main.cpp
index 11f6238d5f7..913c31de1f7 100644
--- a/ndb/src/cw/cpcd/main.cpp
+++ b/ndb/src/cw/cpcd/main.cpp
@@ -15,7 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <ndb_global.h>	/* Needed for mkdir(2) */
-#include <signal.h>
 
 #include "CPCD.hpp"
 #include "APIService.hpp"
diff --git a/ndb/src/kernel/main.cpp b/ndb/src/kernel/main.cpp
index 858af88d6de..e68c266c394 100644
--- a/ndb/src/kernel/main.cpp
+++ b/ndb/src/kernel/main.cpp
@@ -38,10 +38,6 @@
 #include <sys/processor.h> // For system informatio
 #endif
 
-#if !defined NDB_SOFTOSE && !defined NDB_OSE
-#include <signal.h>        // For process signals
-#endif
-
 extern EventLogger g_eventLogger;
 
 void catchsigs(bool ignore); // for process signal handling
diff --git a/ndb/src/kernel/vm/Emulator.cpp b/ndb/src/kernel/vm/Emulator.cpp
index c5c9d62f565..75aea2bda7f 100644
--- a/ndb/src/kernel/vm/Emulator.cpp
+++ b/ndb/src/kernel/vm/Emulator.cpp
@@ -35,8 +35,6 @@
 #include <NdbSleep.h>
 #include <new>
 
-#include <signal.h>        // For process signals
-
 extern "C" {
   extern void (* ndb_new_handler)();
 }
diff --git a/ndb/src/mgmclient/main.cpp b/ndb/src/mgmclient/main.cpp
index e70b454a01f..ec468836d84 100644
--- a/ndb/src/mgmclient/main.cpp
+++ b/ndb/src/mgmclient/main.cpp
@@ -24,8 +24,6 @@
 
 #include "CommandInterpreter.hpp"
 
-#include <signal.h>
-
 const char *progname = "ndb_mgm";
 
 
diff --git a/ndb/src/mgmsrv/Services.cpp b/ndb/src/mgmsrv/Services.cpp
index ec734fe24c5..c7a7c520c52 100644
--- a/ndb/src/mgmsrv/Services.cpp
+++ b/ndb/src/mgmsrv/Services.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 <string.h>
+#include <ndb_global.h>
 #include <ctype.h>
 
 #include <uucode.h>
diff --git a/ndb/src/ndbapi/NdbOperationInt.cpp b/ndb/src/ndbapi/NdbOperationInt.cpp
index 2935df9c235..6f8eb1c5e53 100644
--- a/ndb/src/ndbapi/NdbOperationInt.cpp
+++ b/ndb/src/ndbapi/NdbOperationInt.cpp
@@ -699,8 +699,8 @@ NdbOperation::load_const_u64(Uint32 RegDest, Uint64 Constant)
     setErrorCodeAbort(4229);
     return -1;
   }
-  tTemp1 = (Uint32)(Constant & 0xFFFFFFFF);
-  tTemp2 = (Uint32)(Constant >> 32);
+  tTemp1 = (Uint32)(Constant >> 32);
+  tTemp2 = (Uint32)(Constant & 0xFFFFFFFF);
 
   // 64 bit value
   if (insertATTRINFO( Interpreter::LoadConst64(RegDest)) == -1)
diff --git a/ndb/src/ndbapi/TransporterFacade.cpp b/ndb/src/ndbapi/TransporterFacade.cpp
index d1e57e874ee..14ebccbd936 100644
--- a/ndb/src/ndbapi/TransporterFacade.cpp
+++ b/ndb/src/ndbapi/TransporterFacade.cpp
@@ -34,10 +34,6 @@
 #include <ndb_version.h>
 #include <SignalLoggerManager.hpp>
 
-#if !defined NDB_OSE && !defined NDB_SOFTOSE
-#include <signal.h>
-#endif
-
 //#define REPORT_TRANSPORTER
 //#define API_TRACE;