diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e59bb3..12a335f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,7 +175,7 @@ endif()
 
 if(BUILD_LIBTIFF)
     set(FreeImage_LIBTIFF_SRCS 
-        Source/LibTIFF4/mkg3states.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_aux.c
+        Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_aux.c
         Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c
         Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_config.h
         Source/LibTIFF4/tif_config.vc.h Source/LibTIFF4/tif_config.wince.h
diff --git a/Source/OpenEXR/IlmImf/ImfAttribute.cpp b/Source/OpenEXR/IlmImf/ImfAttribute.cpp
index cb4ac36..e477190 100644
--- a/Source/OpenEXR/IlmImf/ImfAttribute.cpp
+++ b/Source/OpenEXR/IlmImf/ImfAttribute.cpp
@@ -44,6 +44,7 @@
 #include "IlmThreadMutex.h"
 #include "Iex.h"
 #include <string.h>
+#include <functional>
 #include <map>
 
 #include "ImfNamespace.h"
diff --git a/Source/Plugin.h b/Source/Plugin.h
index 860548a..16c82dd 100644
--- a/Source/Plugin.h
+++ b/Source/Plugin.h
@@ -131,7 +131,7 @@ void DLL_CALLCONV InitGIF(Plugin *plugin, int format_id);
 void DLL_CALLCONV InitHDR(Plugin *plugin, int format_id);
 void DLL_CALLCONV InitG3(Plugin *plugin, int format_id);
 void DLL_CALLCONV InitSGI(Plugin *plugin, int format_id);
-#if INCLUDE_LIB_OPEN_EXR
+#if INCLUDE_LIB_OPENEXR
 void DLL_CALLCONV InitEXR(Plugin *plugin, int format_id);
 #endif
 void DLL_CALLCONV InitJ2K(Plugin *plugin, int format_id);