From 323db52b6b0a31ba2ba14f9dfd6f8f50e4c107e6 Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilariliusvaara@welho.com>
Date: Thu, 26 Oct 2017 04:41:20 +0300
Subject: [PATCH] Add <functional> to files that use std::function

---
 include/core/advdumper.hpp                     | 1 +
 include/core/memorywatch.hpp                   | 1 +
 include/core/moviefile-common.hpp              | 1 +
 include/core/queue.hpp                         | 1 +
 include/core/romimage.hpp                      | 1 +
 include/library/gamepad.hpp                    | 1 +
 include/library/httpreq.hpp                    | 1 +
 include/library/loadlib.hpp                    | 1 +
 include/library/lua-class.hpp                  | 1 +
 include/library/lua-function.hpp               | 2 ++
 include/library/memorywatch-fb.hpp             | 1 +
 include/library/memorywatch.hpp                | 1 +
 include/library/string.hpp                     | 1 +
 include/library/triplebuffer.hpp               | 1 +
 include/platform/wxwidgets/menu_branches.hpp   | 1 +
 include/platform/wxwidgets/menu_loadrom.hpp    | 1 +
 include/platform/wxwidgets/menu_projects.hpp   | 1 +
 include/platform/wxwidgets/menu_tracelog.hpp   | 1 +
 include/platform/wxwidgets/platform.hpp        | 1 +
 include/platform/wxwidgets/settings-common.hpp | 1 +
 src/core/advdumper.cpp                         | 1 +
 src/core/debug.cpp                             | 1 +
 src/core/fileupload.cpp                        | 1 +
 src/core/jukebox.cpp                           | 1 +
 src/core/memorymanip.cpp                       | 1 +
 src/core/memorywatch.cpp                       | 1 +
 src/core/queue.cpp                             | 1 +
 src/core/romimage.cpp                          | 1 +
 src/core/ui-services.cpp                       | 1 +
 src/emulation/bsnes-legacy/scpu-disasm.cpp     | 1 +
 src/emulation/gambatte/core.cpp                | 1 +
 src/interface/c-interface.cpp                  | 1 +
 src/interface/disassembler.cpp                 | 1 +
 src/library/assembler.cpp                      | 1 +
 src/library/binarystream.cpp                   | 1 +
 src/library/command.cpp                        | 1 +
 src/library/exrethrow.cpp                      | 1 +
 src/library/fileimage.cpp                      | 1 +
 src/library/framebuffer-font2.cpp              | 1 +
 src/library/framebuffer.cpp                    | 1 +
 src/library/gamepad.cpp                        | 1 +
 src/library/httpreq.cpp                        | 1 +
 src/library/loadlib.cpp                        | 1 +
 src/library/lua.cpp                            | 1 +
 src/library/mathexpr-ntype.cpp                 | 1 +
 src/library/mathexpr.cpp                       | 1 +
 src/library/memorywatch-fb.cpp                 | 1 +
 src/library/memorywatch-list.cpp               | 1 +
 src/library/memorywatch.cpp                    | 1 +
 src/library/opus-ogg.cpp                       | 1 +
 src/library/streamcompress.cpp                 | 1 +
 src/library/triplebuffer.cpp                   | 1 +
 src/lua/gui-bitmap.cpp                         | 1 +
 src/platform/wxwidgets/editor-memorywatch.cpp  | 1 +
 src/platform/wxwidgets/loadrommenu.cpp         | 1 +
 src/platform/wxwidgets/main.cpp                | 1 +
 src/platform/wxwidgets/projectmenu.cpp         | 1 +
 src/platform/wxwidgets/scrollbar.cpp           | 1 +
 src/platform/wxwidgets/settings-common.cpp     | 1 +
 src/test/rrdata-test.cpp                       | 1 +
 60 files changed, 61 insertions(+)

diff --git a/include/core/advdumper.hpp b/include/core/advdumper.hpp
index 5643183a..06e176dd 100644
--- a/include/core/advdumper.hpp
+++ b/include/core/advdumper.hpp
@@ -5,6 +5,7 @@
 #include <set>
 #include <stdexcept>
 #include <iostream>
+#include <functional>
 
 #include "library/framebuffer.hpp"
 #include "library/dispatch.hpp"
diff --git a/include/core/memorywatch.hpp b/include/core/memorywatch.hpp
index 95a48d8d..fe676e89 100644
--- a/include/core/memorywatch.hpp
+++ b/include/core/memorywatch.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <stdexcept>
 #include <set>
+#include <functional>
 #include "library/memorywatch.hpp"
 #include "library/json.hpp"
 
diff --git a/include/core/moviefile-common.hpp b/include/core/moviefile-common.hpp
index c1c4b0c1..f45aa2f8 100644
--- a/include/core/moviefile-common.hpp
+++ b/include/core/moviefile-common.hpp
@@ -1,6 +1,7 @@
 #ifndef _moviefile_common__hpp__included__
 #define _moviefile_common__hpp__included__
 
+#include <functional>
 #include "core/moviefile.hpp"
 #define DEFAULT_RTC_SECOND 1000000000ULL
 #define DEFAULT_RTC_SUBSECOND 0ULL
diff --git a/include/core/queue.hpp b/include/core/queue.hpp
index 63209f1d..dcdbbc4a 100644
--- a/include/core/queue.hpp
+++ b/include/core/queue.hpp
@@ -4,6 +4,7 @@
 #include "library/exrethrow.hpp"
 #include "library/keyboard.hpp"
 #include "library/threads.hpp"
+#include <functional>
 #include <deque>
 
 namespace command
diff --git a/include/core/romimage.hpp b/include/core/romimage.hpp
index dcc87990..021d233b 100644
--- a/include/core/romimage.hpp
+++ b/include/core/romimage.hpp
@@ -1,6 +1,7 @@
 #ifndef _romimage__hpp__included__
 #define _romimage__hpp__included__
 
+#include <functional>
 #include "core/rom-small.hpp"
 #include "interface/romtype.hpp"
 #include "library/fileimage.hpp"
diff --git a/include/library/gamepad.hpp b/include/library/gamepad.hpp
index f46c9875..83e7f4d3 100644
--- a/include/library/gamepad.hpp
+++ b/include/library/gamepad.hpp
@@ -1,6 +1,7 @@
 #ifndef _library__gamepad__hpp__included__
 #define _library__gamepad__hpp__included__
 
+#include <functional>
 #include <cstdint>
 #include <set>
 #include "json.hpp"
diff --git a/include/library/httpreq.hpp b/include/library/httpreq.hpp
index 0786b63c..f9406b17 100644
--- a/include/library/httpreq.hpp
+++ b/include/library/httpreq.hpp
@@ -6,6 +6,7 @@
 #include <cstdlib>
 #include <map>
 #include <string>
+#include <functional>
 #include "threads.hpp"
 
 class http_request
diff --git a/include/library/loadlib.hpp b/include/library/loadlib.hpp
index 16c98161..f5e11e04 100644
--- a/include/library/loadlib.hpp
+++ b/include/library/loadlib.hpp
@@ -1,6 +1,7 @@
 #ifndef _library__loadlib__hpp__included__
 #define _library__loadlib__hpp__included__
 
+#include <functional>
 #include <string>
 #include <stdexcept>
 #include <map>
diff --git a/include/library/lua-class.hpp b/include/library/lua-class.hpp
index 8d184c07..dccfe75c 100644
--- a/include/library/lua-class.hpp
+++ b/include/library/lua-class.hpp
@@ -1,6 +1,7 @@
 #ifndef _library__lua_class__hpp__included__
 #define _library__lua_class__hpp__included__
 
+#include <functional>
 #include "lua-base.hpp"
 #include "lua-pin.hpp"
 
