diff --git a/src/internal_modules/roc_core/target_android/roc_core/backtrace.cpp b/src/internal_modules/roc_core/target_android/roc_core/backtrace.cpp
index db7847923..80e942670 100644
--- a/src/internal_modules/roc_core/target_android/roc_core/backtrace.cpp
+++ b/src/internal_modules/roc_core/target_android/roc_core/backtrace.cpp
@@ -6,15 +6,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "roc_core/backtrace.h"
+#include "roc_core/console.h"
+
 #include <cxxabi.h>
 #include <dlfcn.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unwind.h>
 
-#include "roc_core/backtrace.h"
-#include "roc_core/console.h"
-
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_android/roc_core/console.cpp b/src/internal_modules/roc_core/target_android/roc_core/console.cpp
index 8ad78135a..838682b1a 100644
--- a/src/internal_modules/roc_core/target_android/roc_core/console.cpp
+++ b/src/internal_modules/roc_core/target_android/roc_core/console.cpp
@@ -6,11 +6,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <android/log.h>
-
 #include "roc_core/console.h"
 #include "roc_core/stddefs.h"
 
+#include <android/log.h>
+
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_android/roc_core/log_backend.cpp b/src/internal_modules/roc_core/target_android/roc_core/log_backend.cpp
index ce5836738..ec848bf5c 100644
--- a/src/internal_modules/roc_core/target_android/roc_core/log_backend.cpp
+++ b/src/internal_modules/roc_core/target_android/roc_core/log_backend.cpp
@@ -6,10 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <android/log.h>
-
-#include "roc_core/log.h"
 #include "roc_core/log_backend.h"
