diff --git a/documentation/coding-standards.h b/documentation/coding-standards.h
index 6b8f7ba8..b292f4d8 100644
--- a/documentation/coding-standards.h
+++ b/documentation/coding-standards.h
@@ -1,60 +1,71 @@
 //krazy:skip
 /**
 \page coding-standards Coding Standards
 
 <h2>Compatibility</h2>
 
 Not every distro ships the latest version of Qt. As a rule of thumb, we aim for compatibility with the latest Ubuntu LTS release.
 
 <h3>Why Ubuntu?</h3>
 
 \li It is one of the more popular distros
 \li The release life cycle is very regular
 \li Package information is readily available <a href='https://packages.ubuntu.com/libqt5gui' alt='Ubuntu package search'>online</a>
 
+<h2>Code formatting</h2>
+
+We use clang-format to change our code. Please do use our commit-hooks that are described in `dev/README-dev.txt`.
+
 <h2>General conventions</h2>
 
 Here are a few pointers regarding coding standards in KPhotoAlbum. Please do stick to them, so the
 code is easier to get into for new people, and easier to maintain for everyone.
 
 \li Basically, we try to stick by the
     <a href="https://community.kde.org/Policies/Kdelibs_Coding_Style">kdelibs coding style</a>.
 \li Indentation is 4 spaces.
 \li Instance variables are prefixed with `m_` (not only with `_`).
 \li Static instance variables are prefixed with `s_`.
 \li Methods that are overridden from a superclass should be marked as such using the C++11
     `override` keyword.
 \li KPhotoAlbum is warning free zone. Please keep it that way. No warnings during compilations are
     accepted.
 \li Don't enable debugging statements in production code.
     Use categorized logging (QLoggingCategory) with the prefix "kphotoalbum.DIRECTORY" and possibly subcomponents.
     You can then enable the code by setting the environment variable QT_LOGGING_RULES="kphotoalbum.*=true".
 
 <h2>Include files and forward declarations</h2>
 
+The order of include statements should always be the following:
+
+\li "config-kpa-xxx.h" includes
+\li file-specific header file
+\li KPA-includes
+\li other includes
+
 To speed up compilation and make things easier to understand, you should be careful about what you
 include, and when cleaning up code, please check whether you need all the include files.
 
 In header files you should try hard to see if you really need an include file at all, or whether
 you can get by with only a forward declaration.
 
 A forward declaration looks like:
 
 \code
 class MyClass;
 namespace MyNameSpace { class MyClass; }
 \endcode
 
 You can get by with only a forward declaration when all you do is one of these:
 
 \li declare a method that passes a pointer or reference as argument (`doSomething(const MyClass&)`)
 \li return an object from a method (`MyClass getClass()`)
 \li you only have the class in a container (`QList<MyClass>`)
 
 In contrast you do need the include files when:
 
 \li you declare a method that takes a value argument (`doSomething(MyClass cls)`)
 \li you have an instance variable of the given class (`MyClass m_class`).
 
 */
 // vi:expandtab:tabstop=4 shiftwidth=4: