--- Makefile	2013-10-24 10:21:54.000000000 +0200
+++ ../roc_new/Makefile	2013-10-23 16:25:38.000000000 +0200
@@ -144,9 +144,9 @@
 ## from here is configuration part, not required in other tools
 
 ifdef debug
-CXXOPT = -g -O2 -Wall -fPIC
+CXXOPT = -g -O2 -Wall -fPIC -I$(SIMPATH)/include
 else
-CXXOPT = -O2 -fPIC
+CXXOPT = -O2 -fPIC -I$(SIMPATH)/include
 endif
 
 ifeq ($(shell uname -m),x86_64)
--- dabc/applications/core-test/core-test.cxx.orig	2012-01-03 15:00:32.000000000 +0100
+++ dabc/applications/core-test/core-test.cxx	2014-02-04 08:55:29.867995877 +0100
@@ -12,6 +12,8 @@
  * in LICENSE.txt file which is part of the distribution.
  ********************************************************************/
 
+#include <unistd.h>
+
 #include "dabc/logging.h"
 
 #include "dabc/FileIO.h"
--- dabc/base/src/SocketDevice.cxx~	2011-05-27 13:18:53.000000000 +0200
+++ dabc/base/src/SocketDevice.cxx	2014-02-03 12:56:14.000000000 +0100
@@ -20,6 +20,8 @@
 #include "dabc/Configuration.h"
 #include "dabc/ConnectionManager.h"
 
+#include <unistd.h>
+
 #define SocketServerTmout 0.2
 
 // this is fixed-size message for exchanging during protocol execution
--- dabc/base/src/SocketThread.cxx~	2014-02-03 12:46:15.000000000 +0100
+++ dabc/base/src/SocketThread.cxx	2014-02-03 12:57:04.000000000 +0100
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <unistd.h>
 
 #include "dabc/logging.h"
 #include "dabc/Manager.h"
--- dabc/base/src/statistic.cxx~	2011-05-27 13:18:53.000000000 +0200
+++ dabc/base/src/statistic.cxx	2014-02-03 12:53:21.000000000 +0100
@@ -15,6 +15,7 @@
 
 #include <math.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "dabc/logging.h"
 #include "dabc/timing.h"
--- plugin2/src/UdpDevice.cxx~	2014-02-03 18:47:44.000000000 +0100
+++ plugin2/src/UdpDevice.cxx	2014-02-03 19:01:41.000000000 +0100
@@ -16,6 +16,7 @@
 
 #include <iostream>
 #include <fstream>
+#include <unistd.h> 
 
 #include "dabc/Manager.h"
 #include "dabc/Port.h"
@@ -171,10 +172,10 @@
           cmd.IsName(roc::UdpDevice::CmdPutSuspendDaq()) ||
           cmd.IsName(roc::UdpDevice::CmdPutDisconnect()) ||
           cmd.IsName(CmdDLM::CmdName())) {
-         unsigned errno = res ? ntohl(fControlRecv.value) : roc::Board::kOperNetworkErr;
-         cmd.SetUInt(ErrNoPar, errno);
+         unsigned errornumber = res ? ntohl(fControlRecv.value) : roc::Board::kOperNetworkErr;
+         cmd.SetUInt(ErrNoPar, errornumber);
          if (cmd.GetBool("SwPut", false))
-            fDev->completeSwPut(errno==0);
+            fDev->completeSwPut(errornumber==0);
       } else
       if (cmd.IsName(CmdNOper::CmdName())) {
          uint32_t errcode = res ? ntohl(fControlRecv.value) : roc::Board::kOperNetworkErr;