+#include "roc_core/log.h"
+
+#include <android/log.h>
 
 namespace roc {
 namespace core {
diff --git a/src/internal_modules/roc_core/target_darwin/roc_core/semaphore.cpp b/src/internal_modules/roc_core/target_darwin/roc_core/semaphore.cpp
index 387973561..d33f85d63 100644
--- a/src/internal_modules/roc_core/target_darwin/roc_core/semaphore.cpp
+++ b/src/internal_modules/roc_core/target_darwin/roc_core/semaphore.cpp
@@ -6,12 +6,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "roc_core/semaphore.h"
+#include "roc_core/panic.h"
+
 #include <mach/mach.h>
 #include <mach/sync_policy.h>
 
-#include "roc_core/panic.h"
-#include "roc_core/semaphore.h"
-
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_darwin/roc_core/semaphore.h b/src/internal_modules/roc_core/target_darwin/roc_core/semaphore.h
index 2867d1c3a..c607120cc 100644
--- a/src/internal_modules/roc_core/target_darwin/roc_core/semaphore.h
+++ b/src/internal_modules/roc_core/target_darwin/roc_core/semaphore.h
@@ -12,12 +12,12 @@
 #ifndef ROC_CORE_SEMAPHORE_H_
 #define ROC_CORE_SEMAPHORE_H_
 
-#include <mach/semaphore.h>
-
 #include "roc_core/attributes.h"
 #include "roc_core/noncopyable.h"
 #include "roc_core/time.h"
 
+#include <mach/semaphore.h>
+
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_gnu/roc_core/demangle_symbol.cpp b/src/internal_modules/roc_core/target_gnu/roc_core/demangle_symbol.cpp
index a0635c516..71f3294e0 100644
--- a/src/internal_modules/roc_core/target_gnu/roc_core/demangle_symbol.cpp
+++ b/src/internal_modules/roc_core/target_gnu/roc_core/demangle_symbol.cpp
@@ -6,12 +6,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "roc_core/backtrace.h"
+
 #include <cxxabi.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "roc_core/backtrace.h"
-
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_libunwind/roc_core/backtrace.cpp b/src/internal_modules/roc_core/target_libunwind/roc_core/backtrace.cpp
index 157a8ea28..2c0df9670 100644
--- a/src/internal_modules/roc_core/target_libunwind/roc_core/backtrace.cpp
+++ b/src/internal_modules/roc_core/target_libunwind/roc_core/backtrace.cpp
@@ -10,7 +10,6 @@
 #define UNW_LOCAL_ONLY
 
 // Workaround to support building with -std=c++98.
-#include "roc_core/attributes.h"
 #ifdef ROC_ATTR_ALIGNED
 #define alignas(x) ROC_ATTR_ALIGNED(x)
 #endif
@@ -22,6 +21,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "roc_core/attributes.h"
 #include "roc_core/backtrace.h"
 #include "roc_core/string_builder.h"
 
diff --git a/src/internal_modules/roc_core/target_posix/roc_core/cond.h b/src/internal_modules/roc_core/target_posix/roc_core/cond.h
index a402a7d28..9b33f3312 100644
--- a/src/internal_modules/roc_core/target_posix/roc_core/cond.h
+++ b/src/internal_modules/roc_core/target_posix/roc_core/cond.h
@@ -12,15 +12,15 @@
 #ifndef ROC_CORE_COND_H_
 #define ROC_CORE_COND_H_
 
-#include <errno.h>
-#include <pthread.h>
-
 #include "roc_core/atomic.h"
 #include "roc_core/attributes.h"
 #include "roc_core/mutex.h"
 #include "roc_core/noncopyable.h"
 #include "roc_core/time.h"
 
+#include <errno.h>
+#include <pthread.h>
+
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_posix/roc_core/crash_handler.cpp b/src/internal_modules/roc_core/target_posix/roc_core/crash_handler.cpp
index 16a17839a..babbf8c14 100644
--- a/src/internal_modules/roc_core/target_posix/roc_core/crash_handler.cpp
+++ b/src/internal_modules/roc_core/target_posix/roc_core/crash_handler.cpp
@@ -6,16 +6,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-
 #include "roc_core/crash_handler.h"
 #include "roc_core/die.h"
 #include "roc_core/errno_to_str.h"
 #include "roc_core/log.h"
 #include "roc_core/panic.h"
 
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_posix/roc_core/crash_handler.h b/src/internal_modules/roc_core/target_posix/roc_core/crash_handler.h
index 65d6bda79..37c72df58 100644
--- a/src/internal_modules/roc_core/target_posix/roc_core/crash_handler.h
+++ b/src/internal_modules/roc_core/target_posix/roc_core/crash_handler.h
@@ -12,10 +12,10 @@
 #ifndef ROC_CORE_CRASH_HANDLER_H_
 #define ROC_CORE_CRASH_HANDLER_H_
 
-#include <signal.h>
-
 #include "roc_core/noncopyable.h"
 
+#include <signal.h>
+
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_posix/roc_core/die.cpp b/src/internal_modules/roc_core/target_posix/roc_core/die.cpp
index 9dddf4cf3..ebf51fd04 100644
--- a/src/internal_modules/roc_core/target_posix/roc_core/die.cpp
+++ b/src/internal_modules/roc_core/target_posix/roc_core/die.cpp
@@ -6,14 +6,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "roc_core/die.h"
+#include "roc_core/atomic_ops.h"
+#include "roc_core/backtrace.h"
+
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "roc_core/atomic_ops.h"
-#include "roc_core/backtrace.h"
-#include "roc_core/die.h"
-
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_posix/roc_core/mutex.h b/src/internal_modules/roc_core/target_posix/roc_core/mutex.h
index a99c2160b..bec88bde8 100644
--- a/src/internal_modules/roc_core/target_posix/roc_core/mutex.h
+++ b/src/internal_modules/roc_core/target_posix/roc_core/mutex.h
@@ -12,9 +12,6 @@
 #ifndef ROC_CORE_MUTEX_H_
 #define ROC_CORE_MUTEX_H_
 
-#include <errno.h>
-#include <pthread.h>
-
 #include "roc_core/atomic.h"
 #include "roc_core/attributes.h"
 #include "roc_core/errno_to_str.h"
@@ -22,6 +19,9 @@
 #include "roc_core/panic.h"
 #include "roc_core/scoped_lock.h"
 
+#include <errno.h>
+#include <pthread.h>
+
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_posix/roc_core/singleton.h b/src/internal_modules/roc_core/target_posix/roc_core/singleton.h
index 8e2d0c98f..d22ef072c 100644
--- a/src/internal_modules/roc_core/target_posix/roc_core/singleton.h
+++ b/src/internal_modules/roc_core/target_posix/roc_core/singleton.h
@@ -12,13 +12,13 @@
 #ifndef ROC_CORE_SINGLETON_H_
 #define ROC_CORE_SINGLETON_H_
 
-#include <pthread.h>
-
 #include "roc_core/aligned_storage.h"
 #include "roc_core/atomic_ops.h"
 #include "roc_core/noncopyable.h"
 #include "roc_core/panic.h"
 
+#include <pthread.h>
+
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_posix/roc_core/thread.cpp b/src/internal_modules/roc_core/target_posix/roc_core/thread.cpp
index 1512f44b0..1b0e76443 100644
--- a/src/internal_modules/roc_core/target_posix/roc_core/thread.cpp
+++ b/src/internal_modules/roc_core/target_posix/roc_core/thread.cpp
@@ -6,6 +6,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "roc_core/thread.h"
+#include "roc_core/errno_to_str.h"
+#include "roc_core/log.h"
+#include "roc_core/panic.h"
+
+#include <unistd.h>
+
 #if defined(__linux__)
 #include <sys/syscall.h>
 #elif defined(__FreeBSD__) || defined(__OpenBSD__)
@@ -14,13 +21,6 @@
 #include <lwp.h>
 #endif
 
-#include <unistd.h>
-
-#include "roc_core/errno_to_str.h"
-#include "roc_core/log.h"
-#include "roc_core/panic.h"
-#include "roc_core/thread.h"
-
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_posix/roc_core/thread.h b/src/internal_modules/roc_core/target_posix/roc_core/thread.h
index 2b593fd9a..43b2d0568 100644
--- a/src/internal_modules/roc_core/target_posix/roc_core/thread.h
+++ b/src/internal_modules/roc_core/target_posix/roc_core/thread.h
@@ -12,14 +12,14 @@
 #ifndef ROC_CORE_THREAD_H_
 #define ROC_CORE_THREAD_H_
 
-#include <pthread.h>
-
 #include "roc_core/atomic.h"
 #include "roc_core/attributes.h"
 #include "roc_core/mutex.h"
 #include "roc_core/noncopyable.h"
 #include "roc_core/stddefs.h"
 
+#include <pthread.h>
+
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_posix/roc_core/time.cpp b/src/internal_modules/roc_core/target_posix/roc_core/time.cpp
index f5b100658..52e0a53bb 100644
--- a/src/internal_modules/roc_core/target_posix/roc_core/time.cpp
+++ b/src/internal_modules/roc_core/target_posix/roc_core/time.cpp
@@ -6,15 +6,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "roc_core/time.h"
+#include "roc_core/errno_to_str.h"
+#include "roc_core/panic.h"
+
 #include <errno.h>
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
 
-#include "roc_core/errno_to_str.h"
-#include "roc_core/panic.h"
-#include "roc_core/time.h"
-
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_posix_ext/roc_core/semaphore.cpp b/src/internal_modules/roc_core/target_posix_ext/roc_core/semaphore.cpp
index 327a05eb7..0d9685390 100644
--- a/src/internal_modules/roc_core/target_posix_ext/roc_core/semaphore.cpp
+++ b/src/internal_modules/roc_core/target_posix_ext/roc_core/semaphore.cpp
@@ -6,13 +6,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <errno.h>
-#include <time.h>
-
+#include "roc_core/semaphore.h"
 #include "roc_core/cpu_instructions.h"
 #include "roc_core/errno_to_str.h"
 #include "roc_core/panic.h"
-#include "roc_core/semaphore.h"
+
+#include <errno.h>
+#include <time.h>
 
 namespace roc {
 namespace core {
diff --git a/src/internal_modules/roc_core/target_posix_ext/roc_core/semaphore.h b/src/internal_modules/roc_core/target_posix_ext/roc_core/semaphore.h
index 05ab35bef..7c9e71c4c 100644
--- a/src/internal_modules/roc_core/target_posix_ext/roc_core/semaphore.h
+++ b/src/internal_modules/roc_core/target_posix_ext/roc_core/semaphore.h
@@ -12,13 +12,13 @@
 #ifndef ROC_CORE_SEMAPHORE_H_
 #define ROC_CORE_SEMAPHORE_H_
 
-#include <semaphore.h>
-
 #include "roc_core/atomic.h"
 #include "roc_core/attributes.h"
 #include "roc_core/noncopyable.h"
 #include "roc_core/time.h"
 
+#include <semaphore.h>
+
 namespace roc {
 namespace core {
 
diff --git a/src/internal_modules/roc_core/target_posix_pc/roc_core/console.cpp b/src/internal_modules/roc_core/target_posix_pc/roc_core/console.cpp
index 04c6e6033..95f99ce43 100644
--- a/src/internal_modules/roc_core/target_posix_pc/roc_core/console.cpp
+++ b/src/internal_modules/roc_core/target_posix_pc/roc_core/console.cpp
@@ -6,6 +6,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "roc_core/console.h"
+#include "roc_core/atomic_ops.h"
+
 #include <pthread.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -13,9 +16,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "roc_core/atomic_ops.h"
-#include "roc_core/console.h"
-
 // ANSI Color Codes.
 #define COLOR_NONE ""
 #define COLOR_START "\033["