diff --git a/extensions/flac/src/main/jni/flac_parser.cc b/extensions/flac/src/main/jni/flac_parser.cc
index c368647420..c932b3515e 100644
--- a/extensions/flac/src/main/jni/flac_parser.cc
+++ b/extensions/flac/src/main/jni/flac_parser.cc
@@ -16,9 +16,8 @@
 
 #include "include/flac_parser.h"
 
-#include <jni.h>
-
 #include <android/log.h>
+#include <jni.h>
 
 #include <cassert>
 #include <cstdlib>
@@ -431,7 +430,7 @@ bool FLACParser::getSeekPositions(int64_t timeUs,
     targetSampleNumber = totalSamples - 1;
   }
 
-  FLAC__StreamMetadata_SeekPoint* points = mSeekTable->points;
+  FLAC__StreamMetadata_SeekPoint *points = mSeekTable->points;
   unsigned length = mSeekTable->num_points;
 
   for (unsigned i = length; i != 0; i--) {
diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
index 041ca09db4..f7ed8dce4f 100644
--- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
@@ -64,8 +64,8 @@ public class GvrAudioProcessor implements AudioProcessor {
   }
 
   /**
-   * Updates the listener head orientation. May be called on any thread. See
-   * {@code GvrAudioSurround.updateNativeOrientation}.
+   * Updates the listener head orientation. May be called on any thread. See {@code
+   * GvrAudioSurround.updateNativeOrientation}.
    *
    * @param w The w component of the quaternion.
    * @param x The x component of the quaternion.
@@ -113,8 +113,9 @@ public class GvrAudioProcessor implements AudioProcessor {
         throw new UnhandledAudioFormatException(inputAudioFormat);
     }
     if (buffer == EMPTY_BUFFER) {
-      buffer = ByteBuffer.allocateDirect(FRAMES_PER_OUTPUT_BUFFER * OUTPUT_FRAME_SIZE)
-          .order(ByteOrder.nativeOrder());
+      buffer =
+          ByteBuffer.allocateDirect(FRAMES_PER_OUTPUT_BUFFER * OUTPUT_FRAME_SIZE)
+              .order(ByteOrder.nativeOrder());
     }
     pendingInputAudioFormat = inputAudioFormat;
     return new AudioFormat(inputAudioFormat.sampleRate, OUTPUT_CHANNEL_COUNT, C.ENCODING_PCM_16BIT);
@@ -192,5 +193,4 @@ public class GvrAudioProcessor implements AudioProcessor {
       gvrAudioSurround = null;
     }
   }
-
 }
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java b/library/common/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
index 024e876663..7a156aa668 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
@@ -432,5 +432,4 @@ public final class ExoPlaybackException extends PlaybackException {
     bundle.putBoolean(keyForField(FIELD_IS_RECOVERABLE), isRecoverable);
     return bundle;
   }
-
 }
diff --git a/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpDataLoadable.java b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpDataLoadable.java
index 573590047b..89eadf1996 100644
--- a/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpDataLoadable.java
+++ b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpDataLoadable.java
@@ -57,7 +57,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     void onTransportReady(String transport, RtpDataChannel rtpDataChannel);
   }
 
-
   /** The track ID associated with the Loadable. */
   public final int trackId;
   /** The {@link RtspMediaTrack} to load. */