diff --git a/include/FLAC/stream_decoder.h b/include/FLAC/stream_decoder.h
index 500ec030eb..90bf9ff5f0 100644
--- a/include/FLAC/stream_decoder.h
+++ b/include/FLAC/stream_decoder.h
@@ -799,8 +799,7 @@ FLAC_API FLAC__bool FLAC__stream_decoder_set_ogg_serial_number(FLAC__StreamDecod
  * \retval FLAC__bool
  *    \c false if the decoder is already initialized, else \c true.
  */
-#define FLAC__stream_decoder_set_ogg_chaining _FLAC__stream_decoder_set_ogg_chaining
-FLAC_API FLAC__bool _FLAC__stream_decoder_set_ogg_chaining(FLAC__StreamDecoder* decoder, FLAC__bool value);
+FLAC_API FLAC__bool FLAC__stream_decoder_set_ogg_chaining(FLAC__StreamDecoder* decoder, FLAC__bool value);
 
 /** Set the "MD5 signature checking" flag.  If \c true, the decoder will
  *  compute the MD5 signature of the unencoded audio data while decoding
@@ -935,8 +934,8 @@ FLAC_API const char *FLAC__stream_decoder_get_resolved_state_string(const FLAC__
  * \retval FLAC__bool
  *    See above.
  */
-#define FLAC__stream_decoder_get_ogg_chaining _FLAC__stream_decoder_get_ogg_chaining
-FLAC_API FLAC__bool _FLAC__stream_decoder_get_ogg_chaining(const FLAC__StreamDecoder* decoder);
+#define FLAC__OGG_CHAINING
+FLAC_API FLAC__bool FLAC__stream_decoder_get_ogg_chaining(const FLAC__StreamDecoder* decoder);
 
 /** Get the "MD5 signature checking" flag.
  *  This is the value of the setting, not whether or not the decoder is
diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
index 77380a87a1..0cff132d22 100644
--- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c
@@ -684,7 +684,7 @@ FLAC_API FLAC__bool FLAC__stream_decoder_set_ogg_serial_number(FLAC__StreamDecod
 #endif
 }
 
-FLAC_API FLAC__bool _FLAC__stream_decoder_set_ogg_chaining(FLAC__StreamDecoder* decoder, FLAC__bool value)
+FLAC_API FLAC__bool FLAC__stream_decoder_set_ogg_chaining(FLAC__StreamDecoder* decoder, FLAC__bool value)
 {
 	FLAC__ASSERT(0 != decoder);
 	FLAC__ASSERT(0 != decoder->protected_);
@@ -837,7 +837,7 @@ FLAC_API const char *FLAC__stream_decoder_get_resolved_state_string(const FLAC__
 	return FLAC__StreamDecoderStateString[decoder->protected_->state];
 }
 
-FLAC_API FLAC__bool _FLAC__stream_decoder_get_ogg_chaining(const FLAC__StreamDecoder* decoder)
+FLAC_API FLAC__bool FLAC__stream_decoder_get_ogg_chaining(const FLAC__StreamDecoder* decoder)
 {
 	FLAC__ASSERT(0 != decoder);
 	FLAC__ASSERT(0 != decoder->protected_);