diff --git a/Data/MCTrack.cxx b/Data/MCTrack.cxx
index 5b0a9b5341801..049ce9970127f 100644
--- a/Data/MCTrack.cxx
+++ b/Data/MCTrack.cxx
@@ -118,6 +118,7 @@ Int_t MCTrack::getNumberOfPoints(DetectorId detId) const
   //   return 0;
   // }
   //
+  return 0;
 }
 
 void MCTrack::setNumberOfPoints(Int_t iDet, Int_t nPoints)
diff --git a/Generators/CMakeLists.txt b/Generators/CMakeLists.txt
index 958674cc86334..bc59b0825b7c4 100644
--- a/Generators/CMakeLists.txt
+++ b/Generators/CMakeLists.txt
@@ -22,6 +22,8 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 set(LINK_DIRECTORIES
 ${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${Pythia6_LIBRARY_DIR}
+${PYTHIA8_LIBRARY_DIR}
 ${AlFa_DIR}/lib
 ${SIMPATH}/lib
 )
diff --git a/Generators/Pythia8Generator.cxx b/Generators/Pythia8Generator.cxx
index 29e850e90305a..c2cadc4d22c34 100644
--- a/Generators/Pythia8Generator.cxx
+++ b/Generators/Pythia8Generator.cxx
@@ -12,7 +12,7 @@
 
 #include <math.h>
 #include "TROOT.h"
-#include "Pythia.h"
+#include "Pythia8/Pythia.h"
 #include "FairPrimaryGenerator.h"
 //#include "FairGenerator.h"
 
@@ -40,7 +40,17 @@ Bool_t Pythia8Generator::Init()
   fPythia.setRndmEnginePtr(fRandomEngine);
   
   cout<<"Beam Momentum "<<fMom<<endl;
-  fPythia.init(fId, 2212, 0., 0., fMom, 0., 0., 0.);
+  // Set arguments in Settings database.
+  fPythia.settings.mode("Beams:idA",  fId);
+  fPythia.settings.mode("Beams:idB",  2212);
+  fPythia.settings.mode("Beams:frameType",  3);
+  fPythia.settings.parm("Beams:pxA",    0.);
+  fPythia.settings.parm("Beams:pyA",    0.);
+  fPythia.settings.parm("Beams:pzA",    fMom);
+  fPythia.settings.parm("Beams:pxB",    0.);
+  fPythia.settings.parm("Beams:pyB",    0.);
+  fPythia.settings.parm("Beams:pzB",    0.);
+  fPythia.init();
   return kTRUE;
 }
 // -------------------------------------------------------------------------
diff --git a/Generators/Pythia8Generator.h b/Generators/Pythia8Generator.h
index e53f9a25f1c1f..2fa567b58c4c3 100644
--- a/Generators/Pythia8Generator.h
+++ b/Generators/Pythia8Generator.h
@@ -15,7 +15,7 @@
 
 #include "TROOT.h"
 #include "FairGenerator.h"
-#include "Pythia.h"
+#include "Pythia8/Pythia.h"
 #include "TRandom1.h"
 #include "TRandom3.h"
 
diff --git a/devices/aliceHLTwrapper/AliHLTDataTypes.h b/devices/aliceHLTwrapper/AliHLTDataTypes.h
index d36e3cae6a41b..bb7cb7b1412b2 100644
--- a/devices/aliceHLTwrapper/AliHLTDataTypes.h
+++ b/devices/aliceHLTwrapper/AliHLTDataTypes.h
@@ -1433,6 +1433,7 @@ extern "C" {
 
 }
 
+namespace std {}
 using namespace std;
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/devices/aliceHLTwrapper/Component.cxx b/devices/aliceHLTwrapper/Component.cxx
index ebbcc2de66762..e0f173f4afef1 100644
--- a/devices/aliceHLTwrapper/Component.cxx
+++ b/devices/aliceHLTwrapper/Component.cxx
@@ -305,7 +305,7 @@ int Component::process(vector<MessageFormat::BufferDesc_t>& dataArray,
         for (; ci != inputBlocks.end(); ci++) {
           AliHLTUInt8_t* pInputBufferStart = reinterpret_cast<AliHLTUInt8_t*>(ci->fPtr);
           AliHLTUInt8_t* pInputBufferEnd = pInputBufferStart + ci->fSize;
-          if (bValid = (pStart >= pInputBufferStart && pEnd <= pInputBufferEnd)) {
+          if ((bValid = (pStart >= pInputBufferStart && pEnd <= pInputBufferEnd))) {
             break;
           }
         }
diff --git a/devices/flp2epn-distributed/CMakeLists.txt b/devices/flp2epn-distributed/CMakeLists.txt
index 6a5a9f169089e..c04de292c0d3c 100644
--- a/devices/flp2epn-distributed/CMakeLists.txt
+++ b/devices/flp2epn-distributed/CMakeLists.txt
@@ -5,6 +5,7 @@ set(INCLUDE_DIRECTORIES
 set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR}
+  ${ZMQ_INCLUDE_DIR}
   ${FAIRROOT_INCLUDE_DIR}
   ${AlFa_DIR}/include
 )
diff --git a/devices/flp2epn-distributed/FLPSender.cxx b/devices/flp2epn-distributed/FLPSender.cxx
index 2e39541c9707e..107807ea2d9d7 100644
--- a/devices/flp2epn-distributed/FLPSender.cxx
+++ b/devices/flp2epn-distributed/FLPSender.cxx
@@ -7,6 +7,7 @@
 
 #include <vector>
 #include <cstdint> // UINT64_MAX
+#include <cassert>
 
 #include <boost/thread.hpp>
 #include <boost/bind.hpp>
@@ -298,4 +299,5 @@ ptime FLPSender::GetProperty(const int key, const ptime default_, const int slot
     case OutputHeartbeat:
       return fOutputHeartbeat.at(slot);
   }
+  assert(false);
 }
