diff --git a/include/cppcoro/cancellation_registration.hpp b/include/cppcoro/cancellation_registration.hpp
index 79eab909..64d267b5 100644
--- a/include/cppcoro/cancellation_registration.hpp
+++ b/include/cppcoro/cancellation_registration.hpp
@@ -11,6 +11,7 @@
 #include <utility>
 #include <type_traits>
 #include <atomic>
+#include <cstdint>
 
 namespace cppcoro
 {
diff --git a/include/cppcoro/detail/sync_wait_task.hpp b/include/cppcoro/detail/sync_wait_task.hpp
index f36b6f8f..ee0b9fbc 100644
--- a/include/cppcoro/detail/sync_wait_task.hpp
+++ b/include/cppcoro/detail/sync_wait_task.hpp
@@ -12,6 +12,7 @@
 #include <experimental/coroutine>
 #include <cassert>
 #include <exception>
+#include <utility>
 
 namespace cppcoro
 {
diff --git a/include/cppcoro/fmap.hpp b/include/cppcoro/fmap.hpp
index a339493c..74541e83 100644
--- a/include/cppcoro/fmap.hpp
+++ b/include/cppcoro/fmap.hpp
@@ -20,6 +20,8 @@ namespace cppcoro
 		class fmap_awaiter
 		{
 			using awaiter_t = typename awaitable_traits<AWAITABLE&&>::awaiter_t;
+            FUNC&& m_func;
+            awaiter_t m_awaiter;
 
 		public:
 
@@ -64,12 +66,6 @@ namespace cppcoro
 					static_cast<FUNC&&>(m_func),
 					static_cast<awaiter_t&&>(m_awaiter).await_resume());
 			}
-
-		private:
-
-			FUNC&& m_func;
-			awaiter_t m_awaiter;
-
 		};
 
 		template<typename FUNC, typename AWAITABLE>