diff --git a/aos/ipc_lib/aos_sync.h b/aos/ipc_lib/aos_sync.h
index c5fede1..157c1b2 100644
--- a/aos/ipc_lib/aos_sync.h
+++ b/aos/ipc_lib/aos_sync.h
@@ -13,7 +13,8 @@
 
 // TODO(brians) add client requests to make helgrind useful with this code
 // <http://www.valgrind.org/docs/manual/hg-manual.html#hg-manual.client-requests>
-// and <http://www.valgrind.org/docs/manual/drd-manual.html#drd-manual.clientreqs>
+// and
+// <http://www.valgrind.org/docs/manual/drd-manual.html#drd-manual.clientreqs>
 // list the interesting ones
 
 // Have to remember to align structs containing it (recursively) to sizeof(int).
@@ -138,7 +139,7 @@
 int futex_wait(aos_futex *m) __attribute__((warn_unused_result));
 // The same as futex_wait except returns 2 if it times out.
 int futex_wait_timeout(aos_futex *m, const struct timespec *timeout)
-  __attribute__((warn_unused_result));
+    __attribute__((warn_unused_result));
 
 // Set the futex and wake up anybody waiting on it.
 // Returns the number that were woken or -1 with an error in errno.
diff --git a/aos/ipc_lib/eventfd_latency.cc b/aos/ipc_lib/eventfd_latency.cc
index d1f6bcb..0507f26 100644
--- a/aos/ipc_lib/eventfd_latency.cc
+++ b/aos/ipc_lib/eventfd_latency.cc
@@ -1,8 +1,7 @@
-#include "gflags/gflags.h"
-
 #include <sys/eventfd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+
 #include <chrono>
 #include <random>
 #include <thread>
@@ -14,6 +13,7 @@
 #include "aos/logging/logging.h"
 #include "aos/realtime.h"
 #include "aos/time/time.h"
+#include "gflags/gflags.h"
 
 // This is a demo program which uses named pipes to communicate.
 // It measures both latency of a random timer thread, and latency of the
diff --git a/aos/ipc_lib/futex_latency.cc b/aos/ipc_lib/futex_latency.cc
index 5761d40..1ec3fc1 100644
--- a/aos/ipc_lib/futex_latency.cc
+++ b/aos/ipc_lib/futex_latency.cc
@@ -1,8 +1,7 @@
-#include "gflags/gflags.h"
-
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+
 #include <chrono>
 #include <random>
 #include <thread>
@@ -15,6 +14,7 @@
 #include "aos/mutex/mutex.h"
 #include "aos/realtime.h"
 #include "aos/time/time.h"
