diff --git a/include/ndn-cpp/c/common.h b/include/ndn-cpp/c/common.h
index 7f47f7a..89392bc 100644
--- a/include/ndn-cpp/c/common.h
+++ b/include/ndn-cpp/c/common.h
@@ -5,7 +5,7 @@
  */
 
 #ifndef NDN_COMMON_H
-#define	NDN_COMMON_H
+#define NDN_COMMON_H
 
 #include "../ndn-cpp-config.h"
 #include <stdint.h>
diff --git a/include/ndn-cpp/c/data-types.h b/include/ndn-cpp/c/data-types.h
index 3c2abce..668786b 100644
--- a/include/ndn-cpp/c/data-types.h
+++ b/include/ndn-cpp/c/data-types.h
@@ -5,9 +5,9 @@
  */
 
 #ifndef NDN_DATA_TYPES_H
-#define	NDN_DATA_TYPES_H
+#define NDN_DATA_TYPES_H
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -20,7 +20,7 @@
   ndn_ContentType_NACK = 5
 } ndn_ContentType;
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff --git a/include/ndn-cpp/c/forwarding-flags.h b/include/ndn-cpp/c/forwarding-flags.h
index ba6f6b5..863bf04 100644
--- a/include/ndn-cpp/c/forwarding-flags.h
+++ b/include/ndn-cpp/c/forwarding-flags.h
@@ -5,9 +5,9 @@
  */
 
 #ifndef NDN_FORWARDING_FLAGS_H
-#define	NDN_FORWARDING_FLAGS_H
+#define NDN_FORWARDING_FLAGS_H
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -48,7 +48,7 @@
 void ndn_ForwardingFlags_setForwardingEntryFlags(struct ndn_ForwardingFlags *self, int forwardingEntryFlags);
 
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff --git a/include/ndn-cpp/c/interest-types.h b/include/ndn-cpp/c/interest-types.h
index d6a5e51..21c80d9 100644
--- a/include/ndn-cpp/c/interest-types.h
+++ b/include/ndn-cpp/c/interest-types.h
@@ -5,9 +5,9 @@
  */
 
 #ifndef NDN_INTEREST_TYPES_H
-#define	NDN_INTEREST_TYPES_H
+#define NDN_INTEREST_TYPES_H
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -18,7 +18,7 @@
 
 
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff --git a/include/ndn-cpp/encoding/oid.hpp b/include/ndn-cpp/encoding/oid.hpp
index bcbcfe9..bc0dd25 100644
--- a/include/ndn-cpp/encoding/oid.hpp
+++ b/include/ndn-cpp/encoding/oid.hpp
@@ -7,7 +7,7 @@
  */
 
 #ifndef NDN_OID_HPP
-#define	NDN_OID_HPP
+#define NDN_OID_HPP
 
 #include <vector>
 #include <string>
diff --git a/include/ndn-cpp/forwarding-entry.hpp b/include/ndn-cpp/forwarding-entry.hpp
index 675b56b..d56d03d 100644
--- a/include/ndn-cpp/forwarding-entry.hpp
+++ b/include/ndn-cpp/forwarding-entry.hpp
@@ -6,7 +6,7 @@
  */
 
 #ifndef NDN_FORWARDING_ENTRY_HPP
-#define	NDN_FORWARDING_ENTRY_HPP
+#define NDN_FORWARDING_ENTRY_HPP
 
 #include <string>
 #include "name.hpp"
diff --git a/include/ndn-cpp/forwarding-flags.hpp b/include/ndn-cpp/forwarding-flags.hpp
index 7f06dfd..d722275 100644
--- a/include/ndn-cpp/forwarding-flags.hpp
+++ b/include/ndn-cpp/forwarding-flags.hpp
@@ -6,7 +6,7 @@
  */
 
 #ifndef NDN_FORWARDING_FLAGS_HPP
-#define	NDN_FORWARDING_FLAGS_HPP
+#define NDN_FORWARDING_FLAGS_HPP
 
 #include "c/forwarding-flags.h"
 
diff --git a/include/ndn-cpp/security/certificate/identity-certificate.hpp b/include/ndn-cpp/security/certificate/identity-certificate.hpp
index 41035a7..e9e90f5 100644
--- a/include/ndn-cpp/security/certificate/identity-certificate.hpp
+++ b/include/ndn-cpp/security/certificate/identity-certificate.hpp
@@ -7,7 +7,7 @@
  */
 
 #ifndef NDN_IDENTITY_CERTIFICATE_HPP
