diff --git a/src/hs_common.h b/src/hs_common.h
index b25b1842..fac08253 100644
--- a/src/hs_common.h
+++ b/src/hs_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, Intel Corporation
+ * Copyright (c) 2015-2017, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -545,7 +545,7 @@ hs_error_t hs_valid_platform(void);
  * At a minimum, Hyperscan requires Supplemental Streaming SIMD Extensions 3
  * (SSSE3).
  */
-#define HS_ARCH_ERROR		    (-11)
+#define HS_ARCH_ERROR           (-11)
 
 /** @} */
 
diff --git a/src/nfagraph/ng_som.cpp b/src/nfagraph/ng_som.cpp
index 6481eff7..67438103 100644
--- a/src/nfagraph/ng_som.cpp
+++ b/src/nfagraph/ng_som.cpp
@@ -1734,8 +1734,8 @@ namespace {
 struct SomRevNfa {
     SomRevNfa(NFAVertex s, ReportID r, bytecode_ptr<NFA> n)
         : sink(s), report(r), nfa(move(n)) {}
-	SomRevNfa(SomRevNfa&& s) // MSVC2013 needs this for emplace
-		: sink(s.sink), report(s.report), nfa(move(s.nfa)) {}
+    SomRevNfa(SomRevNfa &&s) // MSVC2013 needs this for emplace
+        : sink(s.sink), report(s.report), nfa(move(s.nfa)) {}
     NFAVertex sink;
     ReportID report;
     bytecode_ptr<NFA> nfa;
diff --git a/src/ue2common.h b/src/ue2common.h
index e1f03f72..4bec8315 100644
--- a/src/ue2common.h
+++ b/src/ue2common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, Intel Corporation
+ * Copyright (c) 2015-2017, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -189,8 +189,8 @@ typedef u32 ReportID;
   #define unlikely(x)   __builtin_expect(!!(x), 0)
 #endif
 #else
-#define likely(x)	(x)
-#define unlikely(x)	(x)
+#define likely(x)   (x)
+#define unlikely(x) (x)
 #endif
 
 #if !defined(RELEASE_BUILD) || defined(DEBUG)
diff --git a/src/util/make_unique.h b/src/util/make_unique.h
index 12148af1..651e8c5c 100644
--- a/src/util/make_unique.h
+++ b/src/util/make_unique.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Intel Corporation
+ * Copyright (c) 2015-2017, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -39,9 +39,9 @@
 
 namespace ue2 {
 #if defined(USE_STD)
-	using std::make_unique;
+using std::make_unique;
 #else
-	using boost::make_unique;
+using boost::make_unique;
 #endif
 }
 
diff --git a/unit/internal/bitutils.cpp b/unit/internal/bitutils.cpp
index 7241c0b8..3f788544 100644
--- a/unit/internal/bitutils.cpp
+++ b/unit/internal/bitutils.cpp
@@ -36,26 +36,26 @@
 // open coded implementations to test against
 static
 u32 our_clz(u32 x) {
-	u32 n;
+    u32 n;
 
-	if (x == 0) return(32);
-	n = 0;
-	if (x <= 0x0000FFFF) { n = n + 16; x = x << 16; }
-	if (x <= 0x00FFFFFF) { n = n + 8; x = x << 8; }
-	if (x <= 0x0FFFFFFF) { n = n + 4; x = x << 4; }
-	if (x <= 0x3FFFFFFF) { n = n + 2; x = x << 2; }
-	if (x <= 0x7FFFFFFF) { n = n + 1; }
-	return n;
+    if (x == 0) return(32);
+    n = 0;
+    if (x <= 0x0000FFFF) { n = n + 16; x = x << 16; }
+    if (x <= 0x00FFFFFF) { n = n + 8; x = x << 8; }
+    if (x <= 0x0FFFFFFF) { n = n + 4; x = x << 4; }
+    if (x <= 0x3FFFFFFF) { n = n + 2; x = x << 2; }
+    if (x <= 0x7FFFFFFF) { n = n + 1; }
+    return n;
 }
 
 static
 u32 our_clzll(u64a x) {
-	// Synthesise from 32-bit variant.
-	u32 high = x >> 32;
-	if (high) {
-		return our_clz(high);
-	}
-	return 32 + our_clz(x);
+    // Synthesise from 32-bit variant.
+    u32 high = x >> 32;
+    if (high) {
+        return our_clz(high);
+    }
+    return 32 + our_clz(x);
 }