diff --git a/encfs/DirNode.cpp b/encfs/DirNode.cpp
index ca473f8..d5447d7 100644
--- a/encfs/DirNode.cpp
+++ b/encfs/DirNode.cpp
@@ -18,30 +18,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "DirNode.h"
+
 #include <cerrno>
 #include <cstdio>
+#include <cstring>
+#ifdef __linux__
+#include <sys/fsuid.h>
+#endif
 #include <pthread.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <utime.h>
-
-#include "DirNode.h"
-#include "FSConfig.h"
-#include "FileNode.h"
-#include "FileUtils.h"
-#include "NameIO.h"
-#ifdef __linux__
-#include <sys/fsuid.h>
-#endif
-
-#include "easylogging++.h"
-#include <cstring>
 #include <utility>
+#include <utime.h>
 
 #include "Context.h"
 #include "Error.h"
+#include "FSConfig.h"
+#include "FileNode.h"
+#include "FileUtils.h"
 #include "Mutex.h"
+#include "NameIO.h"
+#include "easylogging++.h"
 
 using namespace std;
 
diff --git a/encfs/FileNode.cpp b/encfs/FileNode.cpp
index e07763c..022c384 100644
--- a/encfs/FileNode.cpp
+++ b/encfs/FileNode.cpp
@@ -18,22 +18,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "FileNode.h"
+
 #include <cerrno>
 #include <cinttypes>
+#include <cstring>
 #include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 #ifdef __linux__
 #include <sys/fsuid.h>
 #endif
-
-#include <cstring>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "CipherFileIO.h"
 #include "Error.h"
 #include "FileIO.h"
-#include "FileNode.h"
 #include "FileUtils.h"
 #include "MACFileIO.h"
 #include "Mutex.h"
diff --git a/encfs/readpassphrase.cpp b/encfs/readpassphrase.cpp
index 0dabad3..93750f7 100644
--- a/encfs/readpassphrase.cpp
+++ b/encfs/readpassphrase.cpp
@@ -37,6 +37,8 @@ static const char rcsid[] =
 
 #ifndef HAVE_READPASSPHRASE
 
+#include "readpassphrase.h"
+
 #include <cctype>
 #include <cerrno>
 #include <csignal>
@@ -48,8 +50,6 @@ static const char rcsid[] =
 #include <termios.h>
 #include <unistd.h>
 
-#include "readpassphrase.h"
-
 #ifdef TCSASOFT
 #define _T_FLUSH (TCSAFLUSH | TCSASOFT)
 #else