diff --git a/include/library/lua-function.hpp b/include/library/lua-function.hpp
index 0300360f..c5cac413 100644
--- a/include/library/lua-function.hpp
+++ b/include/library/lua-function.hpp
@@ -1,6 +1,8 @@
 #ifndef _library__lua_function__hpp__included__
 #define _library__lua_function__hpp__included__
 
+#include <functional>
+
 namespace lua
 {
 class parameters;
diff --git a/include/library/memorywatch-fb.hpp b/include/library/memorywatch-fb.hpp
index 8f392b14..94ec9f62 100644
--- a/include/library/memorywatch-fb.hpp
+++ b/include/library/memorywatch-fb.hpp
@@ -1,6 +1,7 @@
 #ifndef _library__memorywatch_fb__hpp__included__
 #define _library__memorywatch_fb__hpp__included__
 
+#include <functional>
 #include "framebuffer.hpp"
 #include "memorywatch.hpp"
 #include "mathexpr.hpp"
diff --git a/include/library/memorywatch.hpp b/include/library/memorywatch.hpp
index e0f22d05..e3fb6498 100644
--- a/include/library/memorywatch.hpp
+++ b/include/library/memorywatch.hpp
@@ -2,6 +2,7 @@
 #define _library__memorywatch__hpp__included__
 
 #include "mathexpr.hpp"
+#include <functional>
 #include <list>
 #include <set>
 #include <map>
diff --git a/include/library/string.hpp b/include/library/string.hpp
index 359b08c2..2bd03738 100644
--- a/include/library/string.hpp
+++ b/include/library/string.hpp
@@ -1,6 +1,7 @@
 #ifndef _library__string__hpp__included__
 #define _library__string__hpp__included__
 
+#include <functional>
 #include <string>
 #include <sstream>
 #include <set>
diff --git a/include/library/triplebuffer.hpp b/include/library/triplebuffer.hpp
index e431d63d..09861aa6 100644
--- a/include/library/triplebuffer.hpp
+++ b/include/library/triplebuffer.hpp
@@ -1,6 +1,7 @@
 #ifndef _library_triplebuffer__hpp__included__
 #define _library_triplebuffer__hpp__included__
 
+#include <functional>
 #include <stdexcept>
 #include "threads.hpp"
 
diff --git a/include/platform/wxwidgets/menu_branches.hpp b/include/platform/wxwidgets/menu_branches.hpp
index 3f2f4332..e0d973ef 100644
--- a/include/platform/wxwidgets/menu_branches.hpp
+++ b/include/platform/wxwidgets/menu_branches.hpp
@@ -2,6 +2,7 @@
 #define _plat_wxwidgets__menu_branches__hpp__included__
 
 #include "core/dispatch.hpp"
+#include <functional>
 #include <wx/string.h>
 #include <wx/wx.h>
 #include <map>
diff --git a/include/platform/wxwidgets/menu_loadrom.hpp b/include/platform/wxwidgets/menu_loadrom.hpp
index c5300799..25f88e02 100644
--- a/include/platform/wxwidgets/menu_loadrom.hpp
+++ b/include/platform/wxwidgets/menu_loadrom.hpp
@@ -1,6 +1,7 @@
 #ifndef _plat_wxwidgets__menu_loadrom__hpp__included__
 #define _plat_wxwidgets__menu_loadrom__hpp__included__
 
+#include <functional>
 #include <wx/string.h>
 #include <wx/wx.h>
 #include "interface/romtype.hpp"
diff --git a/include/platform/wxwidgets/menu_projects.hpp b/include/platform/wxwidgets/menu_projects.hpp
index afe9cb8c..a2b1e4cd 100644
--- a/include/platform/wxwidgets/menu_projects.hpp
+++ b/include/platform/wxwidgets/menu_projects.hpp
@@ -3,6 +3,7 @@
 
 #include "core/dispatch.hpp"
 #include "library/recentfiles.hpp"
+#include <functional>
 #include <wx/string.h>
 #include <wx/wx.h>
 #include <map>
diff --git a/include/platform/wxwidgets/menu_tracelog.hpp b/include/platform/wxwidgets/menu_tracelog.hpp
index 30e7844b..c8df2020 100644
--- a/include/platform/wxwidgets/menu_tracelog.hpp
+++ b/include/platform/wxwidgets/menu_tracelog.hpp
@@ -2,6 +2,7 @@
 #define _plat_wxwidgets__menu_tracelog__hpp__included__
 
 #include "core/dispatch.hpp"
+#include <functional>
 #include <wx/string.h>
 #include <wx/wx.h>
 #include <map>
diff --git a/include/platform/wxwidgets/platform.hpp b/include/platform/wxwidgets/platform.hpp
index 11f3ae6e..2f07d5ea 100644
--- a/include/platform/wxwidgets/platform.hpp
+++ b/include/platform/wxwidgets/platform.hpp
@@ -11,6 +11,7 @@
 #include "core/window.hpp"
 #include "library/threads.hpp"
 
+#include <functional>
 #include <cstdlib>
 #include <cstdint>
 #include <cstddef>
diff --git a/include/platform/wxwidgets/settings-common.hpp b/include/platform/wxwidgets/settings-common.hpp
index 09be0655..3efcdc4c 100644
--- a/include/platform/wxwidgets/settings-common.hpp
+++ b/include/platform/wxwidgets/settings-common.hpp
@@ -1,6 +1,7 @@
 #ifndef _platform__wxwidgets__settings_common__hpp__included__
 #define _platform__wxwidgets__settings_common__hpp__included__
 
+#include <functional>
 #include <string>
 #include "platform/wxwidgets/platform.hpp"
 #include <wx/wx.h>
diff --git a/src/core/advdumper.cpp b/src/core/advdumper.cpp
index 71d79042..7a9d3467 100644
--- a/src/core/advdumper.cpp
+++ b/src/core/advdumper.cpp
@@ -5,6 +5,7 @@
 #include "library/string.hpp"
 #include "lua/lua.hpp"
 
+#include <functional>
 #include <map>
 #include <string>
 
diff --git a/src/core/debug.cpp b/src/core/debug.cpp
index b1e3bba5..5714f3da 100644
--- a/src/core/debug.cpp
+++ b/src/core/debug.cpp
@@ -10,6 +10,7 @@
 #include "library/directory.hpp"
 #include "library/memoryspace.hpp"
 
+#include <functional>
 #include <stdexcept>
 #include <list>
 #include <map>
diff --git a/src/core/fileupload.cpp b/src/core/fileupload.cpp
index 0cca2609..979d8fd2 100644
--- a/src/core/fileupload.cpp
+++ b/src/core/fileupload.cpp
@@ -7,6 +7,7 @@
 #include "library/streamcompress.hpp"
 #include "library/string.hpp"
 
+#include <functional>
 #include <fstream>
 #include <boost/iostreams/categories.hpp>
 #include <boost/iostreams/copy.hpp>
diff --git a/src/core/jukebox.cpp b/src/core/jukebox.cpp
index c2084d7a..78e4226a 100644
--- a/src/core/jukebox.cpp
+++ b/src/core/jukebox.cpp
@@ -3,6 +3,7 @@
 #include "core/settings.hpp"
 #include "library/settingvar.hpp"
 
+#include <functional>
 #include <stdexcept>
 
 namespace
diff --git a/src/core/memorymanip.cpp b/src/core/memorymanip.cpp
index e9569655..07721079 100644
--- a/src/core/memorymanip.cpp
+++ b/src/core/memorymanip.cpp
@@ -12,6 +12,7 @@
 #include "library/minmax.hpp"
 #include "library/string.hpp"
 
+#include <functional>
 #include <iostream>
 #include <limits>
 #include <sstream>
diff --git a/src/core/memorywatch.cpp b/src/core/memorywatch.cpp
index 2de0a404..9726f754 100644
--- a/src/core/memorywatch.cpp
+++ b/src/core/memorywatch.cpp
@@ -20,6 +20,7 @@
 #include "library/memorywatch-null.hpp"
 #include "library/string.hpp"
 
+#include <functional>
 #include <cstdio>
 #include <cstdlib>
 #include <list>
diff --git a/src/core/queue.cpp b/src/core/queue.cpp
index f1026614..902bf93e 100644
--- a/src/core/queue.cpp
+++ b/src/core/queue.cpp
@@ -3,6 +3,7 @@
 #include "core/random.hpp"
 #include "library/command.hpp"
 #include "library/threads.hpp"
+#include <functional>
 
 input_queue::input_queue(command::group& _command)
 	: command(_command)
diff --git a/src/core/romimage.cpp b/src/core/romimage.cpp
index 10e81f86..1b3a4ac8 100644
--- a/src/core/romimage.cpp
+++ b/src/core/romimage.cpp
@@ -7,6 +7,7 @@
 #include "core/window.hpp"
 #include "library/memtracker.hpp"
 #include "library/zip.hpp"
+#include <functional>
 
 fileimage::image rom_image::null_img;
 fileimage::hash lsnes_image_hasher;
diff --git a/src/core/ui-services.cpp b/src/core/ui-services.cpp
index ff62864c..d849e255 100644
--- a/src/core/ui-services.cpp
+++ b/src/core/ui-services.cpp
@@ -9,6 +9,7 @@
 #include "core/rom.hpp"
 #include "core/ui-services.hpp"
 #include "library/keyboard.hpp"
+#include <functional>
 
 namespace
 {
diff --git a/src/emulation/bsnes-legacy/scpu-disasm.cpp b/src/emulation/bsnes-legacy/scpu-disasm.cpp
index 58da3d72..021b07d0 100644
--- a/src/emulation/bsnes-legacy/scpu-disasm.cpp
+++ b/src/emulation/bsnes-legacy/scpu-disasm.cpp
@@ -1,6 +1,7 @@
 #include "interface/disassembler.hpp"
 #include "library/hex.hpp"
 #include "library/string.hpp"
+#include <functional>
 #include <sstream>
 #include <iomanip>
 
diff --git a/src/emulation/gambatte/core.cpp b/src/emulation/gambatte/core.cpp
index d487a0fc..3d8235a9 100644
--- a/src/emulation/gambatte/core.cpp
+++ b/src/emulation/gambatte/core.cpp
@@ -16,6 +16,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "lsnes.hpp"
+#include <functional>
 #include <sstream>
 #include <iostream>
 #include <map>
diff --git a/src/interface/c-interface.cpp b/src/interface/c-interface.cpp
index 41eb7543..efc3817e 100644
--- a/src/interface/c-interface.cpp
+++ b/src/interface/c-interface.cpp
@@ -15,6 +15,7 @@
 #include "core/audioapi.hpp"
 #include "core/instance.hpp"
 #include "core/messages.hpp"
+#include <functional>
 
 template<> int ccore_call_param_map<lsnes_core_enumerate_cores>::id = LSNES_CORE_ENUMERATE_CORES;
 template<> int ccore_call_param_map<lsnes_core_get_core_info>::id = LSNES_CORE_GET_CORE_INFO;
diff --git a/src/interface/disassembler.cpp b/src/interface/disassembler.cpp
index 3acc29f8..53883f1d 100644
--- a/src/interface/disassembler.cpp
+++ b/src/interface/disassembler.cpp
@@ -1,4 +1,5 @@
 #include "interface/disassembler.hpp"
+#include <functional>
 #include <stdexcept>
 #include <iostream>
 
diff --git a/src/library/assembler.cpp b/src/library/assembler.cpp
index 604c57b1..8e962b44 100644
--- a/src/library/assembler.cpp
+++ b/src/library/assembler.cpp
@@ -2,6 +2,7 @@
 #include "serialization.hpp"
 #include "string.hpp"
 #include "hex.hpp"
+#include <functional>
 #include <cstring>
 #include <iostream>
 #include <fstream>
diff --git a/src/library/binarystream.cpp b/src/library/binarystream.cpp
index edfa871c..a5f1b962 100644
--- a/src/library/binarystream.cpp
+++ b/src/library/binarystream.cpp
@@ -2,6 +2,7 @@
 #include "serialization.hpp"
 #include "minmax.hpp"
 #include "string.hpp"
+#include <functional>
 #include <algorithm>
 #include <iostream>
 #include <iterator>
diff --git a/src/library/command.cpp b/src/library/command.cpp
index 5182c7a7..48566c89 100644
--- a/src/library/command.cpp
+++ b/src/library/command.cpp
@@ -6,6 +6,7 @@
 #include "string.hpp"
 #include "threads.hpp"
 #include "zip.hpp"
+#include <functional>
 #include <iostream>
 #include <cstdlib>
 
diff --git a/src/library/exrethrow.cpp b/src/library/exrethrow.cpp
index 5b2693b0..f44265a3 100644
--- a/src/library/exrethrow.cpp
+++ b/src/library/exrethrow.cpp
@@ -1,4 +1,5 @@
 #include "exrethrow.hpp"
+#include <functional>
 #include <list>
 #include <iostream>
 #include <future>
diff --git a/src/library/fileimage.cpp b/src/library/fileimage.cpp
index 2aca2dcd..ec7de917 100644
--- a/src/library/fileimage.cpp
+++ b/src/library/fileimage.cpp
@@ -5,6 +5,7 @@
 #include "minmax.hpp"
 #include "zip.hpp"
 #include "directory.hpp"
+#include <functional>
 #include <sstream>
 
 namespace fileimage
diff --git a/src/library/framebuffer-font2.cpp b/src/library/framebuffer-font2.cpp
index 5457d366..53d19712 100644
--- a/src/library/framebuffer-font2.cpp
+++ b/src/library/framebuffer-font2.cpp
@@ -1,6 +1,7 @@
 #include "framebuffer-font2.hpp"
 #include "range.hpp"
 #include "serialization.hpp"
+#include <functional>
 #include <cstring>
 #include <sstream>
 #include "zip.hpp"
diff --git a/src/library/framebuffer.cpp b/src/library/framebuffer.cpp
index fa12718d..0aa1c9b3 100644
--- a/src/library/framebuffer.cpp
+++ b/src/library/framebuffer.cpp
@@ -5,6 +5,7 @@
 #include "string.hpp"
 #include "minmax.hpp"
 #include "utf8.hpp"
+#include <functional>
 #include <cstring>
 #include <iostream>
 #include <list>
diff --git a/src/library/gamepad.cpp b/src/library/gamepad.cpp
index 646caafa..217b10c8 100644
--- a/src/library/gamepad.cpp
+++ b/src/library/gamepad.cpp
@@ -1,3 +1,4 @@
+#include <functional>
 #include "gamepad.hpp"
 #include "string.hpp"
 
diff --git a/src/library/httpreq.cpp b/src/library/httpreq.cpp
index f0c60264..f1746969 100644
--- a/src/library/httpreq.cpp
+++ b/src/library/httpreq.cpp
@@ -9,6 +9,7 @@
 #include "threads.hpp"
 #include "streamcompress.hpp"
 #include <curl/curl.h>
+#include <functional>
 #include <cstring>
 #include <fstream>
 #include <boost/iostreams/categories.hpp>
diff --git a/src/library/loadlib.cpp b/src/library/loadlib.cpp
index 40c2a1ab..7947a1d7 100644
--- a/src/library/loadlib.cpp
+++ b/src/library/loadlib.cpp
@@ -1,4 +1,5 @@
 #include "loadlib.hpp"
+#include <functional>
 #include <sstream>
 #include <list>
 #include <set>
diff --git a/src/library/lua.cpp b/src/library/lua.cpp
index 418c6ab1..8c6457ca 100644
--- a/src/library/lua.cpp
+++ b/src/library/lua.cpp
@@ -5,6 +5,7 @@
 #include "lua-pin.hpp"
 #include "stateobject.hpp"
 #include "threads.hpp"
+#include <functional>
 #include <iostream>
 #include <cassert>
 
diff --git a/src/library/mathexpr-ntype.cpp b/src/library/mathexpr-ntype.cpp
index 80f19d24..2befc50f 100644
--- a/src/library/mathexpr-ntype.cpp
+++ b/src/library/mathexpr-ntype.cpp
@@ -2,6 +2,7 @@
 #include "mathexpr-error.hpp"
 #include "mathexpr-format.hpp"
 #include "string.hpp"
+#include <functional>
 #include <iostream>
 #include <map>
 
diff --git a/src/library/mathexpr.cpp b/src/library/mathexpr.cpp
index e1ebbda7..cfdd9279 100644
--- a/src/library/mathexpr.cpp
+++ b/src/library/mathexpr.cpp
@@ -1,5 +1,6 @@
 #include "mathexpr.hpp"
 #include "string.hpp"
+#include <functional>
 #include <set>
 #include <map>
 
diff --git a/src/library/memorywatch-fb.cpp b/src/library/memorywatch-fb.cpp
index 8ba9c14b..fa4b47d7 100644
--- a/src/library/memorywatch-fb.cpp
+++ b/src/library/memorywatch-fb.cpp
@@ -2,6 +2,7 @@
 #include "memorywatch-fb.hpp"
 #include "utf8.hpp"
 #include "minmax.hpp"
+#include <functional>
 
 namespace memorywatch
 {
diff --git a/src/library/memorywatch-list.cpp b/src/library/memorywatch-list.cpp
index 7d27cbcc..dfc06c7e 100644
--- a/src/library/memorywatch-list.cpp
+++ b/src/library/memorywatch-list.cpp
@@ -1,4 +1,5 @@
 #include "memorywatch-list.hpp"
+#include <functional>
 
 namespace memorywatch
 {
diff --git a/src/library/memorywatch.cpp b/src/library/memorywatch.cpp
index e0e1226e..74801d9c 100644
--- a/src/library/memorywatch.cpp
+++ b/src/library/memorywatch.cpp
@@ -4,6 +4,7 @@
 #include "int24.hpp"
 #include "mathexpr-error.hpp"
 #include "mathexpr.hpp"
+#include <functional>
 #include <sstream>
 #include "string.hpp"
 
diff --git a/src/library/opus-ogg.cpp b/src/library/opus-ogg.cpp
index 38fbb935..cf3e144d 100644
--- a/src/library/opus-ogg.cpp
+++ b/src/library/opus-ogg.cpp
@@ -1,4 +1,5 @@
 #include "opus-ogg.hpp"
+#include <functional>
 #include <cstring>
 #include "serialization.hpp"
 #include "minmax.hpp"
diff --git a/src/library/streamcompress.cpp b/src/library/streamcompress.cpp
index 0a3279a8..ba750f0a 100644
--- a/src/library/streamcompress.cpp
+++ b/src/library/streamcompress.cpp
@@ -1,5 +1,6 @@
 #include "streamcompress.hpp"
 #include "string.hpp"
+#include <functional>
 #include <stdexcept>
 
 namespace streamcompress
diff --git a/src/library/triplebuffer.cpp b/src/library/triplebuffer.cpp
index 6444596d..858aa40b 100644
--- a/src/library/triplebuffer.cpp
+++ b/src/library/triplebuffer.cpp
@@ -1,4 +1,5 @@
 #include "triplebuffer.hpp"
+#include <functional>
 #include <iostream>
 
 namespace triplebuffer
diff --git a/src/lua/gui-bitmap.cpp b/src/lua/gui-bitmap.cpp
index c93c5ea9..24e8901d 100644
--- a/src/lua/gui-bitmap.cpp
+++ b/src/lua/gui-bitmap.cpp
@@ -12,6 +12,7 @@
 #include "library/zip.hpp"
 #include "lua/bitmap.hpp"
 #include "library/threads.hpp"
+#include <functional>
 #include <vector>
 #include <sstream>
 
diff --git a/src/platform/wxwidgets/editor-memorywatch.cpp b/src/platform/wxwidgets/editor-memorywatch.cpp
index 7fa38fa5..0ed6902a 100644
--- a/src/platform/wxwidgets/editor-memorywatch.cpp
+++ b/src/platform/wxwidgets/editor-memorywatch.cpp
@@ -1,3 +1,4 @@
+#include <functional>
 #include <wx/wx.h>
 #include <wx/statline.h>
 #include <wx/event.h>
diff --git a/src/platform/wxwidgets/loadrommenu.cpp b/src/platform/wxwidgets/loadrommenu.cpp
index d6871886..9249b888 100644
--- a/src/platform/wxwidgets/loadrommenu.cpp
+++ b/src/platform/wxwidgets/loadrommenu.cpp
@@ -1,3 +1,4 @@
+#include <functional>
 #include "platform/wxwidgets/menu_loadrom.hpp"
 #include "platform/wxwidgets/platform.hpp"
 #include "core/dispatch.hpp"
diff --git a/src/platform/wxwidgets/main.cpp b/src/platform/wxwidgets/main.cpp
index 76bb1e54..42506a67 100644
--- a/src/platform/wxwidgets/main.cpp
+++ b/src/platform/wxwidgets/main.cpp
@@ -38,6 +38,7 @@
 #include "platform/wxwidgets/window_status.hpp"
 #include "platform/wxwidgets/window_mainwindow.hpp"
 
+#include <functional>
 #include <math.h>
 #include <cassert>
 
diff --git a/src/platform/wxwidgets/projectmenu.cpp b/src/platform/wxwidgets/projectmenu.cpp
index a7bd4368..785ade59 100644
--- a/src/platform/wxwidgets/projectmenu.cpp
+++ b/src/platform/wxwidgets/projectmenu.cpp
@@ -1,3 +1,4 @@
+#include <functional>
 #include <wx/wx.h>
 #include <wx/event.h>
 #include <wx/control.h>
diff --git a/src/platform/wxwidgets/scrollbar.cpp b/src/platform/wxwidgets/scrollbar.cpp
index ddefa9d0..64d7e552 100644
--- a/src/platform/wxwidgets/scrollbar.cpp
+++ b/src/platform/wxwidgets/scrollbar.cpp
@@ -1,6 +1,7 @@
 #include "platform/wxwidgets/scrollbar.hpp"
 #include "platform/wxwidgets/platform.hpp"
 #include "library/minmax.hpp"
+#include <functional>
 #include <iostream>
 
 scroll_bar::scroll_bar(wxWindow* parent, wxWindowID id, bool vertical)
diff --git a/src/platform/wxwidgets/settings-common.cpp b/src/platform/wxwidgets/settings-common.cpp
index 697e4dee..14831c62 100644
--- a/src/platform/wxwidgets/settings-common.cpp
+++ b/src/platform/wxwidgets/settings-common.cpp
@@ -1,3 +1,4 @@
+#include <functional>
 #include "platform/wxwidgets/settings-common.hpp"
 #include "core/instance.hpp"
 #include "core/instance-map.hpp"
diff --git a/src/test/rrdata-test.cpp b/src/test/rrdata-test.cpp
index a4d7ecea..304081b3 100644
--- a/src/test/rrdata-test.cpp
+++ b/src/test/rrdata-test.cpp
@@ -1,6 +1,7 @@
 #include "rrdata.hpp"
 #include "string.hpp"
 #include "minmax.hpp"
+#include <functional>
 #include <iostream>
 #include "library/directory.hpp"
 #include <sstream>
-- 
2.11.4.GIT