diff --git a/cpr/curlholder.cpp b/cpr/curlholder.cpp
index 48a6b1e39..3e80ad17e 100644
--- a/cpr/curlholder.cpp
+++ b/cpr/curlholder.cpp
@@ -1,9 +1,9 @@
 #include "cpr/curlholder.h"
+#include "cpr/secure_string.h"
 #include <cassert>
 #include <curl/curl.h>
 #include <curl/easy.h>
 #include <string_view>
-#include "cpr/secure_string.h"
 
 namespace cpr {
 CurlHolder::CurlHolder() {
diff --git a/cpr/session.cpp b/cpr/session.cpp
index c8cc112ec..ef70635e6 100644
--- a/cpr/session.cpp
+++ b/cpr/session.cpp
@@ -273,10 +273,7 @@ const Content& Session::GetContent() const {
 }
 
 void Session::RemoveContent() {
-    if (std::holds_alternative<cpr::Payload>(content_)) {
-        curl_easy_setopt(curl_->handle, CURLOPT_POSTFIELDSIZE_LARGE, -1);
-        curl_easy_setopt(curl_->handle, CURLOPT_COPYPOSTFIELDS, NULL);
-    } else if (std::holds_alternative<cpr::Body>(content_)) {
+    if (std::holds_alternative<cpr::Payload>(content_) || std::holds_alternative<cpr::Body>(content_)) {
         curl_easy_setopt(curl_->handle, CURLOPT_POSTFIELDSIZE_LARGE, -1);
         curl_easy_setopt(curl_->handle, CURLOPT_COPYPOSTFIELDS, NULL);
     } else if (std::holds_alternative<cpr::Multipart>(content_)) {
diff --git a/test/session_tests.cpp b/test/session_tests.cpp
index cd162cbde..afdf29f43 100644
--- a/test/session_tests.cpp
+++ b/test/session_tests.cpp
@@ -3,7 +3,6 @@
 #include <cstdint>
 #include <cstdlib>
 #include <gtest/gtest.h>
-#include <span>
 
 #include <stdexcept>
 #include <string>