diff --git a/devices/flp2epn-dynamic/CMakeLists.txt b/devices/flp2epn-dynamic/CMakeLists.txt
index b3ce32a0ce626..c6d07842dda8f 100644
--- a/devices/flp2epn-dynamic/CMakeLists.txt
+++ b/devices/flp2epn-dynamic/CMakeLists.txt
@@ -6,6 +6,7 @@ set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
   ${Boost_INCLUDE_DIR}
   ${FAIRROOT_INCLUDE_DIR}
+  ${ZMQ_INCLUDE_DIR}
 )
 
 include_directories(${INCLUDE_DIRECTORIES})
diff --git a/devices/flp2epn-dynamic/O2FLPex.cxx b/devices/flp2epn-dynamic/O2FLPex.cxx
index d63cb1421bef2..1c18dc212e5fc 100644
--- a/devices/flp2epn-dynamic/O2FLPex.cxx
+++ b/devices/flp2epn-dynamic/O2FLPex.cxx
@@ -14,6 +14,7 @@
 #include <boost/bind.hpp>
 #include <iostream>
 #include <sstream>
+#include <cassert>
 
 #include "O2FLPex.h"
 #include "FairMQLogger.h"
@@ -188,4 +189,5 @@ boost::posix_time::ptime O2FLPex::GetProperty(const int key, const boost::posix_
     case OutputHeartbeat:
       return fOutputHeartbeat.at(slot);
   }
+  assert(false);
 }
diff --git a/devices/flp2epn/CMakeLists.txt b/devices/flp2epn/CMakeLists.txt
index b2f0dc338bc9d..47cf5c76988ff 100644
--- a/devices/flp2epn/CMakeLists.txt
+++ b/devices/flp2epn/CMakeLists.txt
@@ -6,6 +6,7 @@ set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
   ${Boost_INCLUDE_DIR}
   ${FAIRROOT_INCLUDE_DIR}
+  ${ZMQ_INCLUDE_DIR}
   ${AlFa_DIR}/include
 )
 
diff --git a/devices/hough/CMakeLists.txt b/devices/hough/CMakeLists.txt
index a324ecb692d41..44308c5c90bb3 100644
--- a/devices/hough/CMakeLists.txt
+++ b/devices/hough/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR}
+  ${ROOT_INCLUDE_DIR}
   ${ALIROOT}/include
   ${SIMPATH}/include/root
 )
@@ -9,6 +10,7 @@ include_directories(SYSTEM ${INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
   ${Boost_LIBRARY_DIRS}
+  ${ROOT_LIBRARY_DIR}
   ${ALIROOT}/lib
   ${SIMPATH}/lib/root
 )
diff --git a/devices/roundtrip/CMakeLists.txt b/devices/roundtrip/CMakeLists.txt
index 7d5d0ba8cafa7..a5129d982aa0b 100644
--- a/devices/roundtrip/CMakeLists.txt
+++ b/devices/roundtrip/CMakeLists.txt
@@ -6,6 +6,7 @@ set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR}
   ${FAIRROOT_INCLUDE_DIR}
+  ${ZMQ_INCLUDE_DIR}
   ${AlFa_DIR}/include
 )
 
diff --git a/its/ContainerFactory.cxx b/its/ContainerFactory.cxx
index f5f117c6a6809..a9615f2196420 100644
--- a/its/ContainerFactory.cxx
+++ b/its/ContainerFactory.cxx
@@ -39,4 +39,5 @@ FairParSet* ContainerFactory::createContainer(FairContainer* c)
   //                          c->GetTitle(),c->getContext());
   //}
   // return p;
+  return 0;
 }
diff --git a/o2cdb/CMakeLists.txt b/o2cdb/CMakeLists.txt
index 1e01431b69d4e..23527baf72d59 100644
--- a/o2cdb/CMakeLists.txt
+++ b/o2cdb/CMakeLists.txt
@@ -6,6 +6,7 @@ set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
   ${Boost_INCLUDE_DIR}
   ${ROOT_INCLUDE_DIR}
+  ${FAIRROOT_INCLUDE_DIR}
 )
 
 include_directories(${INCLUDE_DIRECTORIES})
diff --git a/passive/PassiveContFact.cxx b/passive/PassiveContFact.cxx
index b50006dab3a61..a936b636a1179 100644
--- a/passive/PassiveContFact.cxx
+++ b/passive/PassiveContFact.cxx
@@ -71,5 +71,6 @@ FairParSet* PassiveContFact::createContainer(FairContainer* c)
   }
   return p;
 */
+  return 0;
 }
 
diff --git a/tpc/ContainerFactory.cxx b/tpc/ContainerFactory.cxx
index 7a5abc3cbb5f5..337d53a9029fe 100644
--- a/tpc/ContainerFactory.cxx
+++ b/tpc/ContainerFactory.cxx
@@ -51,4 +51,5 @@ FairParSet* ContainerFactory::createContainer(FairContainer* c)
   }
   return p;
      */
+  return 0;
 }