diff --git a/libwvdrmengine/cdm/util/src/file_store.cpp b/libwvdrmengine/cdm/util/src/file_store.cpp
index 9063abd5..ee4a7835 100644
--- a/libwvdrmengine/cdm/util/src/file_store.cpp
+++ b/libwvdrmengine/cdm/util/src/file_store.cpp
@@ -14,6 +14,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include <cstring>
 #include <memory>
 
diff --git a/libwvdrmengine/cdm/util/src/file_utils.cpp b/libwvdrmengine/cdm/util/src/file_utils.cpp
index dc5a1cfe..7c2dc699 100644
--- a/libwvdrmengine/cdm/util/src/file_utils.cpp
+++ b/libwvdrmengine/cdm/util/src/file_utils.cpp
@@ -12,6 +12,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include <cstring>
 
 #include "file_store.h"
diff --git a/libwvdrmengine/cdm/util/src/log.cpp b/libwvdrmengine/cdm/util/src/log.cpp
index 8d0a2a7a..5bc05c8c 100644
--- a/libwvdrmengine/cdm/util/src/log.cpp
+++ b/libwvdrmengine/cdm/util/src/log.cpp
@@ -11,11 +11,11 @@
  * at the top of your source file) to change that behavior.
  */
 #ifndef LOG_NDEBUG
-#ifdef NDEBUG
-#define LOG_NDEBUG 1
-#else
-#define LOG_NDEBUG 0
-#endif
+#  ifdef NDEBUG
+#    define LOG_NDEBUG 1
+#  else
+#    define LOG_NDEBUG 0
+#  endif
 #endif
 
 #define LOG_TAG "WVCdm"
@@ -24,10 +24,10 @@
 #include "log.h"
 #include <utils/Log.h>
 
-#include <string>
-
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
+
+#include <string>
 
 /*
  * Uncomment the line below if you want to have the LOGV messages to print
@@ -48,28 +48,40 @@ void Log(const char* file, const char* function, int line, LogPriority level,
   filename = filename == nullptr ? file : filename + 1;
 
   char buf[LOG_BUF_SIZE];
-  int len = snprintf(buf, LOG_BUF_SIZE, "[%s(%d):%s] ", filename, line,
-                     function);
+  int len =
+      snprintf(buf, LOG_BUF_SIZE, "[%s(%d):%s] ", filename, line, function);
   if (len < 0) len = 0;
   if (static_cast<unsigned int>(len) < sizeof(buf)) {
     va_list ap;
     va_start(ap, format);
-    vsnprintf(buf+len, LOG_BUF_SIZE-len, format, ap);
+    vsnprintf(buf + len, LOG_BUF_SIZE - len, format, ap);
     va_end(ap);
   }
 
   android_LogPriority prio = ANDROID_LOG_VERBOSE;
 
-  switch(level) {
-    case LOG_SILENT: return;  // It is nonsensical to pass LOG_SILENT.
-    case LOG_ERROR: prio = ANDROID_LOG_ERROR; break;
-    case LOG_WARN: prio = ANDROID_LOG_WARN; break;
-    case LOG_INFO: prio = ANDROID_LOG_INFO; break;
-    case LOG_DEBUG: prio = ANDROID_LOG_DEBUG; break;
+  switch (level) {
+    case LOG_SILENT:
+      return;  // It is nonsensical to pass LOG_SILENT.
+    case LOG_ERROR:
+      prio = ANDROID_LOG_ERROR;
+      break;
+    case LOG_WARN:
+      prio = ANDROID_LOG_WARN;
+      break;
+    case LOG_INFO:
+      prio = ANDROID_LOG_INFO;
+      break;
+    case LOG_DEBUG:
+      prio = ANDROID_LOG_DEBUG;
+      break;
 #if LOG_NDEBUG
-    case LOG_VERBOSE: return;
+    case LOG_VERBOSE:
+      return;
 #else
-    case LOG_VERBOSE: prio = ANDROID_LOG_VERBOSE; break;
+    case LOG_VERBOSE:
+      prio = ANDROID_LOG_VERBOSE;
+      break;
 #endif
   }
 
diff --git a/libwvdrmengine/cdm/util/test/file_utils_unittest.cpp b/libwvdrmengine/cdm/util/test/file_utils_unittest.cpp
index 75ec8e78..abbcc4d9 100644
--- a/libwvdrmengine/cdm/util/test/file_utils_unittest.cpp
+++ b/libwvdrmengine/cdm/util/test/file_utils_unittest.cpp
@@ -1,9 +1,12 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
+
 #include "file_utils.h"
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
+
 #include "file_store.h"
 #include "test_vectors.h"