diff --git a/cvmfs/ingestion/task_read.cc b/cvmfs/ingestion/task_read.cc
index c89346a83b09bec5bae2e1c2ddbe94db95d442ea..1d87033743d44ec587f6ea91f31f51d8ff217a7c 100644
--- a/cvmfs/ingestion/task_read.cc
+++ b/cvmfs/ingestion/task_read.cc
@@ -12,8 +12,8 @@
 
 #include "backoff.h"
 #include "util/exception.h"
-#include "util/platform.h"
 #include "util/logging.h"
+#include "util/platform.h"
 #include "util/posix.h"
 #include "util/smalloc.h"
 
diff --git a/cvmfs/util/platform_linux.h b/cvmfs/util/platform_linux.h
index 8361ee1b4f009d4dbeef36637d0154168f0e72a0..f1365f9856b2aaf7a4ae92bc44800248fa70504b 100644
--- a/cvmfs/util/platform_linux.h
+++ b/cvmfs/util/platform_linux.h
@@ -4,8 +4,8 @@
  * Linux specific system/library calls.
  */
 
-#ifndef CVMFS_PLATFORM_LINUX_H_
-#define CVMFS_PLATFORM_LINUX_H_
+#ifndef CVMFS_UTIL_PLATFORM_LINUX_H_
+#define CVMFS_UTIL_PLATFORM_LINUX_H_
 
 #include <sys/types.h>  // contains ssize_t needed inside <attr/xattr.h>
 #include <sys/xattr.h>
@@ -354,4 +354,4 @@ inline uint64_t platform_memsize() {
 }  // namespace CVMFS_NAMESPACE_GUARD
 #endif
 
-#endif  // CVMFS_PLATFORM_LINUX_H_
+#endif  // CVMFS_UTIL_PLATFORM_LINUX_H_
diff --git a/cvmfs/util/platform_osx.h b/cvmfs/util/platform_osx.h
index 13b6953f262dcc77527be40e200b3de02b7f1422..0589963e32dd5d0c9c1ca8d3e732621916784a45 100644
--- a/cvmfs/util/platform_osx.h
+++ b/cvmfs/util/platform_osx.h
@@ -4,8 +4,8 @@
  * Mac OS X specific system/library calls.
  */
 
-#ifndef CVMFS_PLATFORM_OSX_H_
-#define CVMFS_PLATFORM_OSX_H_
+#ifndef CVMFS_UTIL_PLATFORM_OSX_H_
+#define CVMFS_UTIL_PLATFORM_OSX_H_
 
 #include <alloca.h>
 #include <dirent.h>
@@ -312,4 +312,4 @@ inline uint64_t platform_memsize() {
 }  // namespace CVMFS_NAMESPACE_GUARD
 #endif
 
-#endif  // CVMFS_PLATFORM_OSX_H_
+#endif  // CVMFS_UTIL_PLATFORM_OSX_H_
diff --git a/test/micro-benchmarks/b_smallhash.cc b/test/micro-benchmarks/b_smallhash.cc
index 6002cda128568c75555d918603b520000bcf83b3..786b4081911a326e0a094f53b5b4c1f77f8ebfbb 100644
--- a/test/micro-benchmarks/b_smallhash.cc
+++ b/test/micro-benchmarks/b_smallhash.cc
@@ -12,10 +12,10 @@
 #include "bm_util.h"
 #include "directory_entry.h"
 #include "hash.h"
-#include "util/murmur.hxx"
-#include "util/prng.h"
 #include "shortstring.h"
 #include "smallhash.h"
+#include "util/murmur.hxx"
+#include "util/prng.h"
 
 class BM_SmallHash : public benchmark::Fixture {
  protected: