6 files changed, 18 insertions, 5 deletions
diff --git a/src/commit.h b/src/commit.h
index c863948af..0b19f4634 100644
--- a/src/commit.h
+++ b/src/commit.h
@@ -1,5 +1,6 @@
 #ifndef INCLUDE_commit_h__
 #define INCLUDE_commit_h__
+
 #include "git/commit.h"
 
 #include <time.h>
diff --git a/src/common.h b/src/common.h
index bdf233425..0e115c5be 100644
--- a/src/common.h
+++ b/src/common.h
@@ -4,6 +4,7 @@
 #include "cc-compat.h"
 #include "util.h"
 #include "errors.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/errors.h b/src/errors.h
index 1137d90e6..caebc63b3 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -1,5 +1,6 @@
 #ifndef INCLUDE_errors_h__
 #define INCLUDE_errors_h__
+
 #include "git/errors.h"
 #include <stdlib.h>
 
@@ -15,4 +16,5 @@ GIT_INLINE(void) *git_ptr_error(int code)
 	git_errno = code;
 	return NULL;
 }
+
 #endif
diff --git a/src/git/errors.h b/src/git/errors.h
index d0a0d6308..18eb2b8ad 100644
--- a/src/git/errors.h
+++ b/src/git/errors.h
@@ -1,14 +1,15 @@
 #ifndef INCLUDE_git_errors_h__
 #define INCLUDE_git_errors_h__
+
+#include "common.h"
+#include "thread-utils.h"
+
 /**
  * @file git/errors.h
  * @brief Git error handling routines and variables
  * @ingroup Git
  * @{
  */
-
-#include "common.h"
-#include "thread-utils.h"
 GIT_BEGIN_DECL
 
 /** The git errno. */
@@ -20,6 +21,7 @@ GIT_EXTERN(int) GIT_TLS git_errno;
  * @return a string explaining the error code
  */
 GIT_EXTERN(const char *) git_strerror(int num);
+
 /** @} */
 GIT_END_DECL
 #endif
diff --git a/src/git/fileops.h b/src/git/fileops.h
index 7f5dd3776..657cec148 100644
--- a/src/git/fileops.h
+++ b/src/git/fileops.h
@@ -1,6 +1,8 @@
 #ifndef INCLUDE_git_fileops_h__
 #define INCLUDE_git_fileops_h__
 
+#include "common.h"
+
 /**
  * @file git/fileops.h
  * @brief Git platform agnostic filesystem operations
@@ -8,9 +10,8 @@
  * @ingroup Git
  * @{
  */
-
-#include "common.h"
 GIT_BEGIN_DECL
+
 /**
  * For each directory entry (except "." and ".."), run the function
  * "fn", passing it "arg" as its first argument and the path to
diff --git a/src/git/thread-utils.h b/src/git/thread-utils.h
index 7322d43c8..c14aa17cb 100644
--- a/src/git/thread-utils.h
+++ b/src/git/thread-utils.h
@@ -1,22 +1,28 @@
 #ifndef INCLUDE_git_thread_utils_h__
 #define INCLUDE_git_thread_utils_h__
+
 /*
  * How TLS works is compiler+platform dependant
  * Sources: http://en.wikipedia.org/wiki/Thread-Specific_Storage
  *          http://predef.sourceforge.net/precomp.html
  */
+
 #define GIT_HAS_TLS 1
+
 #if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || \
 	defined(__xlc__) || defined(__xlC__)
 # define GIT_TLS __thread
+
 #elif defined(__INTEL_COMPILER)
 # if defined(_WIN32) || defined(_WIN32_CE)
 #  define GIT_TLS __declspec(thread)
 # else
 #  define GIT_TLS __thread
 # endif
+
 #elif defined(_WIN32) || defined(_WIN32_CE) || defined(__BORLANDC__)
 # define GIT_TLS __declspec(thread)
+
 #else
 # undef GIT_HAS_TLS
 # define GIT_TLS /* nothing: tls vars are thread-global */