diff --git a/starboard/android/shared/drm_system.cc b/starboard/android/shared/drm_system.cc
index 7897d3b95f78..7d7d4c7431ea 100644
--- a/starboard/android/shared/drm_system.cc
+++ b/starboard/android/shared/drm_system.cc
@@ -68,7 +68,7 @@ SbDrmSessionRequestType SbDrmSessionRequestTypeFromMediaDrmKeyRequestType(
 
 // This has to be defined outside the above anonymous namespace to be picked up
 // by the comparison of std::vector<SbDrmKeyId>.
-bool operator==(const SbDrmKeyId& left, const SbDrmKeyId& right) {
+inline bool operator==(const SbDrmKeyId& left, const SbDrmKeyId& right) {
   if (left.identifier_size != right.identifier_size) {
     return false;
   }
diff --git a/starboard/shared/starboard/player/player_write_samples.cc b/starboard/shared/starboard/player/player_write_samples.cc
index 37c66692e443..2ae640cc3197 100644
--- a/starboard/shared/starboard/player/player_write_samples.cc
+++ b/starboard/shared/starboard/player/player_write_samples.cc
@@ -19,12 +19,15 @@
 
 #if SB_API_VERSION >= 15
 void SbPlayerWriteSamples(SbPlayer player,
+                          SbMediaType sample_type,
+                          const SbPlayerSampleInfo* sample_infos,
+                          int number_of_sample_infos) {
 #else   // SB_API_VERSION >= 15
 void SbPlayerWriteSample2(SbPlayer player,
-#endif  // SB_API_VERSION >= 15
                           SbMediaType sample_type,
                           const SbPlayerSampleInfo* sample_infos,
                           int number_of_sample_infos) {
+#endif  // SB_API_VERSION >= 15
   if (!SbPlayerIsValid(player)) {
     SB_LOG(WARNING) << "player is invalid.";
     return;