Index: /trunk/FACT++/src/EventBuilder.cc
===================================================================
--- /trunk/FACT++/src/EventBuilder.cc	(revision 19063)
+++ /trunk/FACT++/src/EventBuilder.cc	(revision 19064)
@@ -8,4 +8,5 @@
 #include <list>
 #include <queue>
+#include <functional> // std::bind
 
 #include <boost/algorithm/string/join.hpp>
Index: /trunk/FACT++/src/FitsFile.cc
===================================================================
--- /trunk/FACT++/src/FitsFile.cc	(revision 19063)
+++ /trunk/FACT++/src/FitsFile.cc	(revision 19064)
@@ -295,5 +295,5 @@
             // double check that the data was indeed read from the disk.
             // Go through the fTable instead as colName is empty (yes, it is !)
-            const map<string,CCfits::Column*> &cMap = table->column();
+            const auto &cMap = table->column();
 
             //check that the existing columns are the same as the ones we want to write
Index: /trunk/FACT++/src/MessageDim.h
===================================================================
--- /trunk/FACT++/src/MessageDim.h	(revision 19063)
+++ /trunk/FACT++/src/MessageDim.h	(revision 19064)
@@ -1,4 +1,6 @@
 #ifndef FACT_MessageDim
 #define FACT_MessageDim
+
+#include <functional> // std::function
 
 #include "MessageImp.h"
Index: /trunk/FACT++/src/StateMachineImp.h
===================================================================
--- /trunk/FACT++/src/StateMachineImp.h	(revision 19063)
+++ /trunk/FACT++/src/StateMachineImp.h	(revision 19064)
@@ -7,4 +7,5 @@
 #include <vector>
 #include <memory>
+#include <functional> // std::function
 #include <condition_variable>
 
Index: /trunk/FACT++/src/WindowLog.h
===================================================================
--- /trunk/FACT++/src/WindowLog.h	(revision 19063)
+++ /trunk/FACT++/src/WindowLog.h	(revision 19064)
@@ -6,4 +6,5 @@
 #include <vector>
 #include <fstream>
+#include <functional> // std::bind
 
 #include <ncurses.h> // A_NORMAL etc
@@ -95,5 +96,5 @@
     }
     WindowLog(WindowLog const& log) : std::ios(), std::streambuf(), std::ostream((std::streambuf*)&log), fWindow(log.fWindow), fIsNull(false), fEnableBacklog(true),
-        fQueueFile(bind(&WindowLog::WriteFile, this, std::placeholders::_1))
+        fQueueFile(std::bind(&WindowLog::WriteFile, this, std::placeholders::_1))
     {
         //fLogFile.rdbuf()->pubsetbuf(0,0); // Switch off buffering
Index: /trunk/FACT++/src/drivectrl.cc
===================================================================
--- /trunk/FACT++/src/drivectrl.cc	(revision 19063)
+++ /trunk/FACT++/src/drivectrl.cc	(revision 19064)
@@ -1,2 +1,4 @@
+#include <numeric> // std::accumulate
+
 #include <boost/regex.hpp>
 #include <boost/algorithm/string.hpp>
Index: /trunk/FACT++/src/smartfact.cc
===================================================================
--- /trunk/FACT++/src/smartfact.cc	(revision 19063)
+++ /trunk/FACT++/src/smartfact.cc	(revision 19064)
@@ -9,4 +9,6 @@
 #include <sys/stat.h> //for file stats
 #include <sys/statvfs.h> //for file statvfs
+
+#include <numeric> // std::accumulate
 
 #include "Dim.h"