-#define	NDN_IDENTITY_CERTIFICATE_HPP
+#define NDN_IDENTITY_CERTIFICATE_HPP
 
 #include "certificate.hpp"
 
diff --git a/include/ndn-cpp/security/certificate/public-key.hpp b/include/ndn-cpp/security/certificate/public-key.hpp
index fa8724f..0a48b5f 100644
--- a/include/ndn-cpp/security/certificate/public-key.hpp
+++ b/include/ndn-cpp/security/certificate/public-key.hpp
@@ -7,7 +7,7 @@
  */
 
 #ifndef NDN_PUBLIC_KEY_HPP
-#define	NDN_PUBLIC_KEY_HPP
+#define NDN_PUBLIC_KEY_HPP
 
 #include "../../util/blob.hpp"
 #include "../../encoding/oid.hpp"
diff --git a/include/ndn-cpp/security/encryption/encryption-manager.hpp b/include/ndn-cpp/security/encryption/encryption-manager.hpp
index 88a69c8..e6d29e9 100644
--- a/include/ndn-cpp/security/encryption/encryption-manager.hpp
+++ b/include/ndn-cpp/security/encryption/encryption-manager.hpp
@@ -6,7 +6,7 @@
  */
 
 #ifndef NDN_ENCRYPTION_MANAGER_HPP
-#define	NDN_ENCRYPTION_MANAGER_HPP
+#define NDN_ENCRYPTION_MANAGER_HPP
 
 #include "../../name.hpp"
 #include "../security-common.hpp"
diff --git a/include/ndn-cpp/security/identity/identity-storage.hpp b/include/ndn-cpp/security/identity/identity-storage.hpp
index d514dc8..d9b5e1a 100644
--- a/include/ndn-cpp/security/identity/identity-storage.hpp
+++ b/include/ndn-cpp/security/identity/identity-storage.hpp
@@ -7,7 +7,7 @@
  */
 
 #ifndef NDN_IDENTITY_STORAGE_HPP
-#define	NDN_IDENTITY_STORAGE_HPP
+#define NDN_IDENTITY_STORAGE_HPP
 
 #include "../../name.hpp"
 #include "../security-common.hpp"
diff --git a/include/ndn-cpp/security/identity/memory-identity-storage.hpp b/include/ndn-cpp/security/identity/memory-identity-storage.hpp
index cf8f318..9b7dd5f 100644
--- a/include/ndn-cpp/security/identity/memory-identity-storage.hpp
+++ b/include/ndn-cpp/security/identity/memory-identity-storage.hpp
@@ -6,7 +6,7 @@
  */
 
 #ifndef NDN_MEMORY_IDENTITY_STORAGE_HPP
-#define	NDN_MEMORY_IDENTITY_STORAGE_HPP
+#define NDN_MEMORY_IDENTITY_STORAGE_HPP
 
 #include <vector>
 #include "identity-storage.hpp"
diff --git a/include/ndn-cpp/security/identity/memory-private-key-storage.hpp b/include/ndn-cpp/security/identity/memory-private-key-storage.hpp
index 02f8fbc..6184c94 100644
--- a/include/ndn-cpp/security/identity/memory-private-key-storage.hpp
+++ b/include/ndn-cpp/security/identity/memory-private-key-storage.hpp
@@ -6,7 +6,7 @@
  */
 
 #ifndef NDN_MEMORY_PRIVATE_KEY_STORAGE_HPP
-#define	NDN_MEMORY_PRIVATE_KEY_STORAGE_HPP
+#define NDN_MEMORY_PRIVATE_KEY_STORAGE_HPP
 
 #include <map>
 #include "private-key-storage.hpp"
diff --git a/include/ndn-cpp/security/identity/private-key-storage.hpp b/include/ndn-cpp/security/identity/private-key-storage.hpp
index 5ade942..d253aa3 100644
--- a/include/ndn-cpp/security/identity/private-key-storage.hpp
+++ b/include/ndn-cpp/security/identity/private-key-storage.hpp
@@ -7,7 +7,7 @@
  */
 
 #ifndef NDN_PRIVATE_KEY_STORAGE_HPP
-#define	NDN_PRIVATE_KEY_STORAGE_HPP
+#define NDN_PRIVATE_KEY_STORAGE_HPP
 
 #include <string>
 #include "../../util/blob.hpp"
