diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c
index 322fd7c0..80a59ddf 100644
--- a/src/libFLAC/stream_encoder.c
+++ b/src/libFLAC/stream_encoder.c
@@ -597,9 +597,12 @@ FLAC__bool FLAC__stream_encoder_set_do_escape_coding(FLAC__StreamEncoder *encode
 	FLAC__ASSERT(0 != encoder);
 	if(encoder->protected_->state != FLAC__STREAM_ENCODER_UNINITIALIZED)
 		return false;
-	/*@@@ deprecated:
+#if 0
+	/*@@@ deprecated: */
 	encoder->protected_->do_escape_coding = value;
-	*/
+#else
+	(void)value;
+#endif
 	return true;
 }
 
@@ -635,9 +638,12 @@ FLAC__bool FLAC__stream_encoder_set_rice_parameter_search_dist(FLAC__StreamEncod
 	FLAC__ASSERT(0 != encoder);
 	if(encoder->protected_->state != FLAC__STREAM_ENCODER_UNINITIALIZED)
 		return false;
-	/*@@@ deprecated:
+#if 0
+	/*@@@ deprecated: */
 	encoder->protected_->rice_parameter_search_dist = value;
-	*/
+#else
+	(void)value;
+#endif
 	return true;
 }
 
diff --git a/src/test_libFLAC/encoders.c b/src/test_libFLAC/encoders.c
index 7425aea3..f9f30147 100644
--- a/src/test_libFLAC/encoders.c
+++ b/src/test_libFLAC/encoders.c
@@ -131,7 +131,7 @@ static void free_metadata_blocks_()
 static FLAC__StreamEncoderWriteStatus encoder_write_callback_(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
 {
 	(void)encoder, (void)buffer, (void)bytes, (void)samples, (void)current_frame, (void)client_data;
-	return FLAC__STREAM_ENCODER_WRITE_OK;
+	return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
 }
 
 static void encoder_metadata_callback_(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data)
diff --git a/src/test_libFLAC/file_utils.c b/src/test_libFLAC/file_utils.c
index e7fb6a9a..a460d4ba 100644
--- a/src/test_libFLAC/file_utils.c
+++ b/src/test_libFLAC/file_utils.c
@@ -46,9 +46,9 @@ static FLAC__StreamEncoderWriteStatus encoder_write_callback_(const FLAC__Stream
 	(void)encoder, (void)samples, (void)current_frame;
 
 	if(fwrite(buffer, 1, bytes, ecd->file) != bytes)
-		return FLAC__STREAM_ENCODER_WRITE_FATAL_ERROR;
+		return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
 	else
-		return FLAC__STREAM_ENCODER_WRITE_OK;
+		return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
 }
 
 static void encoder_metadata_callback_(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data)