diff --git a/src/google/protobuf/arenastring.h b/src/google/protobuf/arenastring.h
index 60307b2763fa..acd177f15c91 100644
--- a/src/google/protobuf/arenastring.h
+++ b/src/google/protobuf/arenastring.h
@@ -329,6 +329,8 @@ inline void ArenaStringPtr::Swap(ArenaStringPtr* other,
     this_ptr->swap(*other_ptr);
   }
 #else
+  (void) default_value;
+  (void) arena;
   std::swap(tagged_ptr_, other->tagged_ptr_);
 #endif
 }
diff --git a/src/google/protobuf/generated_message_reflection.h b/src/google/protobuf/generated_message_reflection.h
index 12abb4f97f70..23fa4d816cf7 100644
--- a/src/google/protobuf/generated_message_reflection.h
+++ b/src/google/protobuf/generated_message_reflection.h
@@ -236,7 +236,7 @@ struct ReflectionSchema {
 
   // We tag offset values to provide additional data about fields (such as
   // "unused").
-  static uint32 OffsetValue(uint32 v, FieldDescriptor::Type type) {
+  static uint32 OffsetValue(uint32 v, FieldDescriptor::Type /* type */) {
     return v & 0x7FFFFFFFu;
   }
 };
diff --git a/src/google/protobuf/map_type_handler.h b/src/google/protobuf/map_type_handler.h
index 8b8fd14c2d49..744d75157de4 100644
--- a/src/google/protobuf/map_type_handler.h
+++ b/src/google/protobuf/map_type_handler.h
@@ -569,7 +569,7 @@ inline bool MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::IsInitialized(
   }                                                                           \
   template <typename Type>                                                    \
   inline void MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::Clear(  \
-      TypeOnMemory* value, Arena* arena) {                                    \
+      TypeOnMemory* value, Arena* /* arena */) {                              \
     value->ClearToEmpty();                                                    \
   }                                                                           \
   template <typename Type>                                                    \