diff --git a/include/ndn-cpp/security/policy/no-verify-policy-manager.hpp b/include/ndn-cpp/security/policy/no-verify-policy-manager.hpp
index 8b72eda..9bfdd1c 100644
--- a/include/ndn-cpp/security/policy/no-verify-policy-manager.hpp
+++ b/include/ndn-cpp/security/policy/no-verify-policy-manager.hpp
@@ -7,7 +7,7 @@
  */
 
 #ifndef NDN_NO_VERIFY_POLICY_MANAGER_HPP
-#define	NDN_NO_VERIFY_POLICY_MANAGER_HPP
+#define NDN_NO_VERIFY_POLICY_MANAGER_HPP
 
 #include "policy-manager.hpp"
 
diff --git a/include/ndn-cpp/security/policy/policy-manager.hpp b/include/ndn-cpp/security/policy/policy-manager.hpp
index 458f84f..5b3609d 100644
--- a/include/ndn-cpp/security/policy/policy-manager.hpp
+++ b/include/ndn-cpp/security/policy/policy-manager.hpp
@@ -7,7 +7,7 @@
  */
 
 #ifndef NDN_POLICY_MANAGER_HPP
-#define	NDN_POLICY_MANAGER_HPP
+#define NDN_POLICY_MANAGER_HPP
 
 #include "../../data.hpp"
 #include "../key-chain.hpp"
diff --git a/include/ndn-cpp/security/security-common.hpp b/include/ndn-cpp/security/security-common.hpp
index 1222480..76fc849 100644
--- a/include/ndn-cpp/security/security-common.hpp
+++ b/include/ndn-cpp/security/security-common.hpp
@@ -6,7 +6,7 @@
  */
 
 #ifndef NDN_SECURITY_COMMON_HPP
-#define	NDN_SECURITY_COMMON_HPP
+#define NDN_SECURITY_COMMON_HPP
 
 namespace ndn {
 
diff --git a/include/ndn-cpp/security/security-exception.hpp b/include/ndn-cpp/security/security-exception.hpp
index f14948f..daf1d61 100644
--- a/include/ndn-cpp/security/security-exception.hpp
+++ b/include/ndn-cpp/security/security-exception.hpp
@@ -7,7 +7,7 @@
  */
 
 #ifndef NDN_SECURITY_EXCEPTION_HPP
-#define	NDN_SECURITY_EXCEPTION_HPP
+#define NDN_SECURITY_EXCEPTION_HPP
 
 #include <exception>
 #include <string>
diff --git a/include/ndn-cpp/sha256-with-rsa-signature.hpp b/include/ndn-cpp/sha256-with-rsa-signature.hpp
index 25eb6ae..276c971 100644
--- a/include/ndn-cpp/sha256-with-rsa-signature.hpp
+++ b/include/ndn-cpp/sha256-with-rsa-signature.hpp
@@ -6,7 +6,7 @@
  */
 
 #ifndef NDN_SHA256_WITH_RSA_SIGNATURE_HPP
-#define	NDN_SHA256_WITH_RSA_SIGNATURE_HPP
+#define NDN_SHA256_WITH_RSA_SIGNATURE_HPP
 
 #include "data.hpp"
 #include "key.hpp"
diff --git a/include/ndn-cpp/util/blob.hpp b/include/ndn-cpp/util/blob.hpp
index 5bf5654..f81de6d 100644
--- a/include/ndn-cpp/util/blob.hpp
+++ b/include/ndn-cpp/util/blob.hpp
@@ -6,7 +6,7 @@
  */
 
 #ifndef NDN_BLOB_HPP
-#define	NDN_BLOB_HPP
+#define NDN_BLOB_HPP
 
 #include "../common.hpp"
 
diff --git a/include/ndn-cpp/util/signed-blob.hpp b/include/ndn-cpp/util/signed-blob.hpp
index 7d9c4e1..6dac765 100644
--- a/include/ndn-cpp/util/signed-blob.hpp
+++ b/include/ndn-cpp/util/signed-blob.hpp
@@ -8,7 +8,7 @@
  */
 
 #ifndef NDN_SIGNED_BLOB_HPP
-#define	NDN_SIGNED_BLOB_HPP
+#define NDN_SIGNED_BLOB_HPP
 
 #include "blob.hpp"