diff --git a/library/src/main/java/com/google/android/exoplayer/C.java b/library/src/main/java/com/google/android/exoplayer/C.java
index 933dd55bae..af6e619a6d 100644
--- a/library/src/main/java/com/google/android/exoplayer/C.java
+++ b/library/src/main/java/com/google/android/exoplayer/C.java
@@ -92,8 +92,6 @@ public final class C {
 
   /**
    * A prefix for custom ExoPlayer WebVTT headers.
-   *
-   * @hide
    */
   public static final String WEBVTT_EXO_HEADER = "EXO-HEADER";
 
@@ -101,8 +99,6 @@ public final class C {
    * An element of a custom ExoPlayer WebVTT header. An {@code WEBVTT_OFFSET + value} element can
    * be added to a custom ExoPlayer WebVTT header to specify an offset time (in microseconds) that
    * should be added to the embedded MPEGTS value.
-   *
-   * @hide
    */
   public static final String WEBVTT_EXO_HEADER_OFFSET = "OFFSET:";
 
diff --git a/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java b/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
index 1931e34e01..7addf0bf84 100644
--- a/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
+++ b/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
@@ -88,7 +88,7 @@ public final class AudioTrack {
    * Thrown when {@link android.media.AudioTrack#getTimestamp} returns a spurious timestamp, if
    * {@code AudioTrack#failOnSpuriousAudioTimestamp} is set.
    */
-  private static final class InvalidAudioTrackTimestampException extends RuntimeException {
+  public static final class InvalidAudioTrackTimestampException extends RuntimeException {
 
     public InvalidAudioTrackTimestampException(String message) {
       super(message);