Index: Makefile
===================================================================
--- Makefile	(revision e540bc874e3accb1e3c70f4fa85bba2a12f7a592)
+++ Makefile	(revision d1d7a9224fd43f2b1810083927b68b44d7e95e5f)
@@ -31,4 +31,5 @@
 
 CSCOPE = cscope
+FORMAT = clang-format
 CHECK = tools/check.sh
 CONFIG = tools/config.py
@@ -64,4 +65,7 @@
 	find boot -type f -regex '^.*\.[chsS]$$' | xargs $(CSCOPE) -b -k -u -f$(CSCOPE)_boot.out
 	find uspace -type f -regex '^.*\.[chsS]$$' | xargs $(CSCOPE) -b -k -u -f$(CSCOPE)_uspace.out
+
+format:
+	find abi kernel boot uspace -type f -regex '^.*\.[ch]$$' | xargs $(FORMAT) -i -sort-includes -style=file
 
 # Pre-integration build check