diff --git a/src/address/address-p.h b/src/address/address-p.h
index ba502726b..b48a58c7f 100644
--- a/src/address/address-p.h
+++ b/src/address/address-p.h
@@ -36,20 +36,20 @@ public:
 
 private:
 	struct AddressCache {
-		mutable std::string scheme;
-		mutable std::string displayName;
-		mutable std::string username;
-		mutable std::string domain;
-		mutable std::string methodParam;
-		mutable std::string password;
+		std::string scheme;
+		std::string displayName;
+		std::string username;
+		std::string domain;
+		std::string methodParam;
+		std::string password;
 
-		mutable std::unordered_map<std::string, std::string> headers;
-		mutable std::unordered_map<std::string, std::string> params;
-		mutable std::unordered_map<std::string, std::string> uriParams;
+		std::unordered_map<std::string, std::string> headers;
+		std::unordered_map<std::string, std::string> params;
+		std::unordered_map<std::string, std::string> uriParams;
 	};
 
 	SalAddress *internalAddress = nullptr;
-	AddressCache cache;
+	mutable AddressCache cache;
 
 	L_DECLARE_PUBLIC(Address);
 };
diff --git a/src/call/call.cpp b/src/call/call.cpp
index 68adb2b62..1571d9e2e 100644
--- a/src/call/call.cpp
+++ b/src/call/call.cpp
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "c-wrapper/c-wrapper.h"
 #include "call-p.h"
 #include "conference/local-conference.h"
 #include "conference/participant-p.h"