+#include "gflags/gflags.h"
 
 DEFINE_int32(seconds, 10, "Duration of the test to run");
 DEFINE_int32(
diff --git a/aos/ipc_lib/index.cc b/aos/ipc_lib/index.cc
index ed58806..4701f51 100644
--- a/aos/ipc_lib/index.cc
+++ b/aos/ipc_lib/index.cc
@@ -1,7 +1,7 @@
 #include "aos/ipc_lib/index.h"
 
-#include <string>
 #include <sstream>
+#include <string>
 
 namespace aos {
 namespace ipc_lib {
diff --git a/aos/ipc_lib/index_test.cc b/aos/ipc_lib/index_test.cc
index 2e9a37b..a288ec9 100644
--- a/aos/ipc_lib/index_test.cc
+++ b/aos/ipc_lib/index_test.cc
@@ -1,7 +1,7 @@
 #include "aos/ipc_lib/index.h"
 
-#include "gtest/gtest.h"
 #include "glog/logging.h"
+#include "gtest/gtest.h"
 
 namespace aos {
 namespace ipc_lib {
diff --git a/aos/ipc_lib/latency_lib.h b/aos/ipc_lib/latency_lib.h
index 4d9b912..2371efa 100644
--- a/aos/ipc_lib/latency_lib.h
+++ b/aos/ipc_lib/latency_lib.h
@@ -4,6 +4,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+
 #include <chrono>
 
 #include "aos/time/time.h"
diff --git a/aos/ipc_lib/lockless_queue_death_test.cc b/aos/ipc_lib/lockless_queue_death_test.cc
index c5edb9e..13eb1f5 100644
--- a/aos/ipc_lib/lockless_queue_death_test.cc
+++ b/aos/ipc_lib/lockless_queue_death_test.cc
@@ -618,8 +618,7 @@
       },
       [config, tid](void *raw_memory) {
         ::aos::ipc_lib::LocklessQueueMemory *const memory =
-            reinterpret_cast< ::aos::ipc_lib::LocklessQueueMemory *>(
-                raw_memory);
+            reinterpret_cast<::aos::ipc_lib::LocklessQueueMemory *>(raw_memory);
         // Confirm that we can create 2 senders (the number in the queue), and
         // send a message.  And that all the messages in the queue are valid.
         LocklessQueue queue(memory, memory, config);
diff --git a/aos/ipc_lib/lockless_queue_memory.h b/aos/ipc_lib/lockless_queue_memory.h
index bb995b9..b3f9468 100644
--- a/aos/ipc_lib/lockless_queue_memory.h
+++ b/aos/ipc_lib/lockless_queue_memory.h
@@ -2,6 +2,7 @@
 #define AOS_IPC_LIB_LOCKLESS_QUEUE_MEMORY_H_
 
 #include <sys/types.h>
+
 #include <cstddef>
 
 #include "aos/ipc_lib/aos_sync.h"
diff --git a/aos/ipc_lib/named_pipe_latency.cc b/aos/ipc_lib/named_pipe_latency.cc
index c333850..11ea66e 100644
--- a/aos/ipc_lib/named_pipe_latency.cc
+++ b/aos/ipc_lib/named_pipe_latency.cc
@@ -1,7 +1,6 @@
-#include "gflags/gflags.h"
-
 #include <sys/stat.h>
 #include <sys/types.h>
+
 #include <chrono>
 #include <random>
 #include <thread>
@@ -13,6 +12,7 @@
 #include "aos/logging/logging.h"
 #include "aos/realtime.h"
 #include "aos/time/time.h"
+#include "gflags/gflags.h"
 
 // This is a demo program which uses named pipes to communicate.
 // It measures both latency of a random timer thread, and latency of the
diff --git a/aos/ipc_lib/print_lockless_queue_memory.cc b/aos/ipc_lib/print_lockless_queue_memory.cc
index 6974d65..2cbcf12 100644
--- a/aos/ipc_lib/print_lockless_queue_memory.cc
+++ b/aos/ipc_lib/print_lockless_queue_memory.cc
@@ -1,10 +1,10 @@
-#include "aos/ipc_lib/lockless_queue.h"
-
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "aos/ipc_lib/lockless_queue.h"
+
 int main(int argc, char **argv) {
   CHECK_EQ(argc, 2);
   const char *path = argv[1];
diff --git a/aos/ipc_lib/shared_mem.h b/aos/ipc_lib/shared_mem.h
index edb9091..89a700e 100644
--- a/aos/ipc_lib/shared_mem.h
+++ b/aos/ipc_lib/shared_mem.h
@@ -2,8 +2,8 @@
 #define _SHARED_MEM_H_
 
 #include <stddef.h>
-#include <unistd.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "aos/ipc_lib/shared_mem_types.h"
 
diff --git a/aos/ipc_lib/signalfd.h b/aos/ipc_lib/signalfd.h
index b3a9063..a6991de 100644
--- a/aos/ipc_lib/signalfd.h
+++ b/aos/ipc_lib/signalfd.h
@@ -3,6 +3,7 @@
 
 #include <sys/signalfd.h>
 #include <sys/types.h>
+
 #include <initializer_list>
 
 namespace aos {
diff --git a/aos/ipc_lib/signalfd_test.cc b/aos/ipc_lib/signalfd_test.cc
index a50e9f6..1c8e750 100644
--- a/aos/ipc_lib/signalfd_test.cc
+++ b/aos/ipc_lib/signalfd_test.cc
@@ -1,8 +1,8 @@
 #include "aos/ipc_lib/signalfd.h"
 
-#include "gtest/gtest.h"
-#include "glog/logging.h"
 #include "aos/testing/test_logging.h"
+#include "glog/logging.h"
+#include "gtest/gtest.h"
 
 namespace aos {
 namespace ipc_lib {