diff --git a/src/common/classes/auto.h b/src/common/classes/auto.h
index 923356fb6a..62fa4317dd 100644
--- a/src/common/classes/auto.h
+++ b/src/common/classes/auto.h
@@ -32,7 +32,6 @@
 #define CLASSES_AUTO_PTR_H
 
 #include <stdio.h>
-#include <functional>
 
 namespace Firebird {
 
@@ -318,11 +317,11 @@ private:
 	T oldValue;
 };
 
-
+template <typename F>
 class Cleanup
 {
 public:
-	Cleanup(std::function<void()> clFunc)
+	Cleanup(F&& clFunc)
 		: clean(clFunc)
 	{ }
 
@@ -332,7 +331,7 @@ public:
 	}
 
 private:
-	std::function<void()> clean;
+	F& clean;
 };
 
 } //namespace Firebird
diff --git a/src/yvalve/YObjects.h b/src/yvalve/YObjects.h
index e2efa58646..c2ea484350 100644
--- a/src/yvalve/YObjects.h
+++ b/src/yvalve/YObjects.h
@@ -36,6 +36,8 @@
 #include "../common/MsgMetadata.h"
 #include "../common/classes/ClumpletWriter.h"
 
+#include <functional>
+
 namespace Why
 {