diff --git a/src/defer.hpp b/src/defer.hpp
index 168cb7a..5a29ee2 100644
--- a/src/defer.hpp
+++ b/src/defer.hpp
@@ -6,7 +6,7 @@ struct Defer_Guard {
 };
 struct Defer_Guard_Helper {
 	template <typename F>
-	Defer_Guard<F> operator+(F&& f) { return Defer_Guard<F>(std::forward<F>(f)); }
+	Defer_Guard<F> operator+(F&& f) { return Defer_Guard<F>(static_cast<F &&>(f)); }
 };
 
 #define CONCAT_STR_INTERNAL(A, B) A##B
diff --git a/src/rntviewer.cpp b/src/rntviewer.cpp
index 00bc041..d9ef6bd 100644
--- a/src/rntviewer.cpp
+++ b/src/rntviewer.cpp
@@ -14,7 +14,6 @@
 #include <cstdio>
 #include <cstdint>
 #include <byteswap.h>
-#include <utility>    // for std::forward
 #include <chrono>
 
 #ifdef DEBUG