diff --git a/ChangeLog b/ChangeLog
index f7f0f08a..668a36c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-31  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Made #include guard consistent for c++ header files.
+
 2010-10-31  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed the bug that downloading > 4GB file fails on 32bit systems.
diff --git a/src/A2STR.h b/src/A2STR.h
index 1eb94e98..bddb8808 100644
--- a/src/A2STR.h
+++ b/src/A2STR.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_A2_STR_H_
-#define _D_A2_STR_H_
+#ifndef D_A2_STR_H
+#define D_A2_STR_H
 
 #include <string>
 
@@ -71,4 +71,4 @@ public:
 };
 } // namespace aria2
 
-#endif // _D_A2_STR_H_
+#endif // D_A2_STR_H
diff --git a/src/ARC4Decryptor.h b/src/ARC4Decryptor.h
index 25cb56fd..32714f3f 100644
--- a/src/ARC4Decryptor.h
+++ b/src/ARC4Decryptor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ARC4_DECRYPTOR_H_
-#define _D_ARC4_DECRYPTOR_H_
+#ifndef D_ARC4_DECRYPTOR_H
+#define D_ARC4_DECRYPTOR_H
 
 #include "common.h"
 #ifdef HAVE_LIBGCRYPT
@@ -62,4 +62,4 @@ public:
 
 #endif
 
-#endif // _D_ARC4_DECRYPTOR_H_
+#endif // D_ARC4_DECRYPTOR_H
diff --git a/src/ARC4Encryptor.h b/src/ARC4Encryptor.h
index 2ceee750..f3437d97 100644
--- a/src/ARC4Encryptor.h
+++ b/src/ARC4Encryptor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ARC4_ENCRYPTOR_H_
-#define _D_ARC4_ENCRYPTOR_H_
+#ifndef D_ARC4_ENCRYPTOR_H
+#define D_ARC4_ENCRYPTOR_H
 
 #include "common.h"
 #ifdef HAVE_LIBGCRYPT
@@ -62,4 +62,4 @@ public:
 
 #endif
 
-#endif // _D_ARC4_ENCRYPTOR_H_
+#endif // D_ARC4_ENCRYPTOR_H
diff --git a/src/AbstractAuthResolver.h b/src/AbstractAuthResolver.h
index 19876962..54f33e04 100644
--- a/src/AbstractAuthResolver.h
+++ b/src/AbstractAuthResolver.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_AUTH_RESOLVER_H_
-#define _D_ABSTRACT_AUTH_RESOLVER_H_
+#ifndef D_ABSTRACT_AUTH_RESOLVER_H
+#define D_ABSTRACT_AUTH_RESOLVER_H
 
 #include "AuthResolver.h"
 
@@ -69,4 +69,4 @@ typedef SharedHandle<AbstractAuthResolver> AbstractAuthResolverHandle;
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_AUTH_RESOLVER_H_
+#endif // D_ABSTRACT_AUTH_RESOLVER_H
diff --git a/src/AbstractBtMessage.h b/src/AbstractBtMessage.h
index b6fef8ad..09cf05d3 100644
--- a/src/AbstractBtMessage.h
+++ b/src/AbstractBtMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_BT_MESSAGE_H_
-#define _D_ABSTRACT_BT_MESSAGE_H_
+#ifndef D_ABSTRACT_BT_MESSAGE_H
+#define D_ABSTRACT_BT_MESSAGE_H
 
 #include "BtMessage.h"
 #include "Command.h"
@@ -196,4 +196,4 @@ typedef SharedHandle<AbstractBtMessage> AbstractBtMessageHandle;
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_BT_MESSAGE_H_
+#endif // D_ABSTRACT_BT_MESSAGE_H
diff --git a/src/AbstractCommand.h b/src/AbstractCommand.h
index 9014c277..cd8b2c7c 100644
--- a/src/AbstractCommand.h
+++ b/src/AbstractCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_COMMAND_H_
-#define _D_ABSTRACT_COMMAND_H_
+#ifndef D_ABSTRACT_COMMAND_H
+#define D_ABSTRACT_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -246,4 +246,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_COMMAND_H_
+#endif // D_ABSTRACT_COMMAND_H
diff --git a/src/AbstractDiskWriter.h b/src/AbstractDiskWriter.h
index 5fab1f6b..ea7652c2 100644
--- a/src/AbstractDiskWriter.h
+++ b/src/AbstractDiskWriter.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_DISK_WRITER_H_
-#define _D_ABSTRACT_DISK_WRITER_H_
+#ifndef D_ABSTRACT_DISK_WRITER_H
+#define D_ABSTRACT_DISK_WRITER_H
 
 #include "DiskWriter.h"
 #include <string>
@@ -93,4 +93,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_DISK_WRITER_H_
+#endif // D_ABSTRACT_DISK_WRITER_H
diff --git a/src/AbstractProxyRequestCommand.h b/src/AbstractProxyRequestCommand.h
index df590fba..841ebf85 100644
--- a/src/AbstractProxyRequestCommand.h
+++ b/src/AbstractProxyRequestCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_PROXY_REQUEST_COMMAND_H_
-#define _D_ABSTRACT_PROXY_REQUEST_COMMAND_H_
+#ifndef D_ABSTRACT_PROXY_REQUEST_COMMAND_H
+#define D_ABSTRACT_PROXY_REQUEST_COMMAND_H
 
 #include "AbstractCommand.h"
 
@@ -70,4 +70,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_PROXY_REQUEST_COMMAND_H_
+#endif // D_ABSTRACT_PROXY_REQUEST_COMMAND_H
diff --git a/src/AbstractProxyResponseCommand.h b/src/AbstractProxyResponseCommand.h
index 881cee95..ef4c2b0d 100644
--- a/src/AbstractProxyResponseCommand.h
+++ b/src/AbstractProxyResponseCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_PROXY_RESPONSE_COMMAND_H_
-#define _D_ABSTRACT_PROXY_RESPONSE_COMMAND_H_
+#ifndef D_ABSTRACT_PROXY_RESPONSE_COMMAND_H
+#define D_ABSTRACT_PROXY_RESPONSE_COMMAND_H
 
 #include "AbstractCommand.h"
 
@@ -69,4 +69,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_PROXY_RESPONSE_COMMAND_H_
+#endif // D_ABSTRACT_PROXY_RESPONSE_COMMAND_H
diff --git a/src/AbstractSingleDiskAdaptor.h b/src/AbstractSingleDiskAdaptor.h
index 18dd2b3f..f967d3dc 100644
--- a/src/AbstractSingleDiskAdaptor.h
+++ b/src/AbstractSingleDiskAdaptor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ABSTRACT_SINGLE_DISK_ADAPTOR_H_
-#define _D_ABSTRACT_SINGLE_DISK_ADAPTOR_H_
+#ifndef D_ABSTRACT_SINGLE_DISK_ADAPTOR_H
+#define D_ABSTRACT_SINGLE_DISK_ADAPTOR_H
 
 #include "DiskAdaptor.h"
 
@@ -106,4 +106,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ABSTRACT_SINGLE_DISK_ADAPTOR_H_
+#endif // D_ABSTRACT_SINGLE_DISK_ADAPTOR_H
diff --git a/src/ActivePeerConnectionCommand.h b/src/ActivePeerConnectionCommand.h
index 6a7e16f8..5b270e39 100644
--- a/src/ActivePeerConnectionCommand.h
+++ b/src/ActivePeerConnectionCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ACTIVE_PEER_CONNECTION_COMMAND_H_
-#define _D_ACTIVE_PEER_CONNECTION_COMMAND_H_
+#ifndef D_ACTIVE_PEER_CONNECTION_COMMAND_H
+#define D_ACTIVE_PEER_CONNECTION_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -89,4 +89,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ACTIVE_PEER_CONNECTION_COMMAND_H_
+#endif // D_ACTIVE_PEER_CONNECTION_COMMAND_H
diff --git a/src/AdaptiveURISelector.h b/src/AdaptiveURISelector.h
index cb6d5fd2..97f7bcf9 100644
--- a/src/AdaptiveURISelector.h
+++ b/src/AdaptiveURISelector.h
@@ -33,8 +33,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ADAPTIVE_URI_SELECTOR_H_
-#define _D_ADAPTIVE_URI_SELECTOR_H_
+#ifndef D_ADAPTIVE_URI_SELECTOR_H
+#define D_ADAPTIVE_URI_SELECTOR_H
 #include "URISelector.h"
 #include "SharedHandle.h"
 
@@ -89,4 +89,4 @@ public:
 };
 
 } // namespace aria2
-#endif // _D_ADAPTIVE_URI_SELECTOR_H_
+#endif // D_ADAPTIVE_URI_SELECTOR_H
diff --git a/src/AlphaNumberDecorator.h b/src/AlphaNumberDecorator.h
index 9f550f4d..d916b0de 100644
--- a/src/AlphaNumberDecorator.h
+++ b/src/AlphaNumberDecorator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ALPHA_NUMBER_DECORATOR_H_
-#define _D_ALPHA_NUMBER_DECORATOR_H_
+#ifndef D_ALPHA_NUMBER_DECORATOR_H
+#define D_ALPHA_NUMBER_DECORATOR_H
 
 #include "NumberDecorator.h"
 #include "DlAbortEx.h"
@@ -88,4 +88,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ALPHA_NUMBER_DECORATOR_H_
+#endif // D_ALPHA_NUMBER_DECORATOR_H
diff --git a/src/AnnounceList.h b/src/AnnounceList.h
index 4976d580..b0cb2d77 100644
--- a/src/AnnounceList.h
+++ b/src/AnnounceList.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ANNOUNCE_LIST_H_
-#define _D_ANNOUNCE_LIST_H_
+#ifndef D_ANNOUNCE_LIST_H
+#define D_ANNOUNCE_LIST_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -137,4 +137,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ANNOUNCE_LIST_H_
+#endif // D_ANNOUNCE_LIST_H
diff --git a/src/AnnounceTier.h b/src/AnnounceTier.h
index 0387e83c..08a113d3 100644
--- a/src/AnnounceTier.h
+++ b/src/AnnounceTier.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ANNOUNCE_TIER_H_
-#define _D_ANNOUNCE_TIER_H_
+#ifndef D_ANNOUNCE_TIER_H
+#define D_ANNOUNCE_TIER_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -95,4 +95,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ANNOUNCE_TIER_H_
+#endif // D_ANNOUNCE_TIER_H
diff --git a/src/AsyncNameResolver.h b/src/AsyncNameResolver.h
index ab87d8bb..b1974a03 100644
--- a/src/AsyncNameResolver.h
+++ b/src/AsyncNameResolver.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ASYNC_NAME_RESOLVER_H_
-#define _D_ASYNC_NAME_RESOLVER_H_
+#ifndef D_ASYNC_NAME_RESOLVER_H
+#define D_ASYNC_NAME_RESOLVER_H
 
 #include "common.h"
 
@@ -118,4 +118,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ASYNC_NAME_RESOLVER_H_
+#endif // D_ASYNC_NAME_RESOLVER_H
diff --git a/src/AuthConfig.h b/src/AuthConfig.h
index a241fc83..f8c02bce 100644
--- a/src/AuthConfig.h
+++ b/src/AuthConfig.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_AUTH_CONFIG_H_
-#define _D_AUTH_CONFIG_H_
+#ifndef D_AUTH_CONFIG_H
+#define D_AUTH_CONFIG_H
 
 #include "common.h"
 
@@ -78,4 +78,4 @@ std::ostream& operator<<(std::ostream& o, const AuthConfigHandle& authConfig);
 
 } // namespace aria2
 
-#endif // _D_AUTH_CONFIG_H_
+#endif // D_AUTH_CONFIG_H
diff --git a/src/AuthConfigFactory.h b/src/AuthConfigFactory.h
index f3221800..1291b225 100644
--- a/src/AuthConfigFactory.h
+++ b/src/AuthConfigFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_AUTH_CONFIG_FACTORY_H_
-#define _D_AUTH_CONFIG_FACTORY_H_
+#ifndef D_AUTH_CONFIG_FACTORY_H
+#define D_AUTH_CONFIG_FACTORY_H
 
 #include "common.h"
 
@@ -127,4 +127,4 @@ typedef SharedHandle<AuthConfigFactory> AuthConfigFactoryHandle;
 
 } // namespace aria2
 
-#endif // _D_AUTH_CONFIG_FACTORY_H_
+#endif // D_AUTH_CONFIG_FACTORY_H
diff --git a/src/AuthResolver.h b/src/AuthResolver.h
index ca436af3..1000b16d 100644
--- a/src/AuthResolver.h
+++ b/src/AuthResolver.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_AUTH_RESOLVER_H_
-#define _D_AUTH_RESOLVER_H_
+#ifndef D_AUTH_RESOLVER_H
+#define D_AUTH_RESOLVER_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -54,4 +54,4 @@ typedef SharedHandle<AuthResolver> AuthResolverHandle;
 
 } // namespace aria2
 
-#endif // _D_AUTH_RESOLVER_H_
+#endif // D_AUTH_RESOLVER_H
diff --git a/src/AutoSaveCommand.h b/src/AutoSaveCommand.h
index 89f25f5d..69363f5d 100644
--- a/src/AutoSaveCommand.h
+++ b/src/AutoSaveCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_AUTO_SAVE_COMMAND_H_
-#define _D_AUTO_SAVE_COMMAND_H_
+#ifndef D_AUTO_SAVE_COMMAND_H
+#define D_AUTO_SAVE_COMMAND_H
 
 #include "TimeBasedCommand.h"
 
@@ -53,4 +53,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_AUTO_SAVE_COMMAND_H_
+#endif // D_AUTO_SAVE_COMMAND_H
diff --git a/src/BNode.h b/src/BNode.h
index a194399c..f3022ddc 100644
--- a/src/BNode.h
+++ b/src/BNode.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BNODE_H_
-#define _D_BNODE_H_
+#ifndef D_BNODE_H
+#define D_BNODE_H
 
 #include "common.h"
 
@@ -104,4 +104,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BNODE_H_
+#endif // D_BNODE_H
diff --git a/src/Base64.h b/src/Base64.h
index 408fa946..660510a4 100644
--- a/src/Base64.h
+++ b/src/Base64.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BASE64_H_
-#define _D_BASE64_H_
+#ifndef D_BASE64_H
+#define D_BASE64_H
 #include <string>
 
 namespace aria2 {
@@ -94,4 +94,4 @@ public:
 
 } // namespace aria2
 
-#endif // _BASE64_H_
+#endif // D_BASE64_H
diff --git a/src/BinaryStream.h b/src/BinaryStream.h
index 76107cbf..eee00d3e 100644
--- a/src/BinaryStream.h
+++ b/src/BinaryStream.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BINARY_STREAM_H_
-#define _D_BINARY_STREAM_H_
+#ifndef D_BINARY_STREAM_H
+#define D_BINARY_STREAM_H
 
 #include "common.h"
 
@@ -68,4 +68,4 @@ typedef SharedHandle<BinaryStream> BinaryStreamHandle;
 
 } // namespace aria2
 
-#endif // _D_BINARY_STREAM_H_
+#endif // D_BINARY_STREAM_H
diff --git a/src/BitfieldMan.h b/src/BitfieldMan.h
index 912702e2..591a3b05 100644
--- a/src/BitfieldMan.h
+++ b/src/BitfieldMan.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BITFIELD_MAN_H_
-#define _D_BITFIELD_MAN_H_
+#ifndef D_BITFIELD_MAN_H
+#define D_BITFIELD_MAN_H
 
 #include "common.h"
 
@@ -282,4 +282,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BITFIELD_MAN_H_
+#endif // D_BITFIELD_MAN_H
diff --git a/src/BtAbortOutstandingRequestEvent.h b/src/BtAbortOutstandingRequestEvent.h
index 8b147d0c..d31fb659 100644
--- a/src/BtAbortOutstandingRequestEvent.h
+++ b/src/BtAbortOutstandingRequestEvent.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_ABORT_OUTSTANDING_REQUEST_EVENT_H_
-#define _D_BT_ABORT_OUTSTANDING_REQUEST_EVENT_H_
+#ifndef D_BT_ABORT_OUTSTANDING_REQUEST_EVENT_H
+#define D_BT_ABORT_OUTSTANDING_REQUEST_EVENT_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -53,4 +53,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_ABORT_OUTSTANDING_REQUEST_EVENT_H_
+#endif // D_BT_ABORT_OUTSTANDING_REQUEST_EVENT_H
diff --git a/src/BtAllowedFastMessage.h b/src/BtAllowedFastMessage.h
index 129161e1..af471f1e 100644
--- a/src/BtAllowedFastMessage.h
+++ b/src/BtAllowedFastMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_ALLOWED_FAST_MESSAGE_H_
-#define _D_BT_ALLOWED_FAST_MESSAGE_H_
+#ifndef D_BT_ALLOWED_FAST_MESSAGE_H
+#define D_BT_ALLOWED_FAST_MESSAGE_H
 
 #include "IndexBtMessage.h"
 
@@ -62,4 +62,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_ALLOWED_FAST_MESSAGE_H_
+#endif // D_BT_ALLOWED_FAST_MESSAGE_H
diff --git a/src/BtAnnounce.h b/src/BtAnnounce.h
index 9d42b195..e9d8a438 100644
--- a/src/BtAnnounce.h
+++ b/src/BtAnnounce.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_ANNOUNCE_H_
-#define _D_BT_ANNOUNCE_H_
+#ifndef D_BT_ANNOUNCE_H
+#define D_BT_ANNOUNCE_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -132,4 +132,4 @@ typedef SharedHandle<BtAnnounce> BtAnnounceHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_ANNOUNCE_H_
+#endif // D_BT_ANNOUNCE_H
diff --git a/src/BtBitfieldMessage.h b/src/BtBitfieldMessage.h
index 7b526de0..a1c2122c 100644
--- a/src/BtBitfieldMessage.h
+++ b/src/BtBitfieldMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_BITFIELD_MESSAGE_H_
-#define _D_BT_BITFIELD_MESSAGE_H_
+#ifndef D_BT_BITFIELD_MESSAGE_H
+#define D_BT_BITFIELD_MESSAGE_H
 
 #include "SimpleBtMessage.h"
 
@@ -78,4 +78,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_BITFIELD_MESSAGE_H_
+#endif // D_BT_BITFIELD_MESSAGE_H
diff --git a/src/BtBitfieldMessageValidator.h b/src/BtBitfieldMessageValidator.h
index 63099e65..7754b807 100644
--- a/src/BtBitfieldMessageValidator.h
+++ b/src/BtBitfieldMessageValidator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_BITFIELD_MESSAGE_VALIDATOR_H_
-#define _D_BT_BITFIELD_MESSAGE_VALIDATOR_H_
+#ifndef D_BT_BITFIELD_MESSAGE_VALIDATOR_H
+#define D_BT_BITFIELD_MESSAGE_VALIDATOR_H
 
 #include "BtMessageValidator.h"
 #include "BtBitfieldMessage.h"
@@ -63,4 +63,4 @@ typedef SharedHandle<BtBitfieldMessageValidator> BtBitfieldMessageValidatorHandl
 
 } // namespace aria2
 
-#endif // _D_BT_BITFIELD_MESSAGE_VALIDATOR_H_
+#endif // D_BT_BITFIELD_MESSAGE_VALIDATOR_H
diff --git a/src/BtCancelMessage.h b/src/BtCancelMessage.h
index 08d48f34..1bd0dcb4 100644
--- a/src/BtCancelMessage.h
+++ b/src/BtCancelMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_CANCEL_MESSAGE_H_
-#define _D_BT_CANCEL_MESSAGE_H_
+#ifndef D_BT_CANCEL_MESSAGE_H
+#define D_BT_CANCEL_MESSAGE_H
 
 #include "RangeBtMessage.h"
 
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_CANCEL_MESSAGE_H_
+#endif // D_BT_CANCEL_MESSAGE_H
diff --git a/src/BtCancelSendingPieceEvent.h b/src/BtCancelSendingPieceEvent.h
index 260bb723..4c637bec 100644
--- a/src/BtCancelSendingPieceEvent.h
+++ b/src/BtCancelSendingPieceEvent.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_CANCEL_SENDING_PIECE_EVENT_H_
-#define _D_BT_CANCEL_SENDING_PIECE_EVENT_H_
+#ifndef D_BT_CANCEL_SENDING_PIECE_EVENT_H
+#define D_BT_CANCEL_SENDING_PIECE_EVENT_H
 
 #include "common.h"
 
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_CANCEL_SENDING_PIECE_EVENT_H_
+#endif // D_BT_CANCEL_SENDING_PIECE_EVENT_H
diff --git a/src/BtCheckIntegrityEntry.h b/src/BtCheckIntegrityEntry.h
index fb5d1829..b77ab5e5 100644
--- a/src/BtCheckIntegrityEntry.h
+++ b/src/BtCheckIntegrityEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_CHECK_INTEGRITY_ENTRY_H_
-#define _D_BT_CHECK_INTEGRITY_ENTRY_H_
+#ifndef D_BT_CHECK_INTEGRITY_ENTRY_H
+#define D_BT_CHECK_INTEGRITY_ENTRY_H
 
 #include "PieceHashCheckIntegrityEntry.h"
 
@@ -56,4 +56,4 @@ typedef SharedHandle<BtCheckIntegrityEntry> BtCheckIntegrityEntryHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_FILE_ALLOCATION_ENTRY_H_
+#endif // D_BT_FILE_ALLOCATION_ENTRY_H
diff --git a/src/BtChokeMessage.h b/src/BtChokeMessage.h
index 9bacf4c4..a4e78a09 100644
--- a/src/BtChokeMessage.h
+++ b/src/BtChokeMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_CHOKE_MESSAGE_H_
-#define _D_BT_CHOKE_MESSAGE_H_
+#ifndef D_BT_CHOKE_MESSAGE_H
+#define D_BT_CHOKE_MESSAGE_H
 
 #include "ZeroBtMessage.h"
 
@@ -63,4 +63,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CHOKE_MESSAGE_H_
+#endif // D_CHOKE_MESSAGE_H
diff --git a/src/BtChokingEvent.h b/src/BtChokingEvent.h
index daa50bea..91a9360e 100644
--- a/src/BtChokingEvent.h
+++ b/src/BtChokingEvent.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_CHOKING_EVENT_H_
-#define _D_BT_CHOKING_EVENT_H_
+#ifndef D_BT_CHOKING_EVENT_H
+#define D_BT_CHOKING_EVENT_H
 
 #include "common.h"
 
@@ -43,4 +43,4 @@ class BtChokingEvent {};
 
 } // namespace aria2
 
-#endif // _D_BT_CHOKING_EVENT_H_
+#endif // D_BT_CHOKING_EVENT_H
diff --git a/src/BtConstants.h b/src/BtConstants.h
index c9cea675..c4661765 100644
--- a/src/BtConstants.h
+++ b/src/BtConstants.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_CONSTANTS_
-#define _D_BT_CONSTANTS_
+#ifndef D_BT_CONSTANTS_H
+#define D_BT_CONSTANTS_H
 
 #include "common.h"
 #include <map>
@@ -68,4 +68,4 @@ typedef std::map<std::string, uint8_t> Extensions;
 
 #define COMPACT_LEN_IPV6 18
 
-#endif // _D_BT_CONSTANTS_
+#endif // D_BT_CONSTANTS_H
diff --git a/src/BtDependency.h b/src/BtDependency.h
index 98d61670..47eab55b 100644
--- a/src/BtDependency.h
+++ b/src/BtDependency.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_DEPENDENCY_H_
-#define _D_BT_DEPENDENCY_H_
+#ifndef D_BT_DEPENDENCY_H
+#define D_BT_DEPENDENCY_H
 
 #include "Dependency.h"
 
@@ -62,4 +62,4 @@ typedef SharedHandle<BtDependency> BtDependencyHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_DEPENDENCY_H_
+#endif // D_BT_DEPENDENCY_H
diff --git a/src/BtExtendedMessage.h b/src/BtExtendedMessage.h
index 62cb7fc1..f3009bdc 100644
--- a/src/BtExtendedMessage.h
+++ b/src/BtExtendedMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_EXTENDED_MESSAGE_H_
-#define _D_BT_EXTENDED_MESSAGE_H_
+#ifndef D_BT_EXTENDED_MESSAGE_H
+#define D_BT_EXTENDED_MESSAGE_H
 #include "SimpleBtMessage.h"
 
 namespace aria2 {
@@ -83,4 +83,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_EXTENDED_MESSAGE_H_
+#endif // D_BT_EXTENDED_MESSAGE_H
diff --git a/src/BtFileAllocationEntry.h b/src/BtFileAllocationEntry.h
index 252036f4..f4e098fb 100644
--- a/src/BtFileAllocationEntry.h
+++ b/src/BtFileAllocationEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_FILE_ALLOCATION_ENTRY_H_
-#define _D_BT_FILE_ALLOCATION_ENTRY_H_
+#ifndef D_BT_FILE_ALLOCATION_ENTRY_H
+#define D_BT_FILE_ALLOCATION_ENTRY_H
 
 #include "FileAllocationEntry.h"
 
@@ -53,4 +53,4 @@ typedef SharedHandle<BtFileAllocationEntry> BtFileAllocationEntryHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_FILE_ALLOCATION_ENTRY_H_
+#endif // D_BT_FILE_ALLOCATION_ENTRY_H
diff --git a/src/BtHandshakeMessage.h b/src/BtHandshakeMessage.h
index 4be27629..c5437908 100644
--- a/src/BtHandshakeMessage.h
+++ b/src/BtHandshakeMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_HANDSHAKE_MESSAGE_H_
-#define _D_BT_HANDSHAKE_MESSAGE_H_
+#ifndef D_BT_HANDSHAKE_MESSAGE_H
+#define D_BT_HANDSHAKE_MESSAGE_H
 
 #include "SimpleBtMessage.h"
 
@@ -124,4 +124,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HANDSHAKE_MESSAGE_H_
+#endif // D_HANDSHAKE_MESSAGE_H
diff --git a/src/BtHandshakeMessageValidator.h b/src/BtHandshakeMessageValidator.h
index 49aef027..931f567e 100644
--- a/src/BtHandshakeMessageValidator.h
+++ b/src/BtHandshakeMessageValidator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H_
-#define _D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H_
+#ifndef D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H
+#define D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H
 
 #include "BtMessageValidator.h"
 
@@ -84,4 +84,4 @@ typedef SharedHandle<BtHandshakeMessageValidator> BtHandshakeMessageValidatorHan
 
 } // namespace aria2
 
-#endif // _D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H_
+#endif // D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H
diff --git a/src/BtHaveAllMessage.h b/src/BtHaveAllMessage.h
index 55cb9733..ad3d6cad 100644
--- a/src/BtHaveAllMessage.h
+++ b/src/BtHaveAllMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_HAVE_ALL_MESSAGE_H_
-#define _D_BT_HAVE_ALL_MESSAGE_H_
+#ifndef D_BT_HAVE_ALL_MESSAGE_H
+#define D_BT_HAVE_ALL_MESSAGE_H
 
 #include "ZeroBtMessage.h"
 
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_HAVE_ALL_MESSAGE_H_
+#endif // D_BT_HAVE_ALL_MESSAGE_H
diff --git a/src/BtHaveMessage.h b/src/BtHaveMessage.h
index bb170d57..a16a38ab 100644
--- a/src/BtHaveMessage.h
+++ b/src/BtHaveMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_HAVE_MESSAGE_H_
-#define _D_BT_HAVE_MESSAGE_H_
+#ifndef D_BT_HAVE_MESSAGE_H
+#define D_BT_HAVE_MESSAGE_H
 
 #include "IndexBtMessage.h"
 
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_HAVE_MESSAGE_H_
+#endif // D_BT_HAVE_MESSAGE_H
diff --git a/src/BtHaveNoneMessage.h b/src/BtHaveNoneMessage.h
index dfd998cc..45982ebb 100644
--- a/src/BtHaveNoneMessage.h
+++ b/src/BtHaveNoneMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_HAVE_NONE_MESSAGE_H_
-#define _D_BT_HAVE_NONE_MESSAGE_H_
+#ifndef D_BT_HAVE_NONE_MESSAGE_H
+#define D_BT_HAVE_NONE_MESSAGE_H
 
 #include "ZeroBtMessage.h"
 
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_HAVE_NONE_MESSAGE_H_
+#endif // D_BT_HAVE_NONE_MESSAGE_H
diff --git a/src/BtInteractive.h b/src/BtInteractive.h
index 7a4cea57..3f901e6c 100644
--- a/src/BtInteractive.h
+++ b/src/BtInteractive.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_INTERACTIVE_H_
-#define _D_BT_INTERACTIVE_H_
+#ifndef D_BT_INTERACTIVE_H
+#define D_BT_INTERACTIVE_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -73,4 +73,4 @@ typedef SharedHandle<BtInteractive> BtInteractiveHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_INTERACTIVE_H_
+#endif // D_BT_INTERACTIVE_H
diff --git a/src/BtInterestedMessage.h b/src/BtInterestedMessage.h
index af31d74f..65e161ee 100644
--- a/src/BtInterestedMessage.h
+++ b/src/BtInterestedMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_INTERESTED_MESSAGE_H_
-#define _D_BT_INTERESTED_MESSAGE_H_
+#ifndef D_BT_INTERESTED_MESSAGE_H
+#define D_BT_INTERESTED_MESSAGE_H
 
 #include "ZeroBtMessage.h"
 
@@ -68,4 +68,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_INTERESTED_MESSAGE_H_
+#endif // D_BT_INTERESTED_MESSAGE_H
diff --git a/src/BtKeepAliveMessage.h b/src/BtKeepAliveMessage.h
index ee1875b1..7b540b36 100644
--- a/src/BtKeepAliveMessage.h
+++ b/src/BtKeepAliveMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_KEEP_ALIVE_MESSAGE_H_
-#define _D_BT_KEEP_ALIVE_MESSAGE_H_
+#ifndef D_BT_KEEP_ALIVE_MESSAGE_H
+#define D_BT_KEEP_ALIVE_MESSAGE_H
 
 #include "SimpleBtMessage.h"
 
@@ -67,4 +67,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_KEEP_ALIVE_MESSAGE_H_
+#endif // D_BT_KEEP_ALIVE_MESSAGE_H
diff --git a/src/BtLeecherStateChoke.h b/src/BtLeecherStateChoke.h
index 8270bf7f..4489b283 100644
--- a/src/BtLeecherStateChoke.h
+++ b/src/BtLeecherStateChoke.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_LEECHER_STATE_CHOKE_H_
-#define _D_BT_LEECHER_STATE_CHOKE_H_
+#ifndef D_BT_LEECHER_STATE_CHOKE_H
+#define D_BT_LEECHER_STATE_CHOKE_H
 
 #include "common.h"
 
@@ -117,4 +117,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_LEECHER_STATE_CHOKE_H_
+#endif // D_BT_LEECHER_STATE_CHOKE_H
diff --git a/src/BtMessage.h b/src/BtMessage.h
index 1c3503fd..418ad885 100644
--- a/src/BtMessage.h
+++ b/src/BtMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_MESSAGE_H_
-#define _D_BT_MESSAGE_H_
+#ifndef D_BT_MESSAGE_H
+#define D_BT_MESSAGE_H
 
 #include "common.h"
 
@@ -88,4 +88,4 @@ typedef SharedHandle<BtMessage> BtMessageHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_MESSAGE_H_
+#endif // D_BT_MESSAGE_H
diff --git a/src/BtMessageDispatcher.h b/src/BtMessageDispatcher.h
index 7d231be0..8f867680 100644
--- a/src/BtMessageDispatcher.h
+++ b/src/BtMessageDispatcher.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_MESSAGE_DISPATCHER_H_
-#define _D_BT_MESSAGE_DISPATCHER_H_
+#ifndef D_BT_MESSAGE_DISPATCHER_H
+#define D_BT_MESSAGE_DISPATCHER_H
 
 #include "common.h"
 
@@ -92,4 +92,4 @@ typedef WeakHandle<BtMessageDispatcher> BtMessageDispatcherWeakHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_MESSAGE_DISPATCHER_H_
+#endif // D_BT_MESSAGE_DISPATCHER_H
diff --git a/src/BtMessageFactory.h b/src/BtMessageFactory.h
index d95243ad..ab3dbc72 100644
--- a/src/BtMessageFactory.h
+++ b/src/BtMessageFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_MESSAGE_FACTORY_H_
-#define _D_BT_MESSAGE_FACTORY_H_
+#ifndef D_BT_MESSAGE_FACTORY_H
+#define D_BT_MESSAGE_FACTORY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -102,4 +102,4 @@ typedef WeakHandle<BtMessageFactory> BtMessageFactoryWeakHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_MESSAGE_FACTORY_H_
+#endif // D_BT_MESSAGE_FACTORY_H
diff --git a/src/BtMessageReceiver.h b/src/BtMessageReceiver.h
index 861c77ef..be281260 100644
--- a/src/BtMessageReceiver.h
+++ b/src/BtMessageReceiver.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_MESSAGE_RECEIVER_H_
-#define _D_BT_MESSAGE_RECEIVER_H_
+#ifndef D_BT_MESSAGE_RECEIVER_H
+#define D_BT_MESSAGE_RECEIVER_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -59,4 +59,4 @@ typedef WeakHandle<BtMessageReceiver> BtMessageReceiverWeakHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_MESSAGE_RECEIVER_H_
+#endif // D_BT_MESSAGE_RECEIVER_H
diff --git a/src/BtMessageValidator.h b/src/BtMessageValidator.h
index e865f627..86882fb1 100644
--- a/src/BtMessageValidator.h
+++ b/src/BtMessageValidator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_MESSAGE_VALIDATOR_H_
-#define _D_BT_MESSAGE_VALIDATOR_H_
+#ifndef D_BT_MESSAGE_VALIDATOR_H
+#define D_BT_MESSAGE_VALIDATOR_H
 
 #include "common.h"
 
@@ -55,4 +55,4 @@ typedef SharedHandle<BtMessageValidator> BtMessageValidatorHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_MESSAGE_VALIDATOR_H_
+#endif // D_BT_MESSAGE_VALIDATOR_H
diff --git a/src/BtNotInterestedMessage.h b/src/BtNotInterestedMessage.h
index 67d64945..57197605 100644
--- a/src/BtNotInterestedMessage.h
+++ b/src/BtNotInterestedMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_NOT_INTERESTED_MESSAGE_H_
-#define _D_BT_NOT_INTERESTED_MESSAGE_H_
+#ifndef D_BT_NOT_INTERESTED_MESSAGE_H
+#define D_BT_NOT_INTERESTED_MESSAGE_H
 
 #include "ZeroBtMessage.h"
 
@@ -68,4 +68,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_NOT_INTERESTED_MESSAGE_H_
+#endif // D_BT_NOT_INTERESTED_MESSAGE_H
diff --git a/src/BtPieceMessage.h b/src/BtPieceMessage.h
index 7f83ae68..f80782dd 100644
--- a/src/BtPieceMessage.h
+++ b/src/BtPieceMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_PIECE_MESSAGE_H_
-#define _D_BT_PIECE_MESSAGE_H_
+#ifndef D_BT_PIECE_MESSAGE_H
+#define D_BT_PIECE_MESSAGE_H
 
 #include "AbstractBtMessage.h"
 
@@ -116,4 +116,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_PIECE_MESSAGE_H_
+#endif // D_BT_PIECE_MESSAGE_H
diff --git a/src/BtPieceMessageValidator.h b/src/BtPieceMessageValidator.h
index 2560b8bd..9935e335 100644
--- a/src/BtPieceMessageValidator.h
+++ b/src/BtPieceMessageValidator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_PIECE_MESSAGE_VALIDATOR_H_
-#define _D_BT_PIECE_MESSAGE_VALIDATOR_H_
+#ifndef D_BT_PIECE_MESSAGE_VALIDATOR_H
+#define D_BT_PIECE_MESSAGE_VALIDATOR_H
 
 #include "BtMessageValidator.h"
 #include "BtPieceMessage.h"
@@ -65,4 +65,4 @@ typedef SharedHandle<BtPieceMessageValidator> BtPieceMessageValidatorHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_PIECE_MESSAGE_VALIDATOR_H_
+#endif // D_BT_PIECE_MESSAGE_VALIDATOR_H
diff --git a/src/BtPortMessage.h b/src/BtPortMessage.h
index e91c2dfd..c2a0991c 100644
--- a/src/BtPortMessage.h
+++ b/src/BtPortMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_PORT_MESSAGE_H_
-#define _D_BT_PORT_MESSAGE_H_
+#ifndef D_BT_PORT_MESSAGE_H
+#define D_BT_PORT_MESSAGE_H
 
 #include "SimpleBtMessage.h"
 
@@ -87,4 +87,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_PORT_MESSAGE_H_
+#endif // D_BT_PORT_MESSAGE_H
diff --git a/src/BtPostDownloadHandler.h b/src/BtPostDownloadHandler.h
index c767da28..7ff75520 100644
--- a/src/BtPostDownloadHandler.h
+++ b/src/BtPostDownloadHandler.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_POST_DOWNLOAD_HANDLER_H_
-#define _D_BT_POST_DOWNLOAD_HANDLER_H_
+#ifndef D_BT_POST_DOWNLOAD_HANDLER_H
+#define D_BT_POST_DOWNLOAD_HANDLER_H
 
 #include "PostDownloadHandler.h"
 
@@ -53,4 +53,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_POST_DOWNLOAD_HANDLER_H_
+#endif // D_BT_POST_DOWNLOAD_HANDLER_H
diff --git a/src/BtProgressInfoFile.h b/src/BtProgressInfoFile.h
index 9c51c7f4..82ba0561 100644
--- a/src/BtProgressInfoFile.h
+++ b/src/BtProgressInfoFile.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_PROGRESS_INFO_FILE_H_
-#define _D_BT_PROGRESS_INFO_FILE_H_
+#ifndef D_BT_PROGRESS_INFO_FILE_H
+#define D_BT_PROGRESS_INFO_FILE_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -63,4 +63,4 @@ typedef SharedHandle<BtProgressInfoFile> BtProgressInfoFileHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_PROGRESS_INFO_FILE_H_
+#endif // D_BT_PROGRESS_INFO_FILE_H
diff --git a/src/BtRegistry.h b/src/BtRegistry.h
index 36e27d53..44fc14a9 100644
--- a/src/BtRegistry.h
+++ b/src/BtRegistry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_REGISTRY_H_
-#define _D_BT_REGISTRY_H_
+#ifndef D_BT_REGISTRY_H
+#define D_BT_REGISTRY_H
 
 #include "common.h"
 
@@ -116,4 +116,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_REGISTRY_H_
+#endif // D_BT_REGISTRY_H
diff --git a/src/BtRejectMessage.h b/src/BtRejectMessage.h
index 3ea72699..df88deff 100644
--- a/src/BtRejectMessage.h
+++ b/src/BtRejectMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_REJECT_MESSAGE_H_
-#define _D_BT_REJECT_MESSAGE_H_
+#ifndef D_BT_REJECT_MESSAGE_H
+#define D_BT_REJECT_MESSAGE_H
 
 #include "RangeBtMessage.h"
 
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_REJECT_MESSAGE_H_
+#endif // D_BT_REJECT_MESSAGE_H
diff --git a/src/BtRequestFactory.h b/src/BtRequestFactory.h
index 51f0df6a..5b9ff3a3 100644
--- a/src/BtRequestFactory.h
+++ b/src/BtRequestFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_REQUEST_FACTORY_H_
-#define _D_BT_REQUEST_FACTORY_H_
+#ifndef D_BT_REQUEST_FACTORY_H
+#define D_BT_REQUEST_FACTORY_H
 
 #include "common.h"
 
@@ -92,4 +92,4 @@ typedef WeakHandle<BtRequestFactory> BtRequestFactoryWeakHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_REQUEST_FACTORY_H_
+#endif // D_BT_REQUEST_FACTORY_H
diff --git a/src/BtRequestMessage.h b/src/BtRequestMessage.h
index c74f4d29..ef74ca5f 100644
--- a/src/BtRequestMessage.h
+++ b/src/BtRequestMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_REQUEST_MESSAGE_H_
-#define _D_BT_REQUEST_MESSAGE_H_
+#ifndef D_BT_REQUEST_MESSAGE_H
+#define D_BT_REQUEST_MESSAGE_H
 
 #include "RangeBtMessage.h"
 
@@ -72,4 +72,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_REQUEST_MESSAGE_H_
+#endif // D_BT_REQUEST_MESSAGE_H
diff --git a/src/BtRuntime.h b/src/BtRuntime.h
index 838ab77d..b45aa7e9 100644
--- a/src/BtRuntime.h
+++ b/src/BtRuntime.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_RUNTIME_H_
-#define _D_BT_RUNTIME_H_
+#ifndef D_BT_RUNTIME_H
+#define D_BT_RUNTIME_H
 
 #include "common.h"
 #include "BtConstants.h"
@@ -135,4 +135,4 @@ typedef SharedHandle<BtRuntime> BtRuntimeHandle;
 
 } // namespace aria2
 
-#endif // _D_BT_RUNTIME_H_
+#endif // D_BT_RUNTIME_H
diff --git a/src/BtSeederStateChoke.h b/src/BtSeederStateChoke.h
index 5485fde5..75f1c7c1 100644
--- a/src/BtSeederStateChoke.h
+++ b/src/BtSeederStateChoke.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_SEEDER_STATE_CHOKE_H_
-#define _D_BT_SEEDER_STATE_CHOKE_H_
+#ifndef D_BT_SEEDER_STATE_CHOKE_H
+#define D_BT_SEEDER_STATE_CHOKE_H
 
 #include "common.h"
 
@@ -102,4 +102,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_SEEDER_STATE_CHOKE_H_
+#endif // D_BT_SEEDER_STATE_CHOKE_H
diff --git a/src/BtSetup.h b/src/BtSetup.h
index 42e1ae82..0cbf1306 100644
--- a/src/BtSetup.h
+++ b/src/BtSetup.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_SETUP_H_
-#define _D_BT_SETUP_H_
+#ifndef D_BT_SETUP_H
+#define D_BT_SETUP_H
 
 #include "common.h"
 #include <vector>
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_SETUP_H_
+#endif // D_BT_SETUP_H
diff --git a/src/BtStopDownloadCommand.h b/src/BtStopDownloadCommand.h
index 14f1a48e..e92fc218 100644
--- a/src/BtStopDownloadCommand.h
+++ b/src/BtStopDownloadCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_STOP_DOWNLOAD_COMMAND_H_
-#define _D_BT_STOP_DOWNLOAD_COMMAND_H_
+#ifndef D_BT_STOP_DOWNLOAD_COMMAND_H
+#define D_BT_STOP_DOWNLOAD_COMMAND_H
 
 #include "TimeBasedCommand.h"
 #include "SharedHandle.h"
@@ -81,4 +81,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_STOP_DOWNLOAD_COMMAND_H_
+#endif // D_BT_STOP_DOWNLOAD_COMMAND_H
diff --git a/src/BtSuggestPieceMessage.h b/src/BtSuggestPieceMessage.h
index d464c301..de371309 100644
--- a/src/BtSuggestPieceMessage.h
+++ b/src/BtSuggestPieceMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_SUGGEST_PIECE_MESSAGE_H_
-#define _D_BT_SUGGEST_PIECE_MESSAGE_H_
+#ifndef D_BT_SUGGEST_PIECE_MESSAGE_H
+#define D_BT_SUGGEST_PIECE_MESSAGE_H
 
 #include "IndexBtMessage.h"
 
@@ -61,4 +61,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_SUGGEST_PIECE_MESSAGE_H_
+#endif // D_BT_SUGGEST_PIECE_MESSAGE_H
diff --git a/src/BtUnchokeMessage.h b/src/BtUnchokeMessage.h
index 09014c89..24293de1 100644
--- a/src/BtUnchokeMessage.h
+++ b/src/BtUnchokeMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BT_UNCHOKE_MESSAGE_H_
-#define _D_BT_UNCHOKE_MESSAGE_H_
+#ifndef D_BT_UNCHOKE_MESSAGE_H
+#define D_BT_UNCHOKE_MESSAGE_H
 
 #include "ZeroBtMessage.h"
 
@@ -65,4 +65,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_BT_UNCHOKE_MESSAGE_H_
+#endif // D_BT_UNCHOKE_MESSAGE_H
diff --git a/src/ByteArrayDiskWriter.h b/src/ByteArrayDiskWriter.h
index 760859ec..e049a06e 100644
--- a/src/ByteArrayDiskWriter.h
+++ b/src/ByteArrayDiskWriter.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BYTE_ARRAY_DISK_WRITER_H_
-#define _D_BYTE_ARRAY_DISK_WRITER_H_
+#ifndef D_BYTE_ARRAY_DISK_WRITER_H
+#define D_BYTE_ARRAY_DISK_WRITER_H
 
 #include "DiskWriter.h"
 #include <sstream>
@@ -81,4 +81,4 @@ typedef SharedHandle<ByteArrayDiskWriter> ByteArrayDiskWriterHandle;
 
 } // namespace aria2
 
-#endif // _D_BYTE_ARRAY_DISK_WRITER_H_
+#endif // D_BYTE_ARRAY_DISK_WRITER_H
diff --git a/src/ByteArrayDiskWriterFactory.h b/src/ByteArrayDiskWriterFactory.h
index 882a2d5a..c770e7ac 100644
--- a/src/ByteArrayDiskWriterFactory.h
+++ b/src/ByteArrayDiskWriterFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BYTE_ARRAY_DISK_WRITER_FACTORY_H_
-#define _D_BYTE_ARRAY_DISK_WRITER_FACTORY_H_
+#ifndef D_BYTE_ARRAY_DISK_WRITER_FACTORY_H
+#define D_BYTE_ARRAY_DISK_WRITER_FACTORY_H
 
 #include "DiskWriterFactory.h"
 
@@ -51,4 +51,4 @@ typedef SharedHandle<ByteArrayDiskWriterFactory> ByteArrayDiskWriterFactoryHandl
 
 } // namespace aria2
 
-#endif // _D_BYTE_ARRAY_DISK_WRITER_FACTORY_H_
+#endif // D_BYTE_ARRAY_DISK_WRITER_FACTORY_H
diff --git a/src/CUIDCounter.h b/src/CUIDCounter.h
index 1e628a06..f18a38a1 100644
--- a/src/CUIDCounter.h
+++ b/src/CUIDCounter.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CUID_COUNTER_H_
-#define _D_CUID_COUNTER_H_
+#ifndef D_CUID_COUNTER_H
+#define D_CUID_COUNTER_H
 
 #include "common.h"
 #include "Command.h"
@@ -59,4 +59,4 @@ public:
 
 }
 
-#endif // _D_CUID_COUNTER_H_
+#endif // D_CUID_COUNTER_H
diff --git a/src/CheckIntegrityCommand.h b/src/CheckIntegrityCommand.h
index 96f44e32..6dce2ce2 100644
--- a/src/CheckIntegrityCommand.h
+++ b/src/CheckIntegrityCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHECK_INTEGRITY_COMMAND_H_
-#define _D_CHECK_INTEGRITY_COMMAND_H_
+#ifndef D_CHECK_INTEGRITY_COMMAND_H
+#define D_CHECK_INTEGRITY_COMMAND_H
 
 #include "RealtimeCommand.h"
 #include "SharedHandle.h"
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CHECK_INTEGRITY_COMMAND_H_
+#endif // D_CHECK_INTEGRITY_COMMAND_H
diff --git a/src/CheckIntegrityDispatcherCommand.h b/src/CheckIntegrityDispatcherCommand.h
index a1c79e50..b491909c 100644
--- a/src/CheckIntegrityDispatcherCommand.h
+++ b/src/CheckIntegrityDispatcherCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHECK_INTEGRITY_DISPATCHER_COMMAND_H_
-#define _D_CHECK_INTEGRITY_DISPATCHER_COMMAND_H_
+#ifndef D_CHECK_INTEGRITY_DISPATCHER_COMMAND_H
+#define D_CHECK_INTEGRITY_DISPATCHER_COMMAND_H
 
 #include "SequentialDispatcherCommand.h"
 #include "CheckIntegrityMan.h"
@@ -56,4 +56,4 @@ protected:
 
 } // namespace aria2
 
-#endif // _D_CHECK_INTEGRITY_DISPATCHER_COMMAND_H_
+#endif // D_CHECK_INTEGRITY_DISPATCHER_COMMAND_H
diff --git a/src/CheckIntegrityEntry.h b/src/CheckIntegrityEntry.h
index 9bd1595d..a2fb7da7 100644
--- a/src/CheckIntegrityEntry.h
+++ b/src/CheckIntegrityEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHECK_INTEGRITY_ENTRY_H_
-#define _D_CHECK_INTEGRITY_ENTRY_H_
+#ifndef D_CHECK_INTEGRITY_ENTRY_H
+#define D_CHECK_INTEGRITY_ENTRY_H
 
 #include "RequestGroupEntry.h"
 #include "ProgressAwareEntry.h"
@@ -84,4 +84,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CHECK_INTEGRITY_ENTRY_H_
+#endif // D_CHECK_INTEGRITY_ENTRY_H
diff --git a/src/CheckIntegrityMan.h b/src/CheckIntegrityMan.h
index ceeba211..2ea3b097 100644
--- a/src/CheckIntegrityMan.h
+++ b/src/CheckIntegrityMan.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHECK_INTEGRITY_MAN_H_
-#define _D_CHECK_INTEGRITY_MAN_H_
+#ifndef D_CHECK_INTEGRITY_MAN_H
+#define D_CHECK_INTEGRITY_MAN_H
 
 #include "common.h"
 #include "SequentialPicker.h"
@@ -46,4 +46,4 @@ typedef SequentialPicker<CheckIntegrityEntry> CheckIntegrityMan;
 
 } // namespace aria2
 
-#endif // _D_CHECK_INTEGRITY_MAN_H_
+#endif // D_CHECK_INTEGRITY_MAN_H
diff --git a/src/Checksum.h b/src/Checksum.h
index 38f9c628..cb754ca4 100644
--- a/src/Checksum.h
+++ b/src/Checksum.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHECKSUM_H_
-#define _D_CHECKSUM_H_
+#ifndef D_CHECKSUM_H
+#define D_CHECKSUM_H
 
 #include "common.h"
 
@@ -79,4 +79,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CHECKSUM_H_
+#endif // D_CHECKSUM_H
diff --git a/src/ChecksumCheckIntegrityEntry.h b/src/ChecksumCheckIntegrityEntry.h
index 892ab8c5..cb1fcbe0 100644
--- a/src/ChecksumCheckIntegrityEntry.h
+++ b/src/ChecksumCheckIntegrityEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHECKSUM_CHECK_INTEGRITY_ENTRY_H_
-#define _D_CHECKSUM_CHECK_INTEGRITY_ENTRY_H_
+#ifndef D_CHECKSUM_CHECK_INTEGRITY_ENTRY_H
+#define D_CHECKSUM_CHECK_INTEGRITY_ENTRY_H
 
 #include "CheckIntegrityEntry.h"
 
@@ -66,4 +66,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CHECKSUM_CHECK_INTEGRITY_ENTRY_H_
+#endif // D_CHECKSUM_CHECK_INTEGRITY_ENTRY_H
diff --git a/src/ChunkChecksum.h b/src/ChunkChecksum.h
index 38d4b846..86d3d9bb 100644
--- a/src/ChunkChecksum.h
+++ b/src/ChunkChecksum.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CHUNK_CHECKSUM_H_
-#define _D_CHUNK_CHECKSUM_H_
+#ifndef D_CHUNK_CHECKSUM_H
+#define D_CHUNK_CHECKSUM_H
 
 #include "common.h"
 
@@ -122,4 +122,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CHUNK_CHECKSUM_H_
+#endif // D_CHUNK_CHECKSUM_H
diff --git a/src/Command.h b/src/Command.h
index 2ac67beb..46406db0 100644
--- a/src/Command.h
+++ b/src/Command.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_COMMAND_H_
-#define _D_COMMAND_H_
+#ifndef D_COMMAND_H
+#define D_COMMAND_H
 
 #include "common.h"
 #include <stdint.h>
@@ -125,4 +125,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_COMMAND_H_
+#endif // D_COMMAND_H
diff --git a/src/ConsoleStatCalc.h b/src/ConsoleStatCalc.h
index 6ffc9634..ddb32b0f 100644
--- a/src/ConsoleStatCalc.h
+++ b/src/ConsoleStatCalc.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CONSOLE_STAT_CALC_H_
-#define _D_CONSOLE_STAT_CALC_H_
+#ifndef D_CONSOLE_STAT_CALC_H
+#define D_CONSOLE_STAT_CALC_H
 
 #include "StatCalc.h"
 #include "TimerA2.h"
@@ -91,4 +91,4 @@ typedef SharedHandle<ConsoleStatCalc> ConsoleStatCalcHandle;
 
 } // namespace aria2
 
-#endif // _D_CONSOLE_STAT_CALC_H_
+#endif // D_CONSOLE_STAT_CALC_H
diff --git a/src/ContentTypeRequestGroupCriteria.h b/src/ContentTypeRequestGroupCriteria.h
index 43dbb73c..1c8c7c41 100644
--- a/src/ContentTypeRequestGroupCriteria.h
+++ b/src/ContentTypeRequestGroupCriteria.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CONTENT_TYPE_REQUEST_GROUP_CRITERIA_H_
-#define _D_CONTENT_TYPE_REQUEST_GROUP_CRITERIA_H_
+#ifndef D_CONTENT_TYPE_REQUEST_GROUP_CRITERIA_H
+#define D_CONTENT_TYPE_REQUEST_GROUP_CRITERIA_H
 
 #include "RequestGroupCriteria.h"
 #include <string>
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_CONTENT_TYPE_REQUEST_GROUP_CRITERIA_H_
+#endif // D_CONTENT_TYPE_REQUEST_GROUP_CRITERIA_H
diff --git a/src/CookieStorage.h b/src/CookieStorage.h
index 5d7da6f4..ad2add92 100644
--- a/src/CookieStorage.h
+++ b/src/CookieStorage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_COOKIE_STORAGE_H_
-#define _D_COOKIE_STORAGE_H_
+#ifndef D_COOKIE_STORAGE_H
+#define D_COOKIE_STORAGE_H
 
 #include "common.h"
 
@@ -191,4 +191,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_COOKIE_STORAGE_H_
+#endif // D_COOKIE_STORAGE_H
diff --git a/src/CreateRequestCommand.h b/src/CreateRequestCommand.h
index 54e01275..5248e1c7 100644
--- a/src/CreateRequestCommand.h
+++ b/src/CreateRequestCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CREATE_REQUEST_COMMAND_H_
-#define _D_CREATE_REQUEST_COMMAND_H_
+#ifndef D_CREATE_REQUEST_COMMAND_H
+#define D_CREATE_REQUEST_COMMAND_H
 
 #include "AbstractCommand.h"
 
@@ -50,4 +50,4 @@ protected:
 
 } // namespace aria2
 
-#endif // _D_CREATE_REQUEST_COMMAND_H_
+#endif // D_CREATE_REQUEST_COMMAND_H
diff --git a/src/DHKeyExchange.h b/src/DHKeyExchange.h
index dde43f0b..fbabc7af 100644
--- a/src/DHKeyExchange.h
+++ b/src/DHKeyExchange.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DH_KEY_EXCHANGE_H_
-#define _D_DH_KEY_EXCHANGE_H_
+#ifndef D_DH_KEY_EXCHANGE_H
+#define D_DH_KEY_EXCHANGE_H
 
 #include "common.h"
 #ifdef HAVE_LIBGCRYPT
@@ -42,4 +42,4 @@
 # include "LibsslDHKeyExchange.h"
 #endif // HAVE_LIBSSL
 
-#endif // _D_DH_KEY_EXCHANGE_H_
+#endif // D_DH_KEY_EXCHANGE_H
diff --git a/src/DHTAbstractMessage.h b/src/DHTAbstractMessage.h
index 85fd91e8..46c2d9d9 100644
--- a/src/DHTAbstractMessage.h
+++ b/src/DHTAbstractMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ABSTRACT_MESSAGE_H_
-#define _D_DHT_ABSTRACT_MESSAGE_H_
+#ifndef D_DHT_ABSTRACT_MESSAGE_H
+#define D_DHT_ABSTRACT_MESSAGE_H
 
 #include "DHTMessage.h"
 #include "A2STR.h"
@@ -101,4 +101,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ABSTRACT_MESSAGE_H_
+#endif // D_DHT_ABSTRACT_MESSAGE_H
diff --git a/src/DHTAbstractNodeLookupTask.h b/src/DHTAbstractNodeLookupTask.h
index f48666f7..869e0597 100644
--- a/src/DHTAbstractNodeLookupTask.h
+++ b/src/DHTAbstractNodeLookupTask.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ABSTRACT_NODE_LOOKUP_TASK_H_
-#define _D_DHT_ABSTRACT_NODE_LOOKUP_TASK_H_
+#ifndef D_DHT_ABSTRACT_NODE_LOOKUP_TASK_H
+#define D_DHT_ABSTRACT_NODE_LOOKUP_TASK_H
 
 #include "DHTAbstractTask.h"
 
@@ -234,4 +234,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ABSTRACT_NODE_LOOKUP_TASK_H_
+#endif // D_DHT_ABSTRACT_NODE_LOOKUP_TASK_H
diff --git a/src/DHTAbstractTask.h b/src/DHTAbstractTask.h
index 55a6225b..880fa985 100644
--- a/src/DHTAbstractTask.h
+++ b/src/DHTAbstractTask.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ABSTRACT_TASK_H_
-#define _D_DHT_ABSTRACT_TASK_H_
+#ifndef D_DHT_ABSTRACT_TASK_H
+#define D_DHT_ABSTRACT_TASK_H
 
 #include "DHTTask.h"
 #include "SharedHandle.h"
@@ -118,4 +118,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ABSTRACT_TASK_H_
+#endif // D_DHT_ABSTRACT_TASK_H
diff --git a/src/DHTAnnouncePeerMessage.h b/src/DHTAnnouncePeerMessage.h
index 493106ec..082a31a2 100644
--- a/src/DHTAnnouncePeerMessage.h
+++ b/src/DHTAnnouncePeerMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ANNOUNCE_PEER_MESSAGE_H_
-#define _D_DHT_ANNOUNCE_PEER_MESSAGE_H_
+#ifndef D_DHT_ANNOUNCE_PEER_MESSAGE_H
+#define D_DHT_ANNOUNCE_PEER_MESSAGE_H
 
 #include "DHTQueryMessage.h"
 #include "DHTConstants.h"
@@ -105,4 +105,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ANNOUNCE_PEER_MESSAGE_H_
+#endif // D_DHT_ANNOUNCE_PEER_MESSAGE_H
diff --git a/src/DHTAnnouncePeerReplyMessage.h b/src/DHTAnnouncePeerReplyMessage.h
index b6e4be7c..0faaae20 100644
--- a/src/DHTAnnouncePeerReplyMessage.h
+++ b/src/DHTAnnouncePeerReplyMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ANNOUNCE_PEER_REPLY_MESSAGE_H_
-#define _D_DHT_ANNOUNCE_PEER_REPLY_MESSAGE_H_
+#ifndef D_DHT_ANNOUNCE_PEER_REPLY_MESSAGE_H
+#define D_DHT_ANNOUNCE_PEER_REPLY_MESSAGE_H
 
 #include "DHTResponseMessage.h"
 
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ANNOUNCE_PEER_REPLY_MESSAGE_H_
+#endif // D_DHT_ANNOUNCE_PEER_REPLY_MESSAGE_H
diff --git a/src/DHTAutoSaveCommand.h b/src/DHTAutoSaveCommand.h
index 1a14e90e..c17f1e47 100644
--- a/src/DHTAutoSaveCommand.h
+++ b/src/DHTAutoSaveCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_AUTO_SAVE_COMMAND_H_
-#define _D_DHT_AUTO_SAVE_COMMAND_H_
+#ifndef D_DHT_AUTO_SAVE_COMMAND_H
+#define D_DHT_AUTO_SAVE_COMMAND_H
 
 #include "TimeBasedCommand.h"
 #include "SharedHandle.h"
@@ -70,4 +70,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_AUTO_SAVE_COMMAND_H_
+#endif // D_DHT_AUTO_SAVE_COMMAND_H
diff --git a/src/DHTBucket.h b/src/DHTBucket.h
index 709722d5..9d71a251 100644
--- a/src/DHTBucket.h
+++ b/src/DHTBucket.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_BUCKET_H_
-#define _D_DHT_BUCKET_H_
+#ifndef D_DHT_BUCKET_H
+#define D_DHT_BUCKET_H
 
 #include "common.h"
 
@@ -157,4 +157,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_BUCKET_H_
+#endif // D_DHT_BUCKET_H
diff --git a/src/DHTBucketRefreshCommand.h b/src/DHTBucketRefreshCommand.h
index 34711475..88d48fa4 100644
--- a/src/DHTBucketRefreshCommand.h
+++ b/src/DHTBucketRefreshCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_BUCKET_REFRESH_COMMAND_H_
-#define _D_DHT_BUCKET_REFRESH_COMMAND_H_
+#ifndef D_DHT_BUCKET_REFRESH_COMMAND_H
+#define D_DHT_BUCKET_REFRESH_COMMAND_H
 
 #include "TimeBasedCommand.h"
 #include "SharedHandle.h"
@@ -69,4 +69,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_BUCKET_REFRESH_COMMAND_H_
+#endif // D_DHT_BUCKET_REFRESH_COMMAND_H
diff --git a/src/DHTBucketRefreshTask.h b/src/DHTBucketRefreshTask.h
index fbd73153..06bf6507 100644
--- a/src/DHTBucketRefreshTask.h
+++ b/src/DHTBucketRefreshTask.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_BUCKET_REFRESH_TASK_H_
-#define _D_DHT_BUCKET_REFRESH_TASK_H_
+#ifndef D_DHT_BUCKET_REFRESH_TASK_H
+#define D_DHT_BUCKET_REFRESH_TASK_H
 
 #include "DHTAbstractTask.h"
 
@@ -55,4 +55,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_BUCKET_REFRESH_TASK_H_
+#endif // D_DHT_BUCKET_REFRESH_TASK_H
diff --git a/src/DHTConnection.h b/src/DHTConnection.h
index 5dac2a61..e269794d 100644
--- a/src/DHTConnection.h
+++ b/src/DHTConnection.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_CONNECTION_H_
-#define _D_DHT_CONNECTION_H_
+#ifndef D_DHT_CONNECTION_H
+#define D_DHT_CONNECTION_H
 
 #include "common.h"
 #include <string>
@@ -53,4 +53,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_CONNECTION_H_
+#endif // D_DHT_CONNECTION_H
diff --git a/src/DHTConnectionImpl.h b/src/DHTConnectionImpl.h
index 7f0808fa..a7c0b1f6 100644
--- a/src/DHTConnectionImpl.h
+++ b/src/DHTConnectionImpl.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_CONNECTION_IMPL_H_
-#define _D_DHT_CONNECTION_IMPL_H_
+#ifndef D_DHT_CONNECTION_IMPL_H
+#define D_DHT_CONNECTION_IMPL_H
 
 #include "DHTConnection.h"
 #include "SharedHandle.h"
@@ -90,4 +90,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_CONNECTION_IMPL_H_
+#endif // D_DHT_CONNECTION_IMPL_H
diff --git a/src/DHTConstants.h b/src/DHTConstants.h
index 8469e7ca..5239640c 100644
--- a/src/DHTConstants.h
+++ b/src/DHTConstants.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_CONSTANTS_H_
-#define _D_DHT_CONSTANTS_H_
+#ifndef D_DHT_CONSTANTS_H
+#define D_DHT_CONSTANTS_H
 
 // Increment this if major improvements or bug fixes are made in DHT
 // code. This is 2 bytes unsigned integer.
@@ -62,4 +62,4 @@
 
 #define DHT_TOKEN_UPDATE_INTERVAL (10*60)
 
-#endif // _D_DHT_CONSTANTS_H_
+#endif // D_DHT_CONSTANTS_H
diff --git a/src/DHTEntryPointNameResolveCommand.h b/src/DHTEntryPointNameResolveCommand.h
index 4e228d46..40a260e1 100644
--- a/src/DHTEntryPointNameResolveCommand.h
+++ b/src/DHTEntryPointNameResolveCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ENTRY_POINT_NAME_RESOVE_COMMAND_H_
-#define _D_DHT_ENTRY_POINT_NAME_RESOVE_COMMAND_H_
+#ifndef D_DHT_ENTRY_POINT_NAME_RESOVE_COMMAND_H
+#define D_DHT_ENTRY_POINT_NAME_RESOVE_COMMAND_H
 
 #include "Command.h"
 
@@ -109,4 +109,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ENTRY_POINT_NAME_RESOVE_COMMAND_H_
+#endif // D_DHT_ENTRY_POINT_NAME_RESOVE_COMMAND_H
diff --git a/src/DHTFindNodeMessage.h b/src/DHTFindNodeMessage.h
index 7f3c24ae..f6458fb5 100644
--- a/src/DHTFindNodeMessage.h
+++ b/src/DHTFindNodeMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_FIND_NODE_MESSAGE_H_
-#define _D_DHT_FIND_NODE_MESSAGE_H_
+#ifndef D_DHT_FIND_NODE_MESSAGE_H
+#define D_DHT_FIND_NODE_MESSAGE_H
 
 #include "DHTQueryMessage.h"
 #include "DHTConstants.h"
@@ -72,4 +72,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_FIND_NODE_MESSAGE_H_
+#endif // D_DHT_FIND_NODE_MESSAGE_H
diff --git a/src/DHTFindNodeReplyMessage.h b/src/DHTFindNodeReplyMessage.h
index 15f1dd5d..1fabdf62 100644
--- a/src/DHTFindNodeReplyMessage.h
+++ b/src/DHTFindNodeReplyMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_FIND_NODE_REPLY_MESSAGE_H_
-#define _D_DHT_FIND_NODE_REPLY_MESSAGE_H_
+#ifndef D_DHT_FIND_NODE_REPLY_MESSAGE_H
+#define D_DHT_FIND_NODE_REPLY_MESSAGE_H
 
 #include "DHTResponseMessage.h"
 #include <vector>
@@ -80,4 +80,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_FIND_NODE_REPLY_MESSAGE_H_
+#endif // D_DHT_FIND_NODE_REPLY_MESSAGE_H
diff --git a/src/DHTGetPeersCommand.h b/src/DHTGetPeersCommand.h
index 7b0795b5..252d6d8c 100644
--- a/src/DHTGetPeersCommand.h
+++ b/src/DHTGetPeersCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_GET_PEERS_COMMAND_H_
-#define _D_DHT_GET_PEERS_COMMAND_H_
+#ifndef D_DHT_GET_PEERS_COMMAND_H
+#define D_DHT_GET_PEERS_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -94,4 +94,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_GET_PEERS_COMMAND_H_
+#endif // D_DHT_GET_PEERS_COMMAND_H
diff --git a/src/DHTGetPeersMessage.h b/src/DHTGetPeersMessage.h
index 3b3d25e4..0969d511 100644
--- a/src/DHTGetPeersMessage.h
+++ b/src/DHTGetPeersMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_GET_PEERS_MESSAGE_H_
-#define _D_DHT_GET_PEERS_MESSAGE_H_
+#ifndef D_DHT_GET_PEERS_MESSAGE_H
+#define D_DHT_GET_PEERS_MESSAGE_H
 
 #include "DHTQueryMessage.h"
 #include "DHTConstants.h"
@@ -85,4 +85,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_GET_PEERS_MESSAGE_H_
+#endif // D_DHT_GET_PEERS_MESSAGE_H
diff --git a/src/DHTGetPeersReplyMessage.h b/src/DHTGetPeersReplyMessage.h
index 8494a2d7..845d5a19 100644
--- a/src/DHTGetPeersReplyMessage.h
+++ b/src/DHTGetPeersReplyMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_GET_PEERS_REPLY_MESSAGE_H_
-#define _D_DHT_GET_PEERS_REPLY_MESSAGE_H_
+#ifndef D_DHT_GET_PEERS_REPLY_MESSAGE_H
+#define D_DHT_GET_PEERS_REPLY_MESSAGE_H
 
 #include "DHTResponseMessage.h"
 
@@ -112,4 +112,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_GET_PEERS_REPLY_MESSAGE_H_
+#endif // D_DHT_GET_PEERS_REPLY_MESSAGE_H
diff --git a/src/DHTIDCloser.h b/src/DHTIDCloser.h
index 18bb2c1f..3db3f01e 100644
--- a/src/DHTIDCloser.h
+++ b/src/DHTIDCloser.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ID_CLOSER_H_
-#define _D_DHT_ID_CLOSER_H_
+#ifndef D_DHT_ID_CLOSER_H
+#define D_DHT_ID_CLOSER_H
 
 #include "common.h"
 #include "DHTNodeLookupEntry.h"
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ID_CLOSER_H_
+#endif // D_DHT_ID_CLOSER_H
diff --git a/src/DHTInteractionCommand.h b/src/DHTInteractionCommand.h
index 9845a5e3..f00df78a 100644
--- a/src/DHTInteractionCommand.h
+++ b/src/DHTInteractionCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_INTERACTION_COMMAND_H_
-#define _D_DHT_INTERACTION_COMMAND_H_
+#ifndef D_DHT_INTERACTION_COMMAND_H
+#define D_DHT_INTERACTION_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -73,4 +73,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_INTERACTION_COMMAND_H_
+#endif // D_DHT_INTERACTION_COMMAND_H
diff --git a/src/DHTMessage.h b/src/DHTMessage.h
index 34d38e11..fec06250 100644
--- a/src/DHTMessage.h
+++ b/src/DHTMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_MESSAGE_H_
-#define _D_DHT_MESSAGE_H_
+#ifndef D_DHT_MESSAGE_H
+#define D_DHT_MESSAGE_H
 
 #include "common.h"
 
@@ -112,4 +112,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_MESSAGE_H_
+#endif // D_DHT_MESSAGE_H
diff --git a/src/DHTMessageCallback.h b/src/DHTMessageCallback.h
index 6a2f8cb4..3f59eaa4 100644
--- a/src/DHTMessageCallback.h
+++ b/src/DHTMessageCallback.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_MESSAGE_CALLBACK_H_
-#define _D_DHT_MESSAGE_CALLBACK_H_
+#ifndef D_DHT_MESSAGE_CALLBACK_H
+#define D_DHT_MESSAGE_CALLBACK_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -69,4 +69,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_MESSAGE_CALLBACK_H_
+#endif // D_DHT_MESSAGE_CALLBACK_H
diff --git a/src/DHTMessageDispatcher.h b/src/DHTMessageDispatcher.h
index 69260db5..7f7a64e2 100644
--- a/src/DHTMessageDispatcher.h
+++ b/src/DHTMessageDispatcher.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_MESSAGE_DISPATCHER_H_
-#define _D_DHT_MESSAGE_DISPATCHER_H_
+#ifndef D_DHT_MESSAGE_DISPATCHER_H
+#define D_DHT_MESSAGE_DISPATCHER_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -66,4 +66,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_MESSAGE_DISPATCHER_H_
+#endif // D_DHT_MESSAGE_DISPATCHER_H
diff --git a/src/DHTMessageDispatcherImpl.h b/src/DHTMessageDispatcherImpl.h
index c306e7cc..953ce7e6 100644
--- a/src/DHTMessageDispatcherImpl.h
+++ b/src/DHTMessageDispatcherImpl.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_MESSAGE_DISPATCHER_IMPL_H_
-#define _D_DHT_MESSAGE_DISPATCHER_IMPL_H_
+#ifndef D_DHT_MESSAGE_DISPATCHER_IMPL_H
+#define D_DHT_MESSAGE_DISPATCHER_IMPL_H
 
 #include "DHTMessageDispatcher.h"
 #include <deque>
@@ -83,4 +83,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_MESSAGE_DISPATCHER_IMPL_H_
+#endif // D_DHT_MESSAGE_DISPATCHER_IMPL_H
diff --git a/src/DHTMessageEntry.h b/src/DHTMessageEntry.h
index 84e87d91..92c71064 100644
--- a/src/DHTMessageEntry.h
+++ b/src/DHTMessageEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_MESSAGE_ENTRY_H_
-#define _D_DHT_MESSAGE_ENTRY_H_
+#ifndef D_DHT_MESSAGE_ENTRY_H
+#define D_DHT_MESSAGE_ENTRY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -58,4 +58,4 @@ struct DHTMessageEntry {
 
 } // namespace aria2
 
-#endif // _D_DHT_MESSAGE_ENTRY_H_
+#endif // D_DHT_MESSAGE_ENTRY_H
diff --git a/src/DHTMessageFactory.h b/src/DHTMessageFactory.h
index f363150f..40e9c852 100644
--- a/src/DHTMessageFactory.h
+++ b/src/DHTMessageFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_MESSAGE_FACTORY_H_
-#define _D_DHT_MESSAGE_FACTORY_H_
+#ifndef D_DHT_MESSAGE_FACTORY_H
+#define D_DHT_MESSAGE_FACTORY_H
 
 #include "common.h"
 
@@ -116,4 +116,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_MESSAGE_FACTORY_H_
+#endif // D_DHT_MESSAGE_FACTORY_H
diff --git a/src/DHTMessageFactoryImpl.h b/src/DHTMessageFactoryImpl.h
index f3e06895..52025338 100644
--- a/src/DHTMessageFactoryImpl.h
+++ b/src/DHTMessageFactoryImpl.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_MESSAGE_FACTORY_IMPL_H_
-#define _D_DHT_MESSAGE_FACTORY_IMPL_H_
+#ifndef D_DHT_MESSAGE_FACTORY_IMPL_H
+#define D_DHT_MESSAGE_FACTORY_IMPL_H
 
 #include "DHTMessageFactory.h"
 #include "A2STR.h"
@@ -171,4 +171,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_MESSAGE_FACTORY_IMPL_H_
+#endif // D_DHT_MESSAGE_FACTORY_IMPL_H
diff --git a/src/DHTMessageReceiver.h b/src/DHTMessageReceiver.h
index 67f8a7a0..33935cf1 100644
--- a/src/DHTMessageReceiver.h
+++ b/src/DHTMessageReceiver.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_MESSAGE_RECEIVER_H_
-#define _D_DHT_MESSAGE_RECEIVER_H_
+#ifndef D_DHT_MESSAGE_RECEIVER_H
+#define D_DHT_MESSAGE_RECEIVER_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -93,4 +93,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_MESSAGE_RECEIVER_H_
+#endif // D_DHT_MESSAGE_RECEIVER_H
diff --git a/src/DHTMessageTracker.h b/src/DHTMessageTracker.h
index ac20ea39..4b674661 100644
--- a/src/DHTMessageTracker.h
+++ b/src/DHTMessageTracker.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_MESSAGE_TRACKER_H_
-#define _D_DHT_MESSAGE_TRACKER_H_
+#ifndef D_DHT_MESSAGE_TRACKER_H
+#define D_DHT_MESSAGE_TRACKER_H
 
 #include "common.h"
 
@@ -93,4 +93,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_MESSAGE_TRACKER_H_
+#endif // D_DHT_MESSAGE_TRACKER_H
diff --git a/src/DHTMessageTrackerEntry.h b/src/DHTMessageTrackerEntry.h
index 41123acd..70989715 100644
--- a/src/DHTMessageTrackerEntry.h
+++ b/src/DHTMessageTrackerEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_MESSAGE_TRACKER_ENTRY_H_
-#define _D_DHT_MESSAGE_TRACKER_ENTRY_H_
+#ifndef D_DHT_MESSAGE_TRACKER_ENTRY_H
+#define D_DHT_MESSAGE_TRACKER_ENTRY_H
 
 #include "common.h"
 
@@ -98,4 +98,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_MESSAGE_TRACKER_ENTRY_H_
+#endif // D_DHT_MESSAGE_TRACKER_ENTRY_H
diff --git a/src/DHTNode.h b/src/DHTNode.h
index 06d90e4a..425697f2 100644
--- a/src/DHTNode.h
+++ b/src/DHTNode.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_NODE_H_
-#define _D_DHT_NODE_H_
+#ifndef D_DHT_NODE_H
+#define D_DHT_NODE_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -122,4 +122,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_NODE_H_
+#endif // D_DHT_NODE_H
diff --git a/src/DHTNodeLookupEntry.h b/src/DHTNodeLookupEntry.h
index d53e0f0f..6a6016ae 100644
--- a/src/DHTNodeLookupEntry.h
+++ b/src/DHTNodeLookupEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_NODE_LOOKUP_ENTRY_H_
-#define _D_DHT_NODE_LOOKUP_ENTRY_H_
+#ifndef D_DHT_NODE_LOOKUP_ENTRY_H
+#define D_DHT_NODE_LOOKUP_ENTRY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -56,4 +56,4 @@ struct DHTNodeLookupEntry {
 
 } // namespace aria2;
 
-#endif // _D_DHT_NODE_LOOKUP_ENTRY_H_
+#endif // D_DHT_NODE_LOOKUP_ENTRY_H
diff --git a/src/DHTNodeLookupTask.h b/src/DHTNodeLookupTask.h
index 270ec6b2..b60b2715 100644
--- a/src/DHTNodeLookupTask.h
+++ b/src/DHTNodeLookupTask.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_NODE_LOOKUP_TASK_H_
-#define _D_DHT_NODE_LOOKUP_TASK_H_
+#ifndef D_DHT_NODE_LOOKUP_TASK_H
+#define D_DHT_NODE_LOOKUP_TASK_H
 
 #include "DHTAbstractNodeLookupTask.h"
 
@@ -58,4 +58,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_NODE_LOOKUP_TASK_H_
+#endif // D_DHT_NODE_LOOKUP_TASK_H
diff --git a/src/DHTNodeLookupTaskCallback.h b/src/DHTNodeLookupTaskCallback.h
index 7a7f3e08..33d3a3d1 100644
--- a/src/DHTNodeLookupTaskCallback.h
+++ b/src/DHTNodeLookupTaskCallback.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_NODE_LOOKUP_TASK_CALLBACK_H_
-#define _D_DHT_NODE_LOOKUP_TASK_CALLBACK_H_
+#ifndef D_DHT_NODE_LOOKUP_TASK_CALLBACK_H
+#define D_DHT_NODE_LOOKUP_TASK_CALLBACK_H
 
 #include "DHTMessageCallback.h"
 
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_NODE_LOOKUP_TASK_CALLBACK_H_
+#endif // D_DHT_NODE_LOOKUP_TASK_CALLBACK_H
diff --git a/src/DHTPeerAnnounceCommand.h b/src/DHTPeerAnnounceCommand.h
index d03773f8..4e313cf5 100644
--- a/src/DHTPeerAnnounceCommand.h
+++ b/src/DHTPeerAnnounceCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_PEER_ANNOUNCE_COMMAND_H_
-#define _D_DHT_PEER_ANNOUNCE_COMMAND_H_
+#ifndef D_DHT_PEER_ANNOUNCE_COMMAND_H
+#define D_DHT_PEER_ANNOUNCE_COMMAND_H
 
 #include "TimeBasedCommand.h"
 #include "SharedHandle.h"
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_PEER_ANNOUNCE_COMMAND_H_
+#endif // D_DHT_PEER_ANNOUNCE_COMMAND_H
diff --git a/src/DHTPeerAnnounceEntry.h b/src/DHTPeerAnnounceEntry.h
index 9a12b552..bf03ea72 100644
--- a/src/DHTPeerAnnounceEntry.h
+++ b/src/DHTPeerAnnounceEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_PEER_ANNOUNCE_ENTRY_H_
-#define _D_DHT_PEER_ANNOUNCE_ENTRY_H_
+#ifndef D_DHT_PEER_ANNOUNCE_ENTRY_H
+#define D_DHT_PEER_ANNOUNCE_ENTRY_H
 
 #include "common.h"
 
@@ -93,4 +93,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_PEER_ANNOUNCE_ENTRY_H_
+#endif // D_DHT_PEER_ANNOUNCE_ENTRY_H
diff --git a/src/DHTPeerAnnounceStorage.h b/src/DHTPeerAnnounceStorage.h
index da829933..7928b520 100644
--- a/src/DHTPeerAnnounceStorage.h
+++ b/src/DHTPeerAnnounceStorage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_PEER_ANNOUNCE_STORAGE_H_
-#define _D_DHT_PEER_ANNOUNCE_STORAGE_H_
+#ifndef D_DHT_PEER_ANNOUNCE_STORAGE_H
+#define D_DHT_PEER_ANNOUNCE_STORAGE_H
 
 #include "common.h"
 
@@ -90,4 +90,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_PEER_ANNOUNCE_STORAGE_H_
+#endif // D_DHT_PEER_ANNOUNCE_STORAGE_H
diff --git a/src/DHTPeerLookupTask.h b/src/DHTPeerLookupTask.h
index 3b5d365f..088fa72c 100644
--- a/src/DHTPeerLookupTask.h
+++ b/src/DHTPeerLookupTask.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_PEER_LOOKUP_TASK_H_
-#define _D_DHT_PEER_LOOKUP_TASK_H_
+#ifndef D_DHT_PEER_LOOKUP_TASK_H
+#define D_DHT_PEER_LOOKUP_TASK_H
 
 #include "DHTAbstractNodeLookupTask.h"
 #include <map>
@@ -84,4 +84,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_PEER_LOOKUP_TASK_H_
+#endif // D_DHT_PEER_LOOKUP_TASK_H
diff --git a/src/DHTPeerLookupTaskCallback.h b/src/DHTPeerLookupTaskCallback.h
index 6926ca14..efdc1f14 100644
--- a/src/DHTPeerLookupTaskCallback.h
+++ b/src/DHTPeerLookupTaskCallback.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_PEER_LOOKUP_TASK_CALLBACK_H_
-#define _D_DHT_PEER_LOOKUP_TASK_CALLBACK_H_
+#ifndef D_DHT_PEER_LOOKUP_TASK_CALLBACK_H
+#define D_DHT_PEER_LOOKUP_TASK_CALLBACK_H
 
 #include "DHTMessageCallback.h"
 
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_PEER_LOOKUP_TASK_CALLBACK_H_
+#endif // D_DHT_PEER_LOOKUP_TASK_CALLBACK_H
diff --git a/src/DHTPingMessage.h b/src/DHTPingMessage.h
index 93e00a09..fc265c23 100644
--- a/src/DHTPingMessage.h
+++ b/src/DHTPingMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_PING_MESSAGE_H_
-#define _D_DHT_PING_MESSAGE_H_
+#ifndef D_DHT_PING_MESSAGE_H
+#define D_DHT_PING_MESSAGE_H
 
 #include "DHTQueryMessage.h"
 #include "A2STR.h"
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_PING_MESSAGE_H_
+#endif // D_DHT_PING_MESSAGE_H
diff --git a/src/DHTPingReplyMessage.h b/src/DHTPingReplyMessage.h
index 2d1b0ab8..25771906 100644
--- a/src/DHTPingReplyMessage.h
+++ b/src/DHTPingReplyMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_PING_REPLY_MESSAGE_H_
-#define _D_DHT_PING_REPLY_MESSAGE_H_
+#ifndef D_DHT_PING_REPLY_MESSAGE_H
+#define D_DHT_PING_REPLY_MESSAGE_H
 
 #include "DHTResponseMessage.h"
 #include "DHTConstants.h"
@@ -69,4 +69,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_PING_REPLY_MESSAGE_H_
+#endif // D_DHT_PING_REPLY_MESSAGE_H
diff --git a/src/DHTPingReplyMessageCallback.h b/src/DHTPingReplyMessageCallback.h
index 1781a0b6..1743713b 100644
--- a/src/DHTPingReplyMessageCallback.h
+++ b/src/DHTPingReplyMessageCallback.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_PING_REPLY_MESSAGE_CALLBACK_H_
-#define _D_DHT_PING_REPLY_MESSAGE_CALLBACK_H_
+#ifndef D_DHT_PING_REPLY_MESSAGE_CALLBACK_H
+#define D_DHT_PING_REPLY_MESSAGE_CALLBACK_H
 
 #include "DHTMessageCallback.h"
 #include "DHTAnnouncePeerReplyMessage.h"
@@ -78,4 +78,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_PING_REPLY_MESSAGE_CALLBACK_H_
+#endif // D_DHT_PING_REPLY_MESSAGE_CALLBACK_H
diff --git a/src/DHTPingTask.h b/src/DHTPingTask.h
index 5a940495..584d74ba 100644
--- a/src/DHTPingTask.h
+++ b/src/DHTPingTask.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_PING_TASK_H_
-#define _D_DHT_PING_TASK_H_
+#ifndef D_DHT_PING_TASK_H
+#define D_DHT_PING_TASK_H
 
 #include "DHTAbstractTask.h"
 #include "a2time.h"
@@ -76,4 +76,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_PING_TASK_H_
+#endif // D_DHT_PING_TASK_H
diff --git a/src/DHTQueryMessage.h b/src/DHTQueryMessage.h
index 8a65e834..ff7a74e9 100644
--- a/src/DHTQueryMessage.h
+++ b/src/DHTQueryMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_QUERY_MESSAGE_H_
-#define _D_DHT_QUERY_MESSAGE_H_
+#ifndef D_DHT_QUERY_MESSAGE_H
+#define D_DHT_QUERY_MESSAGE_H
 
 #include "DHTAbstractMessage.h"
 #include "A2STR.h"
@@ -68,4 +68,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_QUERY_MESSAGE_H_
+#endif // D_DHT_QUERY_MESSAGE_H
diff --git a/src/DHTRegistry.h b/src/DHTRegistry.h
index d3c13417..df79d28d 100644
--- a/src/DHTRegistry.h
+++ b/src/DHTRegistry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_REGISTRY_H_
-#define _D_DHT_REGISTRY_H_
+#ifndef D_DHT_REGISTRY_H
+#define D_DHT_REGISTRY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -130,4 +130,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_REGISTRY_H_
+#endif // D_DHT_REGISTRY_H
diff --git a/src/DHTReplaceNodeTask.h b/src/DHTReplaceNodeTask.h
index d21c5dc0..b4f943c3 100644
--- a/src/DHTReplaceNodeTask.h
+++ b/src/DHTReplaceNodeTask.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_REPLACE_NODE_TASK_H_
-#define _D_DHT_REPLACE_NODE_TASK_H_
+#ifndef D_DHT_REPLACE_NODE_TASK_H
+#define D_DHT_REPLACE_NODE_TASK_H
 
 #include "DHTAbstractTask.h"
 #include "a2time.h"
@@ -76,4 +76,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_REPLACE_NODE_TASK_H_
+#endif // D_DHT_REPLACE_NODE_TASK_H
diff --git a/src/DHTResponseMessage.h b/src/DHTResponseMessage.h
index 1300236c..6e7e6dc5 100644
--- a/src/DHTResponseMessage.h
+++ b/src/DHTResponseMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_RESPONSE_MESSAGE_H_
-#define _D_DHT_RESPONSE_MESSAGE_H_
+#ifndef D_DHT_RESPONSE_MESSAGE_H
+#define D_DHT_RESPONSE_MESSAGE_H
 
 #include "DHTAbstractMessage.h"
 #include "A2STR.h"
@@ -70,4 +70,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_RESPONSE_MESSAGE_H_
+#endif // D_DHT_RESPONSE_MESSAGE_H
diff --git a/src/DHTRoutingTable.h b/src/DHTRoutingTable.h
index 91405761..a604d862 100644
--- a/src/DHTRoutingTable.h
+++ b/src/DHTRoutingTable.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ROUTING_TABLE_H_
-#define _D_DHT_ROUTING_TABLE_H_
+#ifndef D_DHT_ROUTING_TABLE_H
+#define D_DHT_ROUTING_TABLE_H
 
 #include "common.h"
 
@@ -103,4 +103,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ROUTING_TABLE_H_
+#endif // D_DHT_ROUTING_TABLE_H
diff --git a/src/DHTRoutingTableDeserializer.h b/src/DHTRoutingTableDeserializer.h
index bd83fca4..a64b573e 100644
--- a/src/DHTRoutingTableDeserializer.h
+++ b/src/DHTRoutingTableDeserializer.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ROUTING_TABLE_DESERIALIZER_H_
-#define _D_DHT_ROUTING_TABLE_DESERIALIZER_H_
+#ifndef D_DHT_ROUTING_TABLE_DESERIALIZER_H
+#define D_DHT_ROUTING_TABLE_DESERIALIZER_H
 
 #include "common.h"
 
@@ -81,4 +81,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ROUTING_TABLE_DESERIALIZER_H_
+#endif // D_DHT_ROUTING_TABLE_DESERIALIZER_H
diff --git a/src/DHTRoutingTableSerializer.h b/src/DHTRoutingTableSerializer.h
index b2660518..dca22be8 100644
--- a/src/DHTRoutingTableSerializer.h
+++ b/src/DHTRoutingTableSerializer.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_ROUTING_TABLE_SERIALIZER_H_
-#define _D_DHT_ROUTING_TABLE_SERIALIZER_H_
+#ifndef D_DHT_ROUTING_TABLE_SERIALIZER_H
+#define D_DHT_ROUTING_TABLE_SERIALIZER_H
 
 #include "common.h"
 
@@ -67,4 +67,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_ROUTING_TABLE_SERIALIZER_H_
+#endif // D_DHT_ROUTING_TABLE_SERIALIZER_H
diff --git a/src/DHTSetup.h b/src/DHTSetup.h
index 08d5cdd7..40a031c2 100644
--- a/src/DHTSetup.h
+++ b/src/DHTSetup.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_SETUP_H_
-#define _D_DHT_SETUP_H_
+#ifndef D_DHT_SETUP_H
+#define D_DHT_SETUP_H
 
 #include "common.h"
 #include <vector>
@@ -56,4 +56,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_SETUP_H_
+#endif // D_DHT_SETUP_H
diff --git a/src/DHTTask.h b/src/DHTTask.h
index b5c13283..2bf02a21 100644
--- a/src/DHTTask.h
+++ b/src/DHTTask.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_TASK_H_
-#define _D_DHT_TASK_H_
+#ifndef D_DHT_TASK_H
+#define D_DHT_TASK_H
 
 #include "common.h"
 
@@ -50,4 +50,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_TASK_H_
+#endif // D_DHT_TASK_H
diff --git a/src/DHTTaskFactory.h b/src/DHTTaskFactory.h
index 9fdd2503..3e953b76 100644
--- a/src/DHTTaskFactory.h
+++ b/src/DHTTaskFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_TASK_FACTORY_H_
-#define _D_DHT_TASK_FACTORY_H_
+#ifndef D_DHT_TASK_FACTORY_H
+#define D_DHT_TASK_FACTORY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -75,4 +75,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_TASK_FACTORY_H_
+#endif // D_DHT_TASK_FACTORY_H
diff --git a/src/DHTTaskFactoryImpl.h b/src/DHTTaskFactoryImpl.h
index 5bf38b55..679dca27 100644
--- a/src/DHTTaskFactoryImpl.h
+++ b/src/DHTTaskFactoryImpl.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_TASK_FACTORY_IMPL_H_
-#define _D_DHT_TASK_FACTORY_IMPL_H_
+#ifndef D_DHT_TASK_FACTORY_IMPL_H
+#define D_DHT_TASK_FACTORY_IMPL_H
 
 #include "DHTTaskFactory.h"
 #include "a2time.h"
@@ -109,4 +109,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_TASK_FACTORY_IMPL_H_
+#endif // D_DHT_TASK_FACTORY_IMPL_H
diff --git a/src/DHTTaskQueue.h b/src/DHTTaskQueue.h
index 81aa07c3..c7596aeb 100644
--- a/src/DHTTaskQueue.h
+++ b/src/DHTTaskQueue.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_TASK_QUEUE_H_
-#define _D_DHT_TASK_QUEUE_H_
+#ifndef D_DHT_TASK_QUEUE_H
+#define D_DHT_TASK_QUEUE_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_TASK_QUEUE_H_
+#endif // D_DHT_TASK_QUEUE_H
diff --git a/src/DHTTaskQueueImpl.h b/src/DHTTaskQueueImpl.h
index d0ec0e95..c293bff0 100644
--- a/src/DHTTaskQueueImpl.h
+++ b/src/DHTTaskQueueImpl.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_TASK_QUEUE_IMPL_H_
-#define _D_DHT_TASK_QUEUE_IMPL_H_
+#ifndef D_DHT_TASK_QUEUE_IMPL_H
+#define D_DHT_TASK_QUEUE_IMPL_H
 
 #include "DHTTaskQueue.h"
 #include "DHTTaskExecutor.h"
@@ -67,4 +67,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_TASK_QUEUE_IMPL_H_
+#endif // D_DHT_TASK_QUEUE_IMPL_H
diff --git a/src/DHTTokenTracker.h b/src/DHTTokenTracker.h
index d0d835d6..63513cb3 100644
--- a/src/DHTTokenTracker.h
+++ b/src/DHTTokenTracker.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_TOKEN_TRACKER_H_
-#define _D_DHT_TOKEN_TRACKER_H_
+#ifndef D_DHT_TOKEN_TRACKER_H
+#define D_DHT_TOKEN_TRACKER_H
 
 #include "common.h"
 #include <string>
@@ -69,4 +69,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_TOKEN_TRACKER_H_
+#endif // D_DHT_TOKEN_TRACKER_H
diff --git a/src/DHTTokenUpdateCommand.h b/src/DHTTokenUpdateCommand.h
index 3f1a7a58..ecb6d8af 100644
--- a/src/DHTTokenUpdateCommand.h
+++ b/src/DHTTokenUpdateCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_TOKEN_UPDATE_COMMAND_H_
-#define _D_DHT_TOKEN_UPDATE_COMMAND_H_
+#ifndef D_DHT_TOKEN_UPDATE_COMMAND_H
+#define D_DHT_TOKEN_UPDATE_COMMAND_H
 
 #include "TimeBasedCommand.h"
 #include "SharedHandle.h"
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_TOKEN_UPDATE_COMMAND_H_
+#endif // D_DHT_TOKEN_UPDATE_COMMAND_H
diff --git a/src/DHTUnknownMessage.h b/src/DHTUnknownMessage.h
index b1a11c64..683fa19b 100644
--- a/src/DHTUnknownMessage.h
+++ b/src/DHTUnknownMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_UNKNOWN_MESSAGE_H_
-#define _D_DHT_UNKNOWN_MESSAGE_H_
+#ifndef D_DHT_UNKNOWN_MESSAGE_H
+#define D_DHT_UNKNOWN_MESSAGE_H
 
 #include "DHTMessage.h"
 
@@ -75,4 +75,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_UNKNOWN_MESSAGE_H_
+#endif // D_DHT_UNKNOWN_MESSAGE_H
diff --git a/src/DNSCache.h b/src/DNSCache.h
index fc242f59..64b1e4a1 100644
--- a/src/DNSCache.h
+++ b/src/DNSCache.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DNS_CACHE_H_
-#define _D_DNS_CACHE_H_
+#ifndef D_DNS_CACHE_H
+#define D_DNS_CACHE_H
 
 #include "common.h"
 
@@ -207,4 +207,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DNS_CACHE_H_
+#endif // D_DNS_CACHE_H
diff --git a/src/Decoder.h b/src/Decoder.h
index 92a7aedd..e3308b80 100644
--- a/src/Decoder.h
+++ b/src/Decoder.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DECODER_H_
-#define _D_DECODER_H_
+#ifndef D_DECODER_H
+#define D_DECODER_H
 
 #include "common.h"
 #include <string>
@@ -61,4 +61,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DECODER_H_
+#endif // D_DECODER_H
diff --git a/src/DefaultAuthResolver.h b/src/DefaultAuthResolver.h
index 9501cd4c..ad61b820 100644
--- a/src/DefaultAuthResolver.h
+++ b/src/DefaultAuthResolver.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_AUTH_RESOLVER_H_
-#define _D_DEFAULT_AUTH_RESOLVER_H_
+#ifndef D_DEFAULT_AUTH_RESOLVER_H
+#define D_DEFAULT_AUTH_RESOLVER_H
 
 #include "AbstractAuthResolver.h"
 
@@ -49,4 +49,4 @@ typedef SharedHandle<DefaultAuthResolver> DefaultAuthResolverHandle;
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_AUTH_RESOLVER_H_
+#endif // D_DEFAULT_AUTH_RESOLVER_H
diff --git a/src/DefaultBtAnnounce.h b/src/DefaultBtAnnounce.h
index 42d58600..027dfad8 100644
--- a/src/DefaultBtAnnounce.h
+++ b/src/DefaultBtAnnounce.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_BT_ANNOUNCE_H_
-#define _D_DEFAULT_BT_ANNOUNCE_H_
+#ifndef D_DEFAULT_BT_ANNOUNCE_H
+#define D_DEFAULT_BT_ANNOUNCE_H
 
 #include "BtAnnounce.h"
 #include "TimerA2.h"
@@ -158,4 +158,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_BT_ANNOUNCE_H_
+#endif // D_DEFAULT_BT_ANNOUNCE_H
diff --git a/src/DefaultBtInteractive.h b/src/DefaultBtInteractive.h
index b8635f9b..ef3ff147 100644
--- a/src/DefaultBtInteractive.h
+++ b/src/DefaultBtInteractive.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_BT_INTERACTIVE_H_
-#define _D_DEFAULT_BT_INTERACTIVE_H_
+#ifndef D_DEFAULT_BT_INTERACTIVE_H
+#define D_DEFAULT_BT_INTERACTIVE_H
 
 #include "BtInteractive.h"
 
@@ -263,4 +263,4 @@ typedef SharedHandle<DefaultBtInteractive> DefaultBtInteractiveHandle;
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_BT_INTERACTIVE_H_
+#endif // D_DEFAULT_BT_INTERACTIVE_H
diff --git a/src/DefaultBtMessageDispatcher.h b/src/DefaultBtMessageDispatcher.h
index 3df8df13..bab99e2a 100644
--- a/src/DefaultBtMessageDispatcher.h
+++ b/src/DefaultBtMessageDispatcher.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_BT_MESSAGE_DISPATCHER_H_
-#define _D_DEFAULT_BT_MESSAGE_DISPATCHER_H_
+#ifndef D_DEFAULT_BT_MESSAGE_DISPATCHER_H
+#define D_DEFAULT_BT_MESSAGE_DISPATCHER_H
 
 #include "BtMessageDispatcher.h"
 
@@ -148,4 +148,4 @@ typedef SharedHandle<DefaultBtMessageDispatcher> DefaultBtMessageDispatcherHandl
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_BT_MESSAGE_DISPATCHER_H_
+#endif // D_DEFAULT_BT_MESSAGE_DISPATCHER_H
diff --git a/src/DefaultBtMessageFactory.h b/src/DefaultBtMessageFactory.h
index c0f3def9..b869ed5e 100644
--- a/src/DefaultBtMessageFactory.h
+++ b/src/DefaultBtMessageFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_BT_MESSAGE_FACTORY_H_
-#define _D_DEFAULT_BT_MESSAGE_FACTORY_H_
+#ifndef D_DEFAULT_BT_MESSAGE_FACTORY_H
+#define D_DEFAULT_BT_MESSAGE_FACTORY_H
 
 #include "BtMessageFactory.h"
 #include "Command.h"
@@ -180,4 +180,4 @@ typedef SharedHandle<DefaultBtMessageFactory> DefaultBtMessageFactoryHandle;
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_BT_MESSAGE_FACTORY_H_
+#endif // D_DEFAULT_BT_MESSAGE_FACTORY_H
diff --git a/src/DefaultBtMessageReceiver.h b/src/DefaultBtMessageReceiver.h
index beffd358..fc0cb096 100644
--- a/src/DefaultBtMessageReceiver.h
+++ b/src/DefaultBtMessageReceiver.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_BT_MESSAGE_RECEIVER_H_
-#define _D_DEFAULT_BT_MESSAGE_RECEIVER_H_
+#ifndef D_DEFAULT_BT_MESSAGE_RECEIVER_H
+#define D_DEFAULT_BT_MESSAGE_RECEIVER_H
 
 #include "BtMessageReceiver.h"
 #include "Command.h"
@@ -79,4 +79,4 @@ typedef SharedHandle<DefaultBtMessageReceiver> DefaultBtMessageReceiverHandle;
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_BT_MESSAGE_RECEIVER_H_
+#endif // D_DEFAULT_BT_MESSAGE_RECEIVER_H
diff --git a/src/DefaultBtProgressInfoFile.h b/src/DefaultBtProgressInfoFile.h
index 8ec62b3f..12aedb85 100644
--- a/src/DefaultBtProgressInfoFile.h
+++ b/src/DefaultBtProgressInfoFile.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_BT_PROGRESS_INFO_FILE_H_
-#define _D_DEFAULT_BT_PROGRESS_INFO_FILE_H_
+#ifndef D_DEFAULT_BT_PROGRESS_INFO_FILE_H
+#define D_DEFAULT_BT_PROGRESS_INFO_FILE_H
 
 #include "BtProgressInfoFile.h"
 
@@ -98,4 +98,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_BT_PROGRESS_INFO_FILE_H_
+#endif // D_DEFAULT_BT_PROGRESS_INFO_FILE_H
diff --git a/src/DefaultBtRequestFactory.h b/src/DefaultBtRequestFactory.h
index 43c68f16..0977e952 100644
--- a/src/DefaultBtRequestFactory.h
+++ b/src/DefaultBtRequestFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_BT_REQUEST_FACTORY_H_
-#define _D_DEFAULT_BT_REQUEST_FACTORY_H_
+#ifndef D_DEFAULT_BT_REQUEST_FACTORY_H
+#define D_DEFAULT_BT_REQUEST_FACTORY_H
 
 #include "BtRequestFactory.h"
 
@@ -106,4 +106,4 @@ typedef SharedHandle<DefaultBtRequestFactory> DefaultBtRequestFactoryHandle;
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_BT_REQUEST_FACTORY_H_
+#endif // D_DEFAULT_BT_REQUEST_FACTORY_H
diff --git a/src/DefaultDiskWriter.h b/src/DefaultDiskWriter.h
index bf12f48d..339e0edd 100644
--- a/src/DefaultDiskWriter.h
+++ b/src/DefaultDiskWriter.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_DISK_WRITER_H_
-#define _D_DEFAULT_DISK_WRITER_H_
+#ifndef D_DEFAULT_DISK_WRITER_H
+#define D_DEFAULT_DISK_WRITER_H
 
 #include "AbstractDiskWriter.h"
 
@@ -52,4 +52,4 @@ typedef SharedHandle<DefaultDiskWriter> DefaultDiskWriterHandle;
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_DISK_WRITER_H_
+#endif // D_DEFAULT_DISK_WRITER_H
diff --git a/src/DefaultDiskWriterFactory.h b/src/DefaultDiskWriterFactory.h
index 929f5224..2dbf0539 100644
--- a/src/DefaultDiskWriterFactory.h
+++ b/src/DefaultDiskWriterFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_DISK_WRITER_FACTORY_H_
-#define _D_DEFAULT_DISK_WRITER_FACTORY_H_
+#ifndef D_DEFAULT_DISK_WRITER_FACTORY_H
+#define D_DEFAULT_DISK_WRITER_FACTORY_H
 
 #include "DiskWriterFactory.h"
 
@@ -51,4 +51,4 @@ typedef SharedHandle<DefaultDiskWriterFactory> DefaultDiskWriterFactoryHandle;
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_DISK_WRITER_FACTORY_H_
+#endif // D_DEFAULT_DISK_WRITER_FACTORY_H
diff --git a/src/DefaultExtensionMessageFactory.h b/src/DefaultExtensionMessageFactory.h
index c79a2a26..786614ab 100644
--- a/src/DefaultExtensionMessageFactory.h
+++ b/src/DefaultExtensionMessageFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_EXTENSION_MESSAGE_FACTORY_H_
-#define _D_DEFAULT_EXTENSION_MESSAGE_FACTORY_H_
+#ifndef D_DEFAULT_EXTENSION_MESSAGE_FACTORY_H
+#define D_DEFAULT_EXTENSION_MESSAGE_FACTORY_H
 
 #include "ExtensionMessageFactory.h"
 
@@ -114,4 +114,4 @@ typedef SharedHandle<DefaultExtensionMessageFactory> DefaultExtensionMessageFact
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_EXTENSION_MESSAGE_FACTORY_H_
+#endif // D_DEFAULT_EXTENSION_MESSAGE_FACTORY_H
diff --git a/src/DefaultPeerStorage.h b/src/DefaultPeerStorage.h
index 0b8a34e1..fc62c58a 100644
--- a/src/DefaultPeerStorage.h
+++ b/src/DefaultPeerStorage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_PEER_STORAGE_H_
-#define _D_DEFAULT_PEER_STORAGE_H_
+#ifndef D_DEFAULT_PEER_STORAGE_H
+#define D_DEFAULT_PEER_STORAGE_H
 
 #include "PeerStorage.h"
 
@@ -119,4 +119,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_PEER_STORAGE_H_
+#endif // D_DEFAULT_PEER_STORAGE_H
diff --git a/src/DefaultPieceStorage.h b/src/DefaultPieceStorage.h
index 1dd78993..bde118a3 100644
--- a/src/DefaultPieceStorage.h
+++ b/src/DefaultPieceStorage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEFAULT_PIECE_STORAGE_H_
-#define _D_DEFAULT_PIECE_STORAGE_H_
+#ifndef D_DEFAULT_PIECE_STORAGE_H
+#define D_DEFAULT_PIECE_STORAGE_H
 
 #include "PieceStorage.h"
 
@@ -286,4 +286,4 @@ typedef SharedHandle<DefaultPieceStorage> DefaultPieceStorageHandle;
 
 } // namespace aria2
 
-#endif // _D_DEFAULT_PIECE_STORAGE_H_
+#endif // D_DEFAULT_PIECE_STORAGE_H
diff --git a/src/Dependency.h b/src/Dependency.h
index acfb3d73..e8d6b828 100644
--- a/src/Dependency.h
+++ b/src/Dependency.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DEPENDENCY_H_
-#define _D_DEPENDENCY_H_
+#ifndef D_DEPENDENCY_H
+#define D_DEPENDENCY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -51,4 +51,4 @@ typedef SharedHandle<Dependency> DependencyHandle;
 
 } // namespace aria2
 
-#endif // _D_DEPENDENCY_H_
+#endif // D_DEPENDENCY_H
diff --git a/src/DirectDiskAdaptor.h b/src/DirectDiskAdaptor.h
index 28ba7bd3..959cfdc8 100644
--- a/src/DirectDiskAdaptor.h
+++ b/src/DirectDiskAdaptor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DIRECT_DISK_ADAPTOR_H_
-#define _D_DIRECT_DISK_ADAPTOR_H_
+#ifndef D_DIRECT_DISK_ADAPTOR_H
+#define D_DIRECT_DISK_ADAPTOR_H
 
 #include "AbstractSingleDiskAdaptor.h"
 
@@ -50,4 +50,4 @@ typedef SharedHandle<DirectDiskAdaptor> DirectDiskAdaptorHandle;
 
 } // namespace aria2
 
-#endif // _D_DIRECT_DISK_ADAPTOR_H_
+#endif // D_DIRECT_DISK_ADAPTOR_H
diff --git a/src/DiskAdaptor.h b/src/DiskAdaptor.h
index 48477f75..1b93ca51 100644
--- a/src/DiskAdaptor.h
+++ b/src/DiskAdaptor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DISK_ADAPTOR_H_
-#define _D_DISK_ADAPTOR_H_
+#ifndef D_DISK_ADAPTOR_H
+#define D_DISK_ADAPTOR_H
 
 #include "BinaryStream.h"
 
@@ -130,4 +130,4 @@ typedef SharedHandle<DiskAdaptor> DiskAdaptorHandle;
 
 } // namespace aria2
 
-#endif // _D_DISK_ADAPTOR_H_
+#endif // D_DISK_ADAPTOR_H
diff --git a/src/DiskWriter.h b/src/DiskWriter.h
index f8497bc9..20729f25 100644
--- a/src/DiskWriter.h
+++ b/src/DiskWriter.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DISK_WRITER_H_
-#define _D_DISK_WRITER_H_
+#ifndef D_DISK_WRITER_H
+#define D_DISK_WRITER_H
 
 #include "BinaryStream.h"
 
@@ -91,4 +91,4 @@ typedef SharedHandle<DiskWriter> DiskWriterHandle;
 
 } // namespace aria2
 
-#endif // _D_DISK_WRITER_H_
+#endif // D_DISK_WRITER_H
diff --git a/src/DiskWriterFactory.h b/src/DiskWriterFactory.h
index 53e69a1a..8e154ec9 100644
--- a/src/DiskWriterFactory.h
+++ b/src/DiskWriterFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DISK_WRITER_FACTORY_H_
-#define _D_DISK_WRITER_FACTORY_H_
+#ifndef D_DISK_WRITER_FACTORY_H
+#define D_DISK_WRITER_FACTORY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -53,4 +53,4 @@ typedef SharedHandle<DiskWriterFactory> DiskWriterFactoryHandle;
 
 } // namespace aria2
 
-#endif // _D_DISK_WRITER_FACTORY_H_
+#endif // D_DISK_WRITER_FACTORY_H
diff --git a/src/DlAbortEx.h b/src/DlAbortEx.h
index 8445bb7d..a7a2b13c 100644
--- a/src/DlAbortEx.h
+++ b/src/DlAbortEx.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DL_ABORT_EX_H_
-#define _D_DL_ABORT_EX_H_
+#ifndef D_DL_ABORT_EX_H
+#define D_DL_ABORT_EX_H
 #include "RecoverableException.h"
 
 namespace aria2 {
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DL_ABORT_EX_H_
+#endif // D_DL_ABORT_EX_H
diff --git a/src/DlRetryEx.h b/src/DlRetryEx.h
index 75ddfeae..d49340f9 100644
--- a/src/DlRetryEx.h
+++ b/src/DlRetryEx.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DL_RETRY_EX_H_
-#define _D_DL_RETRY_EX_H_
+#ifndef D_DL_RETRY_EX_H
+#define D_DL_RETRY_EX_H
 #include "RecoverableException.h"
 
 namespace aria2 {
@@ -58,4 +58,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DL_RETRY_EX_H_
+#endif // D_DL_RETRY_EX_H
diff --git a/src/DownloadCommand.h b/src/DownloadCommand.h
index bb66a649..5e50162f 100644
--- a/src/DownloadCommand.h
+++ b/src/DownloadCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DOWNLOAD_COMMAND_H_
-#define _D_DOWNLOAD_COMMAND_H_
+#ifndef D_DOWNLOAD_COMMAND_H
+#define D_DOWNLOAD_COMMAND_H
 
 #include "AbstractCommand.h"
 
@@ -106,4 +106,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DOWNLOAD_COMMAND_H_
+#endif // D_DOWNLOAD_COMMAND_H
diff --git a/src/DownloadContext.h b/src/DownloadContext.h
index e5a2c6d0..a01faefb 100644
--- a/src/DownloadContext.h
+++ b/src/DownloadContext.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DOWNLOAD_CONTEXT_H_
-#define _D_DOWNLOAD_CONTEXT_H_
+#ifndef D_DOWNLOAD_CONTEXT_H
+#define D_DOWNLOAD_CONTEXT_H
 
 #include "common.h"
 
@@ -244,4 +244,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DOWNLOAD_CONTEXT_H_
+#endif // D_DOWNLOAD_CONTEXT_H
diff --git a/src/DownloadEngine.h b/src/DownloadEngine.h
index 9a2407b0..f3d8291f 100644
--- a/src/DownloadEngine.h
+++ b/src/DownloadEngine.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DOWNLOAD_ENGINE_H_
-#define _D_DOWNLOAD_ENGINE_H_
+#ifndef D_DOWNLOAD_ENGINE_H
+#define D_DOWNLOAD_ENGINE_H
 
 #include "common.h"
 
@@ -350,5 +350,5 @@ typedef SharedHandle<DownloadEngine> DownloadEngineHandle;
 
 } // namespace aria2
 
-#endif // _D_DOWNLOAD_ENGINE_H_
+#endif // D_DOWNLOAD_ENGINE_H
 
diff --git a/src/DownloadEngineFactory.h b/src/DownloadEngineFactory.h
index ab028812..23311842 100644
--- a/src/DownloadEngineFactory.h
+++ b/src/DownloadEngineFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DOWNLOAD_ENGINE_FACTORY_H_
-#define _D_DOWNLOAD_ENGINE_FACTORY_H_
+#ifndef D_DOWNLOAD_ENGINE_FACTORY_H
+#define D_DOWNLOAD_ENGINE_FACTORY_H
 
 #include "common.h"
 
@@ -61,4 +61,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DOWNLOAD_ENGINE_FACTORY_H_
+#endif // D_DOWNLOAD_ENGINE_FACTORY_H
diff --git a/src/DownloadFailureException.h b/src/DownloadFailureException.h
index adb3c7a2..352ab79e 100644
--- a/src/DownloadFailureException.h
+++ b/src/DownloadFailureException.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DOWNLOAD_FAILURE_EXCEPTION_H_
-#define _D_DOWNLOAD_FAILURE_EXCEPTION_H_
+#ifndef D_DOWNLOAD_FAILURE_EXCEPTION_H
+#define D_DOWNLOAD_FAILURE_EXCEPTION_H
 #include "RecoverableException.h"
 
 namespace aria2 {
@@ -66,4 +66,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DOWNLOAD_FAILURE_EXCEPTION_H_
+#endif // D_DOWNLOAD_FAILURE_EXCEPTION_H
diff --git a/src/DownloadHandler.h b/src/DownloadHandler.h
index e1e79498..15daba79 100644
--- a/src/DownloadHandler.h
+++ b/src/DownloadHandler.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DOWNLOAD_HANDLER_H_
-#define _D_DOWNLOAD_HANDLER_H_
+#ifndef D_DOWNLOAD_HANDLER_H
+#define D_DOWNLOAD_HANDLER_H
 
 #include "common.h"
 
@@ -70,4 +70,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DOWNLOAD_HANDLER_H_
+#endif // D_DOWNLOAD_HANDLER_H
diff --git a/src/DownloadHandlerConstants.h b/src/DownloadHandlerConstants.h
index c6b9be47..4d773a03 100644
--- a/src/DownloadHandlerConstants.h
+++ b/src/DownloadHandlerConstants.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DOWNLOAD_HANDLER_CONSTANTS_H_
-#define _D_DOWNLOAD_HANDLER_CONSTANTS_H_
+#ifndef D_DOWNLOAD_HANDLER_CONSTANTS_H
+#define D_DOWNLOAD_HANDLER_CONSTANTS_H
 
 #include "common.h"
 #include <string>
@@ -63,4 +63,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DOWNLOAD_HANDLER_CONSTANTS_H_
+#endif // D_DOWNLOAD_HANDLER_CONSTANTS_H
diff --git a/src/DownloadHandlerFactory.h b/src/DownloadHandlerFactory.h
index 8bfb59e5..94550db5 100644
--- a/src/DownloadHandlerFactory.h
+++ b/src/DownloadHandlerFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DOWNLOAD_HANDLER_FACTORY_H_
-#define _D_DOWNLOAD_HANDLER_FACTORY_H_
+#ifndef D_DOWNLOAD_HANDLER_FACTORY_H
+#define D_DOWNLOAD_HANDLER_FACTORY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -93,4 +93,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DOWNLOAD_HANDLER_FACTORY_H_
+#endif // D_DOWNLOAD_HANDLER_FACTORY_H
diff --git a/src/DownloadResult.h b/src/DownloadResult.h
index aebab5e0..56851268 100644
--- a/src/DownloadResult.h
+++ b/src/DownloadResult.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DOWNLOAD_RESULT_H_
-#define _D_DOWNLOAD_RESULT_H_
+#ifndef D_DOWNLOAD_RESULT_H
+#define D_DOWNLOAD_RESULT_H
 
 #include "common.h"
 
@@ -100,4 +100,4 @@ typedef SharedHandle<DownloadResult> DownloadResultHandle;
 
 } // namespace aria2
 
-#endif // _D_DOWNLOAD_RESULT_H_
+#endif // D_DOWNLOAD_RESULT_H
diff --git a/src/DownloadResultCode.h b/src/DownloadResultCode.h
index f32821c0..a5712c75 100644
--- a/src/DownloadResultCode.h
+++ b/src/DownloadResultCode.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DOWNLOAD_RESULT_CODE_H_
-#define _D_DOWNLOAD_RESULT_CODE_H_
+#ifndef D_DOWNLOAD_RESULT_CODE_H
+#define D_DOWNLOAD_RESULT_CODE_H
 
 #include "common.h"
 
@@ -57,4 +57,4 @@ enum RESULT {
 
 } // namespace aria2
 
-#endif // _D_DOWNLOAD_RESULT_CODE_H_
+#endif // D_DOWNLOAD_RESULT_CODE_H
diff --git a/src/EpollEventPoll.h b/src/EpollEventPoll.h
index 9322c9ea..144319b9 100644
--- a/src/EpollEventPoll.h
+++ b/src/EpollEventPoll.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_EPOLL_EVENT_POLL_H_
-#define _D_EPOLL_EVENT_POLL_H_
+#ifndef D_EPOLL_EVENT_POLL_H
+#define D_EPOLL_EVENT_POLL_H
 
 #include "EventPoll.h"
 
@@ -126,4 +126,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_EPOLL_EVENT_POLL_H_
+#endif // D_EPOLL_EVENT_POLL_H
diff --git a/src/Event.h b/src/Event.h
index 36e95467..83e0cfb4 100644
--- a/src/Event.h
+++ b/src/Event.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_EVENT_H_
-#define _D_EVENT_H_
+#ifndef D_EVENT_H
+#define D_EVENT_H
 
 #include "common.h"
 
@@ -373,4 +373,4 @@ class AsyncNameResolverEntry {};
 
 } // namespace aria2
 
-#endif // _D_EVENT_H_
+#endif // D_EVENT_H
diff --git a/src/EventPoll.h b/src/EventPoll.h
index 807f8886..7217ef25 100644
--- a/src/EventPoll.h
+++ b/src/EventPoll.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_EVENT_POLL_H_
-#define _D_EVENT_POLL_H_
+#ifndef D_EVENT_POLL_H
+#define D_EVENT_POLL_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -76,4 +76,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_EVENT_POLL_H_
+#endif // D_EVENT_POLL_H
diff --git a/src/Exception.h b/src/Exception.h
index 1002cfba..c1026dab 100644
--- a/src/Exception.h
+++ b/src/Exception.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_EXCEPTION_H_
-#define _D_EXCEPTION_H_
+#ifndef D_EXCEPTION_H
+#define D_EXCEPTION_H
 
 #include "common.h"
 
@@ -86,4 +86,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_EXCEPTION_H_
+#endif // D_EXCEPTION_H
diff --git a/src/ExpatMetalinkProcessor.h b/src/ExpatMetalinkProcessor.h
index 5bd3fedf..c21366e7 100644
--- a/src/ExpatMetalinkProcessor.h
+++ b/src/ExpatMetalinkProcessor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_EXPAT_METALINK_PROCESSOR_H_
-#define _D_EXPAT_METALINK_PROCESSOR_H_
+#ifndef D_EXPAT_METALINK_PROCESSOR_H
+#define D_EXPAT_METALINK_PROCESSOR_H
 
 #include "common.h"
 
@@ -63,4 +63,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_EXPAT_METALINK_PROCESSOR_H_
+#endif // D_EXPAT_METALINK_PROCESSOR_H
diff --git a/src/ExpatXmlRpcRequestProcessor.h b/src/ExpatXmlRpcRequestProcessor.h
index 78f2e82d..6959c013 100644
--- a/src/ExpatXmlRpcRequestProcessor.h
+++ b/src/ExpatXmlRpcRequestProcessor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_EXPAT_XML_RPC_REQUEST_PROCESSOR_H_
-#define _D_EXPAT_XML_RPC_REQUEST_PROCESSOR_H_
+#ifndef D_EXPAT_XML_RPC_REQUEST_PROCESSOR_H
+#define D_EXPAT_XML_RPC_REQUEST_PROCESSOR_H
 
 #include "common.h"
 
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_EXPAT_XML_RPC_REQUEST_PROCESSOR_H_
+#endif // D_EXPAT_XML_RPC_REQUEST_PROCESSOR_H
diff --git a/src/ExtensionMessage.h b/src/ExtensionMessage.h
index 19f46aba..17ec102d 100644
--- a/src/ExtensionMessage.h
+++ b/src/ExtensionMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_EXTENSION_MESSAGE_H_
-#define _D_EXTENSION_MESSAGE_H_
+#ifndef D_EXTENSION_MESSAGE_H
+#define D_EXTENSION_MESSAGE_H
 
 #include "common.h"
 
@@ -61,4 +61,4 @@ typedef SharedHandle<ExtensionMessage> ExtensionMessageHandle;
 
 } // namespace aria2
 
-#endif // _D_EXTENSION_MESSAGE_H_
+#endif // D_EXTENSION_MESSAGE_H
diff --git a/src/ExtensionMessageFactory.h b/src/ExtensionMessageFactory.h
index 3ddf56b7..a8ef32fe 100644
--- a/src/ExtensionMessageFactory.h
+++ b/src/ExtensionMessageFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_EXTENSION_MESSAGE_FACTORY_H_
-#define _D_EXTENSION_MESSAGE_FACTORY_H_
+#ifndef D_EXTENSION_MESSAGE_FACTORY_H
+#define D_EXTENSION_MESSAGE_FACTORY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -54,4 +54,4 @@ typedef SharedHandle<ExtensionMessageFactory> ExtensionMessageFactoryHandle;
 
 } // namespace aria2
 
-#endif // _D_EXTENSION_MESSAGE_FACTORY_H_
+#endif // D_EXTENSION_MESSAGE_FACTORY_H
diff --git a/src/ExtensionMessageRegistry.h b/src/ExtensionMessageRegistry.h
index f911028e..d79f2e86 100644
--- a/src/ExtensionMessageRegistry.h
+++ b/src/ExtensionMessageRegistry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_EXTENSION_MESSAGE_REGISTRY_H_
-#define _D_EXTENSION_MESSAGE_REGISTRY_H_
+#ifndef D_EXTENSION_MESSAGE_REGISTRY_H
+#define D_EXTENSION_MESSAGE_REGISTRY_H
 
 #include "common.h"
 
@@ -90,4 +90,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_EXTENSION_MESSAGE_REGISTRY_H_
+#endif // D_EXTENSION_MESSAGE_REGISTRY_H
diff --git a/src/FallocFileAllocationIterator.h b/src/FallocFileAllocationIterator.h
index 413389f1..e7e6fbc1 100644
--- a/src/FallocFileAllocationIterator.h
+++ b/src/FallocFileAllocationIterator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FALLOC_FILE_ALLOCATION_ITERATOR_H_
-#define _D_FALLOC_FILE_ALLOCATION_ITERATOR_H_
+#ifndef D_FALLOC_FILE_ALLOCATION_ITERATOR_H
+#define D_FALLOC_FILE_ALLOCATION_ITERATOR_H
 
 #include "FileAllocationIterator.h"
 #include "BinaryStream.h"
@@ -61,5 +61,5 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FALLOC_FILE_ALLOCATION_ITERATOR_H_
+#endif // D_FALLOC_FILE_ALLOCATION_ITERATOR_H
 
diff --git a/src/FatalException.h b/src/FatalException.h
index 9e1c9a91..8b6e3e3b 100644
--- a/src/FatalException.h
+++ b/src/FatalException.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FATAL_EXCEPTION_H_
-#define _D_FATAL_EXCEPTION_H_
+#ifndef D_FATAL_EXCEPTION_H
+#define D_FATAL_EXCEPTION_H
 #include "Exception.h"
 
 namespace aria2 {
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FATAL_EXCEPTION_EX_H_
+#endif // D_FATAL_EXCEPTION_EX_H
diff --git a/src/FeatureConfig.h b/src/FeatureConfig.h
index 1ad12b6b..0473630e 100644
--- a/src/FeatureConfig.h
+++ b/src/FeatureConfig.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FEATURE_CONFIG_H_
-#define _D_FEATURE_CONFIG_H_
+#ifndef D_FEATURE_CONFIG_H
+#define D_FEATURE_CONFIG_H
 
 #include "common.h"
 
@@ -81,4 +81,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FEATURE_CONFIG_H_
+#endif // D_FEATURE_CONFIG_H
diff --git a/src/FeedbackURISelector.h b/src/FeedbackURISelector.h
index c748ef38..cfaddc87 100644
--- a/src/FeedbackURISelector.h
+++ b/src/FeedbackURISelector.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FEEDBACK_URI_SELECTOR_H_
-#define _D_FEEDBACK_URI_SELECTOR_H_
+#ifndef D_FEEDBACK_URI_SELECTOR_H
+#define D_FEEDBACK_URI_SELECTOR_H
 #include "URISelector.h"
 #include "SharedHandle.h"
 
@@ -68,4 +68,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FEEDBACK_URI_SELECTOR_H_
+#endif // D_FEEDBACK_URI_SELECTOR_H
diff --git a/src/File.h b/src/File.h
index 6454a91d..36236fb0 100644
--- a/src/File.h
+++ b/src/File.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FILE_H_
-#define _D_FILE_H_
+#ifndef D_FILE_H
+#define D_FILE_H
 
 #include "common.h"
 
@@ -118,4 +118,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FILE_H_
+#endif // D_FILE_H
diff --git a/src/FileAllocationCommand.h b/src/FileAllocationCommand.h
index 9b05f91c..ef38b5a2 100644
--- a/src/FileAllocationCommand.h
+++ b/src/FileAllocationCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FILE_ALLOCATION_COMMAND_H_
-#define _D_FILE_ALLOCATION_COMMAND_H_
+#ifndef D_FILE_ALLOCATION_COMMAND_H
+#define D_FILE_ALLOCATION_COMMAND_H
 
 #include "RealtimeCommand.h"
 #include "SharedHandle.h"
@@ -61,4 +61,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FILE_ALLOCATION_COMMAND_H_
+#endif // D_FILE_ALLOCATION_COMMAND_H
diff --git a/src/FileAllocationDispatcherCommand.h b/src/FileAllocationDispatcherCommand.h
index 03721e9a..88c03af6 100644
--- a/src/FileAllocationDispatcherCommand.h
+++ b/src/FileAllocationDispatcherCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FILE_ALLOCATION_DISPATCHER_COMMAND_H_
-#define _D_FILE_ALLOCATION_DISPATCHER_COMMAND_H_
+#ifndef D_FILE_ALLOCATION_DISPATCHER_COMMAND_H
+#define D_FILE_ALLOCATION_DISPATCHER_COMMAND_H
 
 #include "SequentialDispatcherCommand.h"
 #include "FileAllocationMan.h"
@@ -56,4 +56,4 @@ protected:
 
 } // namespace aria2
 
-#endif // _D_FILE_ALLOCATION_DISPATCHER_COMMAND_H_
+#endif // D_FILE_ALLOCATION_DISPATCHER_COMMAND_H
diff --git a/src/FileAllocationEntry.h b/src/FileAllocationEntry.h
index 9790fea6..ed564a3f 100644
--- a/src/FileAllocationEntry.h
+++ b/src/FileAllocationEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FILE_ALLOCATION_ENTRY_H_
-#define _D_FILE_ALLOCATION_ENTRY_H_
+#ifndef D_FILE_ALLOCATION_ENTRY_H
+#define D_FILE_ALLOCATION_ENTRY_H
 
 #include "RequestGroupEntry.h"
 #include "ProgressAwareEntry.h"
@@ -70,4 +70,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FILE_ALLOCATION_ENTRY_H_
+#endif // D_FILE_ALLOCATION_ENTRY_H
diff --git a/src/FileAllocationIterator.h b/src/FileAllocationIterator.h
index 52b87189..a57d4277 100644
--- a/src/FileAllocationIterator.h
+++ b/src/FileAllocationIterator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FILE_ALLOCATION_ITERATOR_H_
-#define _D_FILE_ALLOCATION_ITERATOR_H_
+#ifndef D_FILE_ALLOCATION_ITERATOR_H
+#define D_FILE_ALLOCATION_ITERATOR_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FILE_ALLOCATION_ITERATOR_H_
+#endif // D_FILE_ALLOCATION_ITERATOR_H
diff --git a/src/FileAllocationMan.h b/src/FileAllocationMan.h
index 8ee4c098..c31d670c 100644
--- a/src/FileAllocationMan.h
+++ b/src/FileAllocationMan.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FILE_ALLOCATION_MAN_H_
-#define _D_FILE_ALLOCATION_MAN_H_
+#ifndef D_FILE_ALLOCATION_MAN_H
+#define D_FILE_ALLOCATION_MAN_H
 
 #include "common.h"
 #include "SequentialPicker.h"
@@ -46,4 +46,4 @@ typedef SequentialPicker<FileAllocationEntry> FileAllocationMan;
 
 } // namespace aria2
 
-#endif // _D_FILE_ALLOCATION_MAN_H_
+#endif // D_FILE_ALLOCATION_MAN_H
diff --git a/src/FileEntry.h b/src/FileEntry.h
index 6506fc9d..914f5c8c 100644
--- a/src/FileEntry.h
+++ b/src/FileEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FILE_ENTRY_H_
-#define _D_FILE_ENTRY_H_
+#ifndef D_FILE_ENTRY_H
+#define D_FILE_ENTRY_H
 
 #include "common.h"
 
@@ -342,4 +342,4 @@ void writeFilePath
 
 }
 
-#endif // _D_FILE_ENTRY_H_
+#endif // D_FILE_ENTRY_H
diff --git a/src/FillRequestGroupCommand.h b/src/FillRequestGroupCommand.h
index b5064f63..1702d514 100644
--- a/src/FillRequestGroupCommand.h
+++ b/src/FillRequestGroupCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FILL_REQUEST_GROUP_COMMAND_H_
-#define _D_FILL_REQUEST_GROUP_COMMAND_H_
+#ifndef D_FILL_REQUEST_GROUP_COMMAND_H
+#define D_FILL_REQUEST_GROUP_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FILL_REQUEST_GROUP_COMMAND_H_
+#endif // D_FILL_REQUEST_GROUP_COMMAND_H
diff --git a/src/FixedWidthNumberDecorator.h b/src/FixedWidthNumberDecorator.h
index 7689c962..692488be 100644
--- a/src/FixedWidthNumberDecorator.h
+++ b/src/FixedWidthNumberDecorator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FIXED_WIDTH_NUMBER_DECORATOR_H_
-#define _D_FIXED_WIDTH_NUMBER_DECORATOR_H_
+#ifndef D_FIXED_WIDTH_NUMBER_DECORATOR_H
+#define D_FIXED_WIDTH_NUMBER_DECORATOR_H
 
 #include "NumberDecorator.h"
 #include "util.h"
@@ -61,4 +61,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FIXED_WIDTH_NUMBER_DECORATOR_H_
+#endif // D_FIXED_WIDTH_NUMBER_DECORATOR_H
diff --git a/src/FtpConnection.h b/src/FtpConnection.h
index 463c2af7..51bcf3fe 100644
--- a/src/FtpConnection.h
+++ b/src/FtpConnection.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FTP_CONNECTION_H_
-#define _D_FTP_CONNECTION_H_
+#ifndef D_FTP_CONNECTION_H
+#define D_FTP_CONNECTION_H
 
 #include "common.h"
 
@@ -128,4 +128,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FTP_CONNECTION_H_
+#endif // D_FTP_CONNECTION_H
diff --git a/src/FtpDownloadCommand.h b/src/FtpDownloadCommand.h
index 0380f624..4d381f0e 100644
--- a/src/FtpDownloadCommand.h
+++ b/src/FtpDownloadCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FTP_DOWNLOAD_COMMAND_H_
-#define _D_FTP_DOWNLOAD_COMMAND_H_
+#ifndef D_FTP_DOWNLOAD_COMMAND_H
+#define D_FTP_DOWNLOAD_COMMAND_H
 
 #include "DownloadCommand.h"
 
@@ -63,4 +63,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FTP_DOWNLOAD_COMMAND_H_
+#endif // D_FTP_DOWNLOAD_COMMAND_H
diff --git a/src/FtpFinishDownloadCommand.h b/src/FtpFinishDownloadCommand.h
index 28f970c4..f3819d30 100644
--- a/src/FtpFinishDownloadCommand.h
+++ b/src/FtpFinishDownloadCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FTP_FINISH_DOWNLOAD_COMMAND_H_
-#define _D_FTP_FINISH_DOWNLOAD_COMMAND_H_
+#ifndef D_FTP_FINISH_DOWNLOAD_COMMAND_H
+#define D_FTP_FINISH_DOWNLOAD_COMMAND_H
 
 #include "AbstractCommand.h"
 
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FTP_FINISH_DOWNLOAD_COMMAND_H_
+#endif // D_FTP_FINISH_DOWNLOAD_COMMAND_H
diff --git a/src/FtpInitiateConnectionCommand.h b/src/FtpInitiateConnectionCommand.h
index 57f3ee7b..38d07609 100644
--- a/src/FtpInitiateConnectionCommand.h
+++ b/src/FtpInitiateConnectionCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FTP_INITIATE_CONNECTION_COMMAND_H_
-#define _D_FTP_INITIATE_CONNECTION_COMMAND_H_
+#ifndef D_FTP_INITIATE_CONNECTION_COMMAND_H
+#define D_FTP_INITIATE_CONNECTION_COMMAND_H
 
 #include "InitiateConnectionCommand.h"
 
@@ -55,4 +55,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FTP_INITIATE_CONNECTION_COMMAND_H_
+#endif // D_FTP_INITIATE_CONNECTION_COMMAND_H
diff --git a/src/FtpNegotiationCommand.h b/src/FtpNegotiationCommand.h
index 71b517cd..26393319 100644
--- a/src/FtpNegotiationCommand.h
+++ b/src/FtpNegotiationCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FTP_NEGOTIATION_COMMAND_H_
-#define _D_FTP_NEGOTIATION_COMMAND_H_
+#ifndef D_FTP_NEGOTIATION_COMMAND_H
+#define D_FTP_NEGOTIATION_COMMAND_H
 
 #include "AbstractCommand.h"
 
@@ -167,4 +167,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FTP_NEGOTIATION_COMMAND_H_
+#endif // D_FTP_NEGOTIATION_COMMAND_H
diff --git a/src/FtpTunnelRequestCommand.h b/src/FtpTunnelRequestCommand.h
index 369a3fdc..c22ff381 100644
--- a/src/FtpTunnelRequestCommand.h
+++ b/src/FtpTunnelRequestCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FTP_TUNNEL_REQUEST_COMMAND_H_
-#define _D_FTP_TUNNEL_REQUEST_COMMAND_H_
+#ifndef D_FTP_TUNNEL_REQUEST_COMMAND_H
+#define D_FTP_TUNNEL_REQUEST_COMMAND_H
 
 #include "AbstractProxyRequestCommand.h"
 
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FTP_TUNNEL_REQUEST_COMMAND_H_
+#endif // D_FTP_TUNNEL_REQUEST_COMMAND_H
diff --git a/src/FtpTunnelResponseCommand.h b/src/FtpTunnelResponseCommand.h
index 558241f3..fae4b427 100644
--- a/src/FtpTunnelResponseCommand.h
+++ b/src/FtpTunnelResponseCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_FTP_TUNNEL_RESPONSE_COMMAND_H_
-#define _D_FTP_TUNNEL_RESPONSE_COMMAND_H_
+#ifndef D_FTP_TUNNEL_RESPONSE_COMMAND_H
+#define D_FTP_TUNNEL_RESPONSE_COMMAND_H
 
 #include "AbstractProxyResponseCommand.h"
 
@@ -57,5 +57,5 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FTP_TUNNEL_RESPONSE_COMMAND_H_
+#endif // D_FTP_TUNNEL_RESPONSE_COMMAND_H
 
diff --git a/src/GZipDecoder.h b/src/GZipDecoder.h
index e9268609..1ed7f29a 100644
--- a/src/GZipDecoder.h
+++ b/src/GZipDecoder.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_GZIP_DECODER_H_
-#define _D_GZIP_DECODER_H_
+#ifndef D_GZIP_DECODER_H
+#define D_GZIP_DECODER_H
 
 #include "Decoder.h"
 #include <zlib.h>
@@ -69,4 +69,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_GZIP_DECODER_H_
+#endif // D_GZIP_DECODER_H
diff --git a/src/GZipEncoder.h b/src/GZipEncoder.h
index 78908dc7..b5cf66de 100644
--- a/src/GZipEncoder.h
+++ b/src/GZipEncoder.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_GZIP_ENCODER_H_
-#define _D_GZIP_ENCODER_H_
+#ifndef D_GZIP_ENCODER_H
+#define D_GZIP_ENCODER_H
 #include "common.h"
 
 #include <string>
@@ -94,4 +94,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_GZIP_ENCODER_H_
+#endif // D_GZIP_ENCODER_H
diff --git a/src/GrowSegment.h b/src/GrowSegment.h
index d41ac8d2..382567b3 100644
--- a/src/GrowSegment.h
+++ b/src/GrowSegment.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_GROW_SEGMENT_H_
-#define _D_GROW_SEGMENT_H_
+#ifndef D_GROW_SEGMENT_H
+#define D_GROW_SEGMENT_H
 
 #include "Segment.h"
 
@@ -109,5 +109,5 @@ public:
 
 } // namespace aria2
 
-#endif // _D_GROW_SEGMENT_H_
+#endif // D_GROW_SEGMENT_H
 
diff --git a/src/HandshakeExtensionMessage.h b/src/HandshakeExtensionMessage.h
index 5589e0d1..a273c37b 100644
--- a/src/HandshakeExtensionMessage.h
+++ b/src/HandshakeExtensionMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HANDSHAKE_EXTENSION_MESSAGE_H_
-#define _D_HANDSHAKE_EXTENSION_MESSAGE_H_
+#ifndef D_HANDSHAKE_EXTENSION_MESSAGE_H
+#define D_HANDSHAKE_EXTENSION_MESSAGE_H
 
 #include "ExtensionMessage.h"
 
@@ -143,4 +143,4 @@ typedef SharedHandle<HandshakeExtensionMessage> HandshakeExtensionMessageHandle;
 
 } // namespace aria2
 
-#endif // _D_HANDSHAKE_EXTENSION_MESSAGE_H_
+#endif // D_HANDSHAKE_EXTENSION_MESSAGE_H
diff --git a/src/HaveEraseCommand.h b/src/HaveEraseCommand.h
index d3078057..d08ced91 100644
--- a/src/HaveEraseCommand.h
+++ b/src/HaveEraseCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HAVE_ERASE_COMMAND_H_
-#define _D_HAVE_ERASE_COMMAND_H_
+#ifndef D_HAVE_ERASE_COMMAND_H
+#define D_HAVE_ERASE_COMMAND_H
 
 #include "TimeBasedCommand.h"
 
@@ -53,4 +53,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HAVE_ERASE_COMMAND_H_
+#endif // D_HAVE_ERASE_COMMAND_H
diff --git a/src/HttpConnection.h b/src/HttpConnection.h
index 5760ee34..a8544b06 100644
--- a/src/HttpConnection.h
+++ b/src/HttpConnection.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_CONNECTION_H_
-#define _D_HTTP_CONNECTION_H_
+#ifndef D_HTTP_CONNECTION_H
+#define D_HTTP_CONNECTION_H
 
 #include "common.h"
 
@@ -131,4 +131,4 @@ typedef SharedHandle<HttpConnection> HttpConnectionHandle;
 
 } // namespace aria2
 
-#endif // _D_HTTP_CONNECTION_H_
+#endif // D_HTTP_CONNECTION_H
diff --git a/src/HttpDownloadCommand.h b/src/HttpDownloadCommand.h
index 07d976a7..eae1dc87 100644
--- a/src/HttpDownloadCommand.h
+++ b/src/HttpDownloadCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_DOWNLOAD_COMMAND_H_
-#define _D_HTTP_DOWNLOAD_COMMAND_H_
+#ifndef D_HTTP_DOWNLOAD_COMMAND_H
+#define D_HTTP_DOWNLOAD_COMMAND_H
 
 #include "DownloadCommand.h"
 
@@ -63,4 +63,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HTTP_DOWNLOAD_COMMAND_H_
+#endif // D_HTTP_DOWNLOAD_COMMAND_H
diff --git a/src/HttpHeader.h b/src/HttpHeader.h
index d94493b7..93157e17 100644
--- a/src/HttpHeader.h
+++ b/src/HttpHeader.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_HEADER_H_
-#define _D_HTTP_HEADER_H_
+#ifndef D_HTTP_HEADER_H
+#define D_HTTP_HEADER_H
 
 #include "common.h"
 
@@ -171,4 +171,4 @@ typedef SharedHandle<HttpHeader> HttpHeaderHandle;
 
 } // namespace std;
 
-#endif // _D_HTTP_HEADER_H_
+#endif // D_HTTP_HEADER_H
diff --git a/src/HttpHeaderProcessor.h b/src/HttpHeaderProcessor.h
index f277296e..b225b31d 100644
--- a/src/HttpHeaderProcessor.h
+++ b/src/HttpHeaderProcessor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_HEADER_PROCESSOR_H_
-#define _D_HTTP_HEADER_PROCESSOR_H_
+#ifndef D_HTTP_HEADER_PROCESSOR_H
+#define D_HTTP_HEADER_PROCESSOR_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -92,4 +92,4 @@ typedef SharedHandle<HttpHeaderProcessor> HttpHeaderProcessorHandle;
 
 } // namespace aria2
 
-#endif // _D_HTTP_HEADER_PROCESSOR_H_
+#endif // D_HTTP_HEADER_PROCESSOR_H
diff --git a/src/HttpInitiateConnectionCommand.h b/src/HttpInitiateConnectionCommand.h
index 7d8c80d0..0b1d1e1d 100644
--- a/src/HttpInitiateConnectionCommand.h
+++ b/src/HttpInitiateConnectionCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_INITIATE_CONNECTION_COMMAND_H_
-#define _D_HTTP_INITIATE_CONNECTION_COMMAND_H_
+#ifndef D_HTTP_INITIATE_CONNECTION_COMMAND_H
+#define D_HTTP_INITIATE_CONNECTION_COMMAND_H
 
 #include "InitiateConnectionCommand.h"
 
@@ -56,6 +56,6 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HTTP_INITIATE_CONNECTION_COMMAND_H_
+#endif // D_HTTP_INITIATE_CONNECTION_COMMAND_H
 
 
diff --git a/src/HttpListenCommand.h b/src/HttpListenCommand.h
index b60c408c..19a21848 100644
--- a/src/HttpListenCommand.h
+++ b/src/HttpListenCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_LISTEN_COMMAND_H_
-#define _D_HTTP_LISTEN_COMMAND_H_
+#ifndef D_HTTP_LISTEN_COMMAND_H
+#define D_HTTP_LISTEN_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2 
 
-#endif // _D_HTTP_LISTEN_COMMAND_H_
+#endif // D_HTTP_LISTEN_COMMAND_H
diff --git a/src/HttpProxyRequestCommand.h b/src/HttpProxyRequestCommand.h
index 6b153fd2..60fd6648 100644
--- a/src/HttpProxyRequestCommand.h
+++ b/src/HttpProxyRequestCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_PROXY_REQUEST_COMMAND_H_
-#define _D_HTTP_PROXY_REQUEST_COMMAND_H_
+#ifndef D_HTTP_PROXY_REQUEST_COMMAND_H
+#define D_HTTP_PROXY_REQUEST_COMMAND_H
 
 #include "AbstractProxyRequestCommand.h"
 
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HTTP_PROXY_REQUEST_COMMAND_H_
+#endif // D_HTTP_PROXY_REQUEST_COMMAND_H
diff --git a/src/HttpProxyResponseCommand.h b/src/HttpProxyResponseCommand.h
index 41e2263d..260e79dc 100644
--- a/src/HttpProxyResponseCommand.h
+++ b/src/HttpProxyResponseCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_PROXY_RESPONSE_COMMAND_H_
-#define _D_HTTP_PROXY_RESPONSE_COMMAND_H_
+#ifndef D_HTTP_PROXY_RESPONSE_COMMAND_H
+#define D_HTTP_PROXY_RESPONSE_COMMAND_H
 
 #include "AbstractProxyResponseCommand.h"
 
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HTTP_PROXY_RESPONSE_COMMAND_H_
+#endif // D_HTTP_PROXY_RESPONSE_COMMAND_H
diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index a55f120a..fa4ec390 100644
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_REQUEST_H_
-#define _D_HTTP_REQUEST_H_
+#ifndef D_HTTP_REQUEST_H
+#define D_HTTP_REQUEST_H
 
 #include "common.h"
 
@@ -295,4 +295,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HTTP_REQUEST_H_
+#endif // D_HTTP_REQUEST_H
diff --git a/src/HttpRequestCommand.h b/src/HttpRequestCommand.h
index 5e296c4b..9245bbf3 100644
--- a/src/HttpRequestCommand.h
+++ b/src/HttpRequestCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_REQUEST_COMMAND_H_
-#define _D_HTTP_REQUEST_COMMAND_H_
+#ifndef D_HTTP_REQUEST_COMMAND_H
+#define D_HTTP_REQUEST_COMMAND_H
 
 #include "AbstractCommand.h"
 
@@ -64,4 +64,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HTTP_REQUEST_COMMAND_H_
+#endif // D_HTTP_REQUEST_COMMAND_H
diff --git a/src/HttpResponse.h b/src/HttpResponse.h
index 965bd431..e87e5bd8 100644
--- a/src/HttpResponse.h
+++ b/src/HttpResponse.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_RESPONSE_H_
-#define _D_HTTP_RESPONSE_H_
+#ifndef D_HTTP_RESPONSE_H
+#define D_HTTP_RESPONSE_H
 
 #include "common.h"
 
@@ -133,4 +133,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HTTP_RESPONSE_H_
+#endif // D_HTTP_RESPONSE_H
diff --git a/src/HttpResponseCommand.h b/src/HttpResponseCommand.h
index 85932f68..f0216b3c 100644
--- a/src/HttpResponseCommand.h
+++ b/src/HttpResponseCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_RESPONSE_COMMAND_H_
-#define _D_HTTP_RESPONSE_COMMAND_H_
+#ifndef D_HTTP_RESPONSE_COMMAND_H
+#define D_HTTP_RESPONSE_COMMAND_H
 
 #include "AbstractCommand.h"
 #include "TimeA2.h"
@@ -83,4 +83,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HTTP_RESPONSE_COMMAND_H_
+#endif // D_HTTP_RESPONSE_COMMAND_H
diff --git a/src/HttpServer.h b/src/HttpServer.h
index 5ba7c291..f474ce7b 100644
--- a/src/HttpServer.h
+++ b/src/HttpServer.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_SERVER_H_
-#define _D_HTTP_SERVER_H_
+#ifndef D_HTTP_SERVER_H
+#define D_HTTP_SERVER_H
 
 #include "common.h"
 
@@ -124,4 +124,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HTTP_SERVER_H_
+#endif // D_HTTP_SERVER_H
diff --git a/src/HttpServerBodyCommand.h b/src/HttpServerBodyCommand.h
index a9ba9676..a8215dda 100644
--- a/src/HttpServerBodyCommand.h
+++ b/src/HttpServerBodyCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_SERVER_BODY_COMMAND_H_
-#define _D_HTTP_SERVER_BODY_COMMAND_H_
+#ifndef D_HTTP_SERVER_BODY_COMMAND_H
+#define D_HTTP_SERVER_BODY_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -64,4 +64,4 @@ public:
 
 } // namespace aria2 
 
-#endif // _D_HTTP_SERVER_BODY_COMMAND_H_
+#endif // D_HTTP_SERVER_BODY_COMMAND_H
diff --git a/src/HttpServerCommand.h b/src/HttpServerCommand.h
index 85b8c1a8..403bfd30 100644
--- a/src/HttpServerCommand.h
+++ b/src/HttpServerCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_SERVER_COMMAND_H_
-#define _D_HTTP_SERVER_COMMAND_H_
+#ifndef D_HTTP_SERVER_COMMAND_H
+#define D_HTTP_SERVER_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -67,4 +67,4 @@ public:
 
 } // namespace aria2 
 
-#endif // _D_HTTP_SERVER_COMMAND_H_
+#endif // D_HTTP_SERVER_COMMAND_H
diff --git a/src/HttpServerResponseCommand.h b/src/HttpServerResponseCommand.h
index b86ae75e..12bdf434 100644
--- a/src/HttpServerResponseCommand.h
+++ b/src/HttpServerResponseCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_SERVER_RESPONSE_COMMAND_H_
-#define _D_HTTP_SERVER_RESPONSE_COMMAND_H_
+#ifndef D_HTTP_SERVER_RESPONSE_COMMAND_H
+#define D_HTTP_SERVER_RESPONSE_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -64,4 +64,4 @@ public:
 
 } // namespace aria2 
 
-#endif // _D_HTTP_SERVER_RESPONSE_COMMAND_H_
+#endif // D_HTTP_SERVER_RESPONSE_COMMAND_H
diff --git a/src/HttpSkipResponseCommand.h b/src/HttpSkipResponseCommand.h
index 7fb1769d..df44c364 100644
--- a/src/HttpSkipResponseCommand.h
+++ b/src/HttpSkipResponseCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HTTP_SKIP_RESPONSE_COMMAND_H_
-#define _D_HTTP_SKIP_RESPONSE_COMMAND_H_
+#ifndef D_HTTP_SKIP_RESPONSE_COMMAND_H
+#define D_HTTP_SKIP_RESPONSE_COMMAND_H
 
 #include "AbstractCommand.h"
 
@@ -81,4 +81,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_HTTP_SKIP_RESPONSE_COMMAND_H_
+#endif // D_HTTP_SKIP_RESPONSE_COMMAND_H
diff --git a/src/InOrderURISelector.h b/src/InOrderURISelector.h
index c6234223..466845f7 100644
--- a/src/InOrderURISelector.h
+++ b/src/InOrderURISelector.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_IN_ORDER_URI_SELECTOR_H_
-#define _D_IN_ORDER_URI_SELECTOR_H_
+#ifndef D_IN_ORDER_URI_SELECTOR_H
+#define D_IN_ORDER_URI_SELECTOR_H
 #include "URISelector.h"
 
 namespace aria2 {
@@ -50,4 +50,4 @@ public:
 };
 
 } // namespace aria2
-#endif // _D_IN_ORDER_URI_SELECTOR_H_
+#endif // D_IN_ORDER_URI_SELECTOR_H
diff --git a/src/IndexBtMessage.h b/src/IndexBtMessage.h
index 3c1d0529..8144ac10 100644
--- a/src/IndexBtMessage.h
+++ b/src/IndexBtMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_INDEX_BT_MESSAGE_H_
-#define _D_INDEX_BT_MESSAGE_H_
+#ifndef D_INDEX_BT_MESSAGE_H
+#define D_INDEX_BT_MESSAGE_H
 
 #include "SimpleBtMessage.h"
 #include "bittorrent_helper.h"
@@ -73,4 +73,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_INDEX_BT_MESSAGE_H_
+#endif // D_INDEX_BT_MESSAGE_H
diff --git a/src/IndexBtMessageValidator.h b/src/IndexBtMessageValidator.h
index d5207f29..43ab9f30 100644
--- a/src/IndexBtMessageValidator.h
+++ b/src/IndexBtMessageValidator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_INDEX_BT_VALIDATOR_H_
-#define _D_INDEX_BT_VALIDATOR_H_
+#ifndef D_INDEX_BT_VALIDATOR_H
+#define D_INDEX_BT_VALIDATOR_H
 
 #include "BtMessageValidator.h"
 #include "IndexBtMessage.h"
@@ -60,4 +60,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_INDEX_BT_MESSAGE_VALIDATOR_H_
+#endif // D_INDEX_BT_MESSAGE_VALIDATOR_H
diff --git a/src/InitiateConnectionCommand.h b/src/InitiateConnectionCommand.h
index 0c53bc42..7b52b353 100644
--- a/src/InitiateConnectionCommand.h
+++ b/src/InitiateConnectionCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_INITIATE_CONNECTION_COMMAND_H_
-#define _D_INITIATE_CONNECTION_COMMAND_H_
+#ifndef D_INITIATE_CONNECTION_COMMAND_H
+#define D_INITIATE_CONNECTION_COMMAND_H
 
 #include "AbstractCommand.h"
 
@@ -75,4 +75,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_INITIATE_CONNECTION_COMMAND_H_
+#endif // D_INITIATE_CONNECTION_COMMAND_H
diff --git a/src/InitiateConnectionCommandFactory.h b/src/InitiateConnectionCommandFactory.h
index 97cc16f5..af4bb0ec 100644
--- a/src/InitiateConnectionCommandFactory.h
+++ b/src/InitiateConnectionCommandFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_INITIATE_CONNECTION_COMMAND_FACTORY_H_
-#define _D_INITIATE_CONNECTION_COMMAND_FACTORY_H_
+#ifndef D_INITIATE_CONNECTION_COMMAND_FACTORY_H
+#define D_INITIATE_CONNECTION_COMMAND_FACTORY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -58,4 +58,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_INITIATE_CONNECTION_COMMAND_FACTORY_H_
+#endif // D_INITIATE_CONNECTION_COMMAND_FACTORY_H
diff --git a/src/InitiatorMSEHandshakeCommand.h b/src/InitiatorMSEHandshakeCommand.h
index c9f882df..3ff943ba 100644
--- a/src/InitiatorMSEHandshakeCommand.h
+++ b/src/InitiatorMSEHandshakeCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_INITIATOR_MSE_HANDSHAKE_COMMAND_H_
-#define _D_INITIATOR_MSE_HANDSHAKE_COMMAND_H_
+#ifndef D_INITIATOR_MSE_HANDSHAKE_COMMAND_H
+#define D_INITIATOR_MSE_HANDSHAKE_COMMAND_H
 
 #include "PeerAbstractCommand.h"
 
@@ -93,4 +93,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_INITIATOR_MSE_HANDSHAKE_COMMAND_H_
+#endif // D_INITIATOR_MSE_HANDSHAKE_COMMAND_H
diff --git a/src/IntSequence.h b/src/IntSequence.h
index 8fa2d202..5060da7d 100644
--- a/src/IntSequence.h
+++ b/src/IntSequence.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_INT_SEQUENCE_H_
-#define _D_INT_SEQUENCE_H_
+#ifndef D_INT_SEQUENCE_H
+#define D_INT_SEQUENCE_H
 
 #include "Sequence.h"
 
@@ -43,4 +43,4 @@ typedef Sequence<int32_t> IntSequence;
 
 } // namespace aria2
 
-#endif // _D_INT_SEQUENCE_H_
+#endif // D_INT_SEQUENCE_H
diff --git a/src/IteratableChecksumValidator.h b/src/IteratableChecksumValidator.h
index 73dc6cc9..88b1f5d7 100644
--- a/src/IteratableChecksumValidator.h
+++ b/src/IteratableChecksumValidator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ITERATABLE_CHECKSUM_VALIDATOR_H_
-#define _D_ITERATABLE_CHECKSUM_VALIDATOR_H_
+#ifndef D_ITERATABLE_CHECKSUM_VALIDATOR_H
+#define D_ITERATABLE_CHECKSUM_VALIDATOR_H
 
 #include "IteratableValidator.h"
 
@@ -83,4 +83,4 @@ typedef SharedHandle<IteratableChecksumValidator> IteratableChecksumValidatorHan
 
 } // namespace aria2
 
-#endif // _D_ITERATABLE_CHECKSUM_VALIDATOR_H_
+#endif // D_ITERATABLE_CHECKSUM_VALIDATOR_H
diff --git a/src/IteratableChunkChecksumValidator.h b/src/IteratableChunkChecksumValidator.h
index bc72f474..70d71628 100644
--- a/src/IteratableChunkChecksumValidator.h
+++ b/src/IteratableChunkChecksumValidator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ITERATABLE_CHUNK_CHECKSUM_VALIDATOR_H_
-#define _D_ITERATABLE_CHUNK_CHECKSUM_VALIDATOR_H_
+#ifndef D_ITERATABLE_CHUNK_CHECKSUM_VALIDATOR_H
+#define D_ITERATABLE_CHUNK_CHECKSUM_VALIDATOR_H
 
 #include "IteratableValidator.h"
 
@@ -81,4 +81,4 @@ typedef SharedHandle<IteratableChunkChecksumValidator> IteratableChunkChecksumVa
 
 } // namespace aria2
 
-#endif // _D_ITERATABLE_CHUNK_CHECKSUM_VALIDATOR_H_
+#endif // D_ITERATABLE_CHUNK_CHECKSUM_VALIDATOR_H
diff --git a/src/IteratableValidator.h b/src/IteratableValidator.h
index 0512b3fd..f208f0ed 100644
--- a/src/IteratableValidator.h
+++ b/src/IteratableValidator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ITERATABLE_VALIDATOR_H_
-#define _D_ITERATABLE_VALIDATOR_H_
+#ifndef D_ITERATABLE_VALIDATOR_H
+#define D_ITERATABLE_VALIDATOR_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -69,4 +69,4 @@ typedef SharedHandle<IteratableValidator> IteratableValidatorHandle;
 
 } // namespace aria2
 
-#endif // _D_ITERATABLE_VALIDATOR_H_
+#endif // D_ITERATABLE_VALIDATOR_H
diff --git a/src/KqueueEventPoll.h b/src/KqueueEventPoll.h
index 1d912178..cb9deeaf 100644
--- a/src/KqueueEventPoll.h
+++ b/src/KqueueEventPoll.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_KQUEUE_EVENT_POLL_H_
-#define _D_KQUEUE_EVENT_POLL_H_
+#ifndef D_KQUEUE_EVENT_POLL_H
+#define D_KQUEUE_EVENT_POLL_H
 
 #include "EventPoll.h"
 
@@ -131,4 +131,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_KQUEUE_EVENT_POLL_H_
+#endif // D_KQUEUE_EVENT_POLL_H
diff --git a/src/LibgcryptARC4Context.h b/src/LibgcryptARC4Context.h
index d97b2ced..d2a0cc65 100644
--- a/src/LibgcryptARC4Context.h
+++ b/src/LibgcryptARC4Context.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LIBGCRYPT_ARC4_CONTEXT_H_
-#define _D_LIBGCRYPT_ARC4_CONTEXT_H_
+#ifndef D_LIBGCRYPT_ARC4_CONTEXT_H
+#define D_LIBGCRYPT_ARC4_CONTEXT_H
 
 #include "common.h"
 
@@ -97,4 +97,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LIBGCRYPT_ARC4_CONTEXT_H_
+#endif // D_LIBGCRYPT_ARC4_CONTEXT_H
diff --git a/src/LibgcryptARC4Decryptor.h b/src/LibgcryptARC4Decryptor.h
index 1e38883b..10650c94 100644
--- a/src/LibgcryptARC4Decryptor.h
+++ b/src/LibgcryptARC4Decryptor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LIBGCRYPT_ARC4_DECRYPTOR_H_
-#define _D_LIBGCRYPT_ARC4_DECRYPTOR_H_
+#ifndef D_LIBGCRYPT_ARC4_DECRYPTOR_H
+#define D_LIBGCRYPT_ARC4_DECRYPTOR_H
 
 #include "common.h"
 
@@ -78,4 +78,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LIBGCRYPT_ARC4_DECRYPTOR_H_
+#endif // D_LIBGCRYPT_ARC4_DECRYPTOR_H
diff --git a/src/LibgcryptARC4Encryptor.h b/src/LibgcryptARC4Encryptor.h
index 554a1b10..1e21837a 100644
--- a/src/LibgcryptARC4Encryptor.h
+++ b/src/LibgcryptARC4Encryptor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LIBGCRYPT_ARC4_ENCRYPTOR_H_
-#define _D_LIBGCRYPT_ARC4_ENCRYPTOR_H_
+#ifndef D_LIBGCRYPT_ARC4_ENCRYPTOR_H
+#define D_LIBGCRYPT_ARC4_ENCRYPTOR_H
 
 #include "common.h"
 
@@ -78,4 +78,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LIBGCRYPT_ARC4_ENCRYPTOR_H_
+#endif // D_LIBGCRYPT_ARC4_ENCRYPTOR_H
diff --git a/src/LibgcryptDHKeyExchange.h b/src/LibgcryptDHKeyExchange.h
index aa3d3c3f..b9df9149 100644
--- a/src/LibgcryptDHKeyExchange.h
+++ b/src/LibgcryptDHKeyExchange.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LIBGCRYPT_DH_KEY_EXCHANGE_H_
-#define _D_LIBGCRYPT_DH_KEY_EXCHANGE_H_
+#ifndef D_LIBGCRYPT_DH_KEY_EXCHANGE_H
+#define D_LIBGCRYPT_DH_KEY_EXCHANGE_H
 
 #include "common.h"
 #include "DlAbortEx.h"
@@ -175,4 +175,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LIBGCRYPT_DH_KEY_EXCHANGE_H_
+#endif // D_LIBGCRYPT_DH_KEY_EXCHANGE_H
diff --git a/src/LibgnutlsTLSContext.h b/src/LibgnutlsTLSContext.h
index 137f3f2f..e3da322a 100644
--- a/src/LibgnutlsTLSContext.h
+++ b/src/LibgnutlsTLSContext.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LIBGNUTLS_TLS_CONTEXT_H_
-#define _D_LIBGNUTLS_TLS_CONTEXT_H_
+#ifndef D_LIBGNUTLS_TLS_CONTEXT_H
+#define D_LIBGNUTLS_TLS_CONTEXT_H
 
 #include "common.h"
 
@@ -83,4 +83,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LIBGNUTLS_TLS_CONTEXT_H_
+#endif // D_LIBGNUTLS_TLS_CONTEXT_H
diff --git a/src/LibsslARC4Context.h b/src/LibsslARC4Context.h
index 9db0d729..638d9545 100644
--- a/src/LibsslARC4Context.h
+++ b/src/LibsslARC4Context.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LIBSSL_ARC4_CONTEXT_H_
-#define _D_LIBSSL_ARC4_CONTEXT_H_
+#ifndef D_LIBSSL_ARC4_CONTEXT_H
+#define D_LIBSSL_ARC4_CONTEXT_H
 
 #include "common.h"
 
@@ -97,4 +97,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LIBSSL_ARC4_CONTEXT_H_
+#endif // D_LIBSSL_ARC4_CONTEXT_H
diff --git a/src/LibsslARC4Decryptor.h b/src/LibsslARC4Decryptor.h
index 95635c0c..25647081 100644
--- a/src/LibsslARC4Decryptor.h
+++ b/src/LibsslARC4Decryptor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LIBSSL_ARC4_DECRYPTOR_H_
-#define _D_LIBSSL_ARC4_DECRYPTOR_H_
+#ifndef D_LIBSSL_ARC4_DECRYPTOR_H
+#define D_LIBSSL_ARC4_DECRYPTOR_H
 
 #include "common.h"
 
@@ -78,4 +78,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LIBSSL_ARC4_DECRYPTOR_H_
+#endif // D_LIBSSL_ARC4_DECRYPTOR_H
diff --git a/src/LibsslARC4Encryptor.h b/src/LibsslARC4Encryptor.h
index 07c15384..c2bc2f94 100644
--- a/src/LibsslARC4Encryptor.h
+++ b/src/LibsslARC4Encryptor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LIBSSL_ARC4_ENCRYPTOR_H_
-#define _D_LIBSSL_ARC4_ENCRYPTOR_H_
+#ifndef D_LIBSSL_ARC4_ENCRYPTOR_H
+#define D_LIBSSL_ARC4_ENCRYPTOR_H
 
 #include "common.h"
 
@@ -78,4 +78,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LIBSSL_ARC4_ENCRYPTOR_H_
+#endif // D_LIBSSL_ARC4_ENCRYPTOR_H
diff --git a/src/LibsslDHKeyExchange.h b/src/LibsslDHKeyExchange.h
index 49197e2b..ac28aa4d 100644
--- a/src/LibsslDHKeyExchange.h
+++ b/src/LibsslDHKeyExchange.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LIBSSL_DH_KEY_EXCHANGE_H_
-#define _D_LIBSSL_DH_KEY_EXCHANGE_H_
+#ifndef D_LIBSSL_DH_KEY_EXCHANGE_H
+#define D_LIBSSL_DH_KEY_EXCHANGE_H
 
 #include "common.h"
 #include "DlAbortEx.h"
@@ -191,4 +191,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LIBSSL_DH_KEY_EXCHANGE_H_
+#endif // D_LIBSSL_DH_KEY_EXCHANGE_H
diff --git a/src/LibsslTLSContext.h b/src/LibsslTLSContext.h
index 53592bf3..5262b7e9 100644
--- a/src/LibsslTLSContext.h
+++ b/src/LibsslTLSContext.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LIBSSL_TLS_CONTEXT_H_
-#define _D_LIBSSL_TLS_CONTEXT_H_
+#ifndef D_LIBSSL_TLS_CONTEXT_H
+#define D_LIBSSL_TLS_CONTEXT_H
 
 #include "common.h"
 
@@ -90,4 +90,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LIBSSL_TLS_CONTEXT_H_
+#endif // D_LIBSSL_TLS_CONTEXT_H
diff --git a/src/LogFactory.h b/src/LogFactory.h
index 02fc0f90..09a9942b 100644
--- a/src/LogFactory.h
+++ b/src/LogFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LOG_FACTORY_H_
-#define _D_LOG_FACTORY_H_
+#ifndef D_LOG_FACTORY_H
+#define D_LOG_FACTORY_H
 
 #include "common.h"
 
@@ -93,4 +93,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LOG_FACTORY_H_
+#endif // D_LOG_FACTORY_H
diff --git a/src/Logger.h b/src/Logger.h
index e338416c..208fe566 100644
--- a/src/Logger.h
+++ b/src/Logger.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LOGGER_H_
-#define _D_LOGGER_H_
+#ifndef D_LOGGER_H
+#define D_LOGGER_H
 
 #include "common.h"
 
@@ -150,4 +150,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LOGGER_H_
+#endif // D_LOGGER_H
diff --git a/src/LongestSequencePieceSelector.h b/src/LongestSequencePieceSelector.h
index d6f68bf1..d35f38a5 100644
--- a/src/LongestSequencePieceSelector.h
+++ b/src/LongestSequencePieceSelector.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LONGEST_SEQUENCE_PIECE_SELECTOR_H_
-#define _D_LONGEST_SEQUENCE_PIECE_SELECTOR_H_
+#ifndef D_LONGEST_SEQUENCE_PIECE_SELECTOR_H
+#define D_LONGEST_SEQUENCE_PIECE_SELECTOR_H
 
 #include "PieceSelector.h"
 
@@ -51,4 +51,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LONGEST_SEQUENCE_PIECE_SELECTOR_H_
+#endif // D_LONGEST_SEQUENCE_PIECE_SELECTOR_H
diff --git a/src/LpdDispatchMessageCommand.h b/src/LpdDispatchMessageCommand.h
index 8991c7ec..4da65af7 100644
--- a/src/LpdDispatchMessageCommand.h
+++ b/src/LpdDispatchMessageCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LPD_DISPATCH_MESSAGE_COMMAND_H_
-#define _D_LPD_DISPATCH_MESSAGE_COMMAND_H_
+#ifndef D_LPD_DISPATCH_MESSAGE_COMMAND_H
+#define D_LPD_DISPATCH_MESSAGE_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -66,4 +66,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LPD_DISPATCH_MESSAGE_COMMAND_H_
+#endif // D_LPD_DISPATCH_MESSAGE_COMMAND_H
diff --git a/src/LpdMessage.h b/src/LpdMessage.h
index 701a1501..aed5de60 100644
--- a/src/LpdMessage.h
+++ b/src/LpdMessage.h
@@ -30,8 +30,8 @@
  * version.  If you delete this exception statement from all source
  * files in the program, then also delete it here.
  */
-#ifndef _D_LPD_MESSAGE_H_
-#define _D_LPD_MESSAGE_H_
+#ifndef D_LPD_MESSAGE_H
+#define D_LPD_MESSAGE_H
 
 #include "common.h"
 
@@ -64,4 +64,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LPD_MESSAGE_H_
+#endif // D_LPD_MESSAGE_H
diff --git a/src/LpdMessageDispatcher.h b/src/LpdMessageDispatcher.h
index e263b717..1e4b1a00 100644
--- a/src/LpdMessageDispatcher.h
+++ b/src/LpdMessageDispatcher.h
@@ -30,8 +30,8 @@
  * version.  If you delete this exception statement from all source
  * files in the program, then also delete it here.
  */
-#ifndef _D_LPD_MESSAGE_DISPATCHER_H_
-#define _D_LPD_MESSAGE_DISPATCHER_H_
+#ifndef D_LPD_MESSAGE_DISPATCHER_H
+#define D_LPD_MESSAGE_DISPATCHER_H
 
 #include "common.h"
 
@@ -97,4 +97,4 @@ std::string createLpdRequest
 
 } // namespace aria2
 
-#endif // _D_LPD_MESSAGE_DISPATCHER_H_
+#endif // D_LPD_MESSAGE_DISPATCHER_H
diff --git a/src/LpdMessageReceiver.h b/src/LpdMessageReceiver.h
index 43296c6f..dcc3cfc8 100644
--- a/src/LpdMessageReceiver.h
+++ b/src/LpdMessageReceiver.h
@@ -30,8 +30,8 @@
  * version.  If you delete this exception statement from all source
  * files in the program, then also delete it here.
  */
-#ifndef _LPD_MESSAGE_RECEIVER_H_
-#define _LPD_MESSAGE_RECEIVER_H_
+#ifndef D_LPD_MESSAGE_RECEIVER_H
+#define D_LPD_MESSAGE_RECEIVER_H
 
 #include "common.h"
 
@@ -79,4 +79,4 @@ public:
 
 } // namespace aria2
 
-#endif // _LPD_MESSAGE_RECEIVER_H_
+#endif // D_LPD_MESSAGE_RECEIVER_H
diff --git a/src/LpdReceiveMessageCommand.h b/src/LpdReceiveMessageCommand.h
index 37048b01..23f7bfef 100644
--- a/src/LpdReceiveMessageCommand.h
+++ b/src/LpdReceiveMessageCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_LPD_RECEIVE_MESSAGE_COMMAND_H_
-#define _D_LPD_RECEIVE_MESSAGE_COMMAND_H_
+#ifndef D_LPD_RECEIVE_MESSAGE_COMMAND_H
+#define D_LPD_RECEIVE_MESSAGE_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -83,4 +83,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_LPD_RECEIVE_MESSAGE_COMMAND_H_
+#endif // D_LPD_RECEIVE_MESSAGE_COMMAND_H
diff --git a/src/MSEHandshake.h b/src/MSEHandshake.h
index da372b18..9927e437 100644
--- a/src/MSEHandshake.h
+++ b/src/MSEHandshake.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_MSE_HANDSHAKE_H_
-#define _D_MSE_HANDSHAKE_H_
+#ifndef D_MSE_HANDSHAKE_H
+#define D_MSE_HANDSHAKE_H
 
 #include "common.h"
 
@@ -212,4 +212,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MSE_HANDSHAKE_H_
+#endif // D_MSE_HANDSHAKE_H
diff --git a/src/MemoryBufferPreDownloadHandler.h b/src/MemoryBufferPreDownloadHandler.h
index 78d0e136..dda90b73 100644
--- a/src/MemoryBufferPreDownloadHandler.h
+++ b/src/MemoryBufferPreDownloadHandler.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_MEMORY_BUFFER_PRE_DOWNLOAD_HANDLER_H_
-#define _D_MEMORY_BUFFER_PRE_DOWNLOAD_HANDLER_H_
+#ifndef D_MEMORY_BUFFER_PRE_DOWNLOAD_HANDLER_H
+#define D_MEMORY_BUFFER_PRE_DOWNLOAD_HANDLER_H
 
 #include "PreDownloadHandler.h"
 
@@ -51,4 +51,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MEMORY_BUFFER_PRE_DOWNLOAD_HANDLER_H_
+#endif // D_MEMORY_BUFFER_PRE_DOWNLOAD_HANDLER_H
diff --git a/src/MessageDigestHelper.h b/src/MessageDigestHelper.h
index a1657bf8..0382a696 100644
--- a/src/MessageDigestHelper.h
+++ b/src/MessageDigestHelper.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_MESSAGE_DIGEST_HELPER_H_
-#define _D_MESSAGE_DIGEST_HELPER_H_
+#ifndef D_MESSAGE_DIGEST_HELPER_H
+#define D_MESSAGE_DIGEST_HELPER_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -102,4 +102,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MESSAGE_DIGEST_HELPER_H_
+#endif // D_MESSAGE_DIGEST_HELPER_H
diff --git a/src/MetadataInfo.h b/src/MetadataInfo.h
index 25099205..ab3cfe88 100644
--- a/src/MetadataInfo.h
+++ b/src/MetadataInfo.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METADATA_INFO_H_
-#define _D_METADATA_INFO_H_
+#ifndef D_METADATA_INFO_H
+#define D_METADATA_INFO_H
 
 #include "common.h"
 
@@ -73,4 +73,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METADATA_INFO_H_
+#endif // D_METADATA_INFO_H
diff --git a/src/Metalink2RequestGroup.h b/src/Metalink2RequestGroup.h
index 858ad182..e75ccc84 100644
--- a/src/Metalink2RequestGroup.h
+++ b/src/Metalink2RequestGroup.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_2_REQUEST_GROUP_H_
-#define _D_METALINK_2_REQUEST_GROUP_H_
+#ifndef D_METALINK_2_REQUEST_GROUP_H
+#define D_METALINK_2_REQUEST_GROUP_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -70,4 +70,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METALINK_2_REQUEST_GROUP_H_
+#endif // D_METALINK_2_REQUEST_GROUP_H
diff --git a/src/MetalinkEntry.h b/src/MetalinkEntry.h
index a3acc4b1..998c6c29 100644
--- a/src/MetalinkEntry.h
+++ b/src/MetalinkEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_ENTRY_H_
-#define _D_METALINK_ENTRY_H_
+#ifndef D_METALINK_ENTRY_H
+#define D_METALINK_ENTRY_H
 
 #include "common.h"
 
@@ -123,4 +123,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METALINK_ENTRY_H_
+#endif // D_METALINK_ENTRY_H
diff --git a/src/MetalinkHelper.h b/src/MetalinkHelper.h
index 955f985b..08b446e0 100644
--- a/src/MetalinkHelper.h
+++ b/src/MetalinkHelper.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_HELPER_H_
-#define _D_METALINK_HELPER_H_
+#ifndef D_METALINK_HELPER_H
+#define D_METALINK_HELPER_H
 
 #include "common.h"
 
@@ -76,4 +76,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METALINK_HELPER_H_
+#endif // D_METALINK_HELPER_H
diff --git a/src/MetalinkMetaurl.h b/src/MetalinkMetaurl.h
index b237d2fc..7d57a322 100644
--- a/src/MetalinkMetaurl.h
+++ b/src/MetalinkMetaurl.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_METAURL_H_
-#define _D_METALINK_METAURL_H_
+#ifndef D_METALINK_METAURL_H
+#define D_METALINK_METAURL_H
 
 #include "common.h"
 
@@ -58,4 +58,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METALINK_METAURL_H_
+#endif // D_METALINK_METAURL_H
diff --git a/src/MetalinkParserController.h b/src/MetalinkParserController.h
index 4e3b794b..9f2f5d6d 100644
--- a/src/MetalinkParserController.h
+++ b/src/MetalinkParserController.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_PARSER_CONTROLLER_H_
-#define _D_METALINK_PARSER_CONTROLLER_H_
+#ifndef D_METALINK_PARSER_CONTROLLER_H
+#define D_METALINK_PARSER_CONTROLLER_H
 
 #include "common.h"
 
@@ -194,4 +194,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METALINK_PARSER_CONTROLLER_H_
+#endif // D_METALINK_PARSER_CONTROLLER_H
diff --git a/src/MetalinkParserState.h b/src/MetalinkParserState.h
index 5c62593d..445cbe7d 100644
--- a/src/MetalinkParserState.h
+++ b/src/MetalinkParserState.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_PARSER_STATE_H_
-#define _D_METALINK_PARSER_STATE_H_
+#ifndef D_METALINK_PARSER_STATE_H
+#define D_METALINK_PARSER_STATE_H
 
 #include "common.h"
 
@@ -78,4 +78,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METALINK_PARSER_STATE_H_
+#endif // D_METALINK_PARSER_STATE_H
diff --git a/src/MetalinkParserStateImpl.h b/src/MetalinkParserStateImpl.h
index 4f961fa7..c6f6b452 100644
--- a/src/MetalinkParserStateImpl.h
+++ b/src/MetalinkParserStateImpl.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_PARSER_STATE_IMPL_H_
-#define _D_METALINK_PARSER_STATE_IMPL_H_
+#ifndef D_METALINK_PARSER_STATE_IMPL_H
+#define D_METALINK_PARSER_STATE_IMPL_H
 
 #include "MetalinkParserState.h"
 
@@ -61,4 +61,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METALINK_PARSER_STATE_IMPL_H_
+#endif // D_METALINK_PARSER_STATE_IMPL_H
diff --git a/src/MetalinkParserStateMachine.h b/src/MetalinkParserStateMachine.h
index b0666b58..f87363fd 100644
--- a/src/MetalinkParserStateMachine.h
+++ b/src/MetalinkParserStateMachine.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_PARSER_STATE_MACHINE_H_
-#define _D_METALINK_PARSER_STATE_MACHINE_H_
+#ifndef D_METALINK_PARSER_STATE_MACHINE_H
+#define D_METALINK_PARSER_STATE_MACHINE_H
 
 #include "common.h"
 #include <string>
@@ -268,4 +268,4 @@ public:
 
 } //  namespace aria2
 
-#endif // _D_METALINK_PARSER_STATE_MACHINE_H_
+#endif // D_METALINK_PARSER_STATE_MACHINE_H
diff --git a/src/MetalinkParserStateV3Impl.h b/src/MetalinkParserStateV3Impl.h
index 7c13b700..736d618e 100644
--- a/src/MetalinkParserStateV3Impl.h
+++ b/src/MetalinkParserStateV3Impl.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_PARSER_STATE_V3_IMPL_H_
-#define _D_METALINK_PARSER_STATE_V3_IMPL_H_
+#ifndef D_METALINK_PARSER_STATE_V3_IMPL_H
+#define D_METALINK_PARSER_STATE_V3_IMPL_H
 
 #include "MetalinkParserState.h"
 #include "MetalinkParserStateImpl.h"
@@ -261,4 +261,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METALINK_PARSER_STATE_V3_IMPL_H_
+#endif // D_METALINK_PARSER_STATE_V3_IMPL_H
diff --git a/src/MetalinkParserStateV4Impl.h b/src/MetalinkParserStateV4Impl.h
index 12b98fd7..ff599ee8 100644
--- a/src/MetalinkParserStateV4Impl.h
+++ b/src/MetalinkParserStateV4Impl.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_PARSER_STATE_V4_IMPL_H_
-#define _D_METALINK_PARSER_STATE_V4_IMPL_H_
+#ifndef D_METALINK_PARSER_STATE_V4_IMPL_H
+#define D_METALINK_PARSER_STATE_V4_IMPL_H
 
 #include "MetalinkParserState.h"
 #include "MetalinkParserStateImpl.h"
@@ -231,4 +231,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METALINK_PARSER_STATE_IMPL_H_
+#endif // D_METALINK_PARSER_STATE_IMPL_H
diff --git a/src/MetalinkPostDownloadHandler.h b/src/MetalinkPostDownloadHandler.h
index 7223691d..bdb89e54 100644
--- a/src/MetalinkPostDownloadHandler.h
+++ b/src/MetalinkPostDownloadHandler.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_POST_DOWNLOAD_HANDLER_H_
-#define _D_METALINK_POST_DOWNLOAD_HANDLER_H_
+#ifndef D_METALINK_POST_DOWNLOAD_HANDLER_H
+#define D_METALINK_POST_DOWNLOAD_HANDLER_H
 
 #include "PostDownloadHandler.h"
 
@@ -53,4 +53,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METALINK_POST_DOWNLOAD_HANDLER_H_
+#endif // D_METALINK_POST_DOWNLOAD_HANDLER_H
diff --git a/src/MetalinkProcessor.h b/src/MetalinkProcessor.h
index f6dabb9d..bed699f5 100644
--- a/src/MetalinkProcessor.h
+++ b/src/MetalinkProcessor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_PROCESSOR_H_
-#define _D_METALINK_PROCESSOR_H_
+#ifndef D_METALINK_PROCESSOR_H
+#define D_METALINK_PROCESSOR_H
 
 #include "common.h"
 
@@ -43,4 +43,4 @@
 # include "ExpatMetalinkProcessor.h"
 #endif
 
-#endif // _D_METALINK_PROCESSOR_H_
+#endif // D_METALINK_PROCESSOR_H
diff --git a/src/MetalinkResource.h b/src/MetalinkResource.h
index ecf2e689..a84ad23f 100644
--- a/src/MetalinkResource.h
+++ b/src/MetalinkResource.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINK_RESOURCE_H_
-#define _D_METALINK_RESOURCE_H_
+#ifndef D_METALINK_RESOURCE_H
+#define D_METALINK_RESOURCE_H
 
 #include "common.h"
 #include <string>
@@ -97,4 +97,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METALINK_RESOURCE_H_
+#endif // D_METALINK_RESOURCE_H
diff --git a/src/Metalinker.h b/src/Metalinker.h
index 363d90e7..5b90016b 100644
--- a/src/Metalinker.h
+++ b/src/Metalinker.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_METALINKER_H_
-#define _D_METALINKER_H_
+#ifndef D_METALINKER_H
+#define D_METALINKER_H
 
 #include "common.h"
 
@@ -79,4 +79,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_METALINKER_H_
+#endif // D_METALINKER_H
diff --git a/src/MultiDiskAdaptor.h b/src/MultiDiskAdaptor.h
index c29c0351..34f1b1ce 100644
--- a/src/MultiDiskAdaptor.h
+++ b/src/MultiDiskAdaptor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_MULTI_DISK_ADAPTOR_H_
-#define _D_MULTI_DISK_ADAPTOR_H_
+#ifndef D_MULTI_DISK_ADAPTOR_H
+#define D_MULTI_DISK_ADAPTOR_H
 
 #include "DiskAdaptor.h"
 
@@ -199,4 +199,4 @@ typedef SharedHandle<MultiDiskAdaptor> MultiDiskAdaptorHandle;
 
 } // namespace aria2
 
-#endif // _D_MULTI_DISK_ADAPTOR_H_
+#endif // D_MULTI_DISK_ADAPTOR_H
diff --git a/src/MultiFileAllocationIterator.h b/src/MultiFileAllocationIterator.h
index a84540a4..c649cedf 100644
--- a/src/MultiFileAllocationIterator.h
+++ b/src/MultiFileAllocationIterator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_MULTI_FILE_ALLOCATION_ITERATOR_H_
-#define _D_MULTI_FILE_ALLOCATION_ITERATOR_H_
+#ifndef D_MULTI_FILE_ALLOCATION_ITERATOR_H
+#define D_MULTI_FILE_ALLOCATION_ITERATOR_H
 
 #include "FileAllocationIterator.h"
 #include <deque>
@@ -69,4 +69,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MULTI_FILE_ALLOCATION_ITERATOR_H_
+#endif // D_MULTI_FILE_ALLOCATION_ITERATOR_H
diff --git a/src/MultiUrlRequestInfo.h b/src/MultiUrlRequestInfo.h
index e372fe86..d3c4bb58 100644
--- a/src/MultiUrlRequestInfo.h
+++ b/src/MultiUrlRequestInfo.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_MULTI_URL_REQUEST_INFO_H_
-#define _D_MULTI_URL_REQUEST_INFO_H_
+#ifndef D_MULTI_URL_REQUEST_INFO_H
+#define D_MULTI_URL_REQUEST_INFO_H
 
 #include "common.h"
 
@@ -84,4 +84,4 @@ typedef SharedHandle<MultiUrlRequestInfo> MultiUrlRequestInfoHandle;
 
 } // namespace aria2
 
-#endif // _D_MULTI_URL_REQUEST_INFO_H_
+#endif // D_MULTI_URL_REQUEST_INFO_H
diff --git a/src/NameMatchOptionHandler.h b/src/NameMatchOptionHandler.h
index 89a1f13a..2770ac51 100644
--- a/src/NameMatchOptionHandler.h
+++ b/src/NameMatchOptionHandler.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_NAME_MATCH_OPTION_HANDLER_H_
-#define _D_NAME_MATCH_OPTION_HANDLER_H_
+#ifndef D_NAME_MATCH_OPTION_HANDLER_H
+#define D_NAME_MATCH_OPTION_HANDLER_H
 
 #include "OptionHandler.h"
 
@@ -170,4 +170,4 @@ typedef SharedHandle<NameMatchOptionHandler> NameMatchOptionHandlerHandle;
 
 } // namespace aria2
 
-#endif // _D_NAME_MATCH_OPTION_HANDLER_H_
+#endif // D_NAME_MATCH_OPTION_HANDLER_H
diff --git a/src/NameResolver.h b/src/NameResolver.h
index ebd2ca9d..a391981a 100644
--- a/src/NameResolver.h
+++ b/src/NameResolver.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_NAME_RESOLVER_H_
-#define _D_NAME_RESOLVER_H_
+#ifndef D_NAME_RESOLVER_H
+#define D_NAME_RESOLVER_H
 
 #include "common.h"
 #include <string>
@@ -66,4 +66,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_NAME_RESOLVER_H_
+#endif // D_NAME_RESOLVER_H
diff --git a/src/Netrc.h b/src/Netrc.h
index 8a0eb96a..f29c7c94 100644
--- a/src/Netrc.h
+++ b/src/Netrc.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_NETRC_H_
-#define _D_NETRC_H_
+#ifndef D_NETRC_H
+#define D_NETRC_H
 
 #include "common.h"
 
@@ -175,4 +175,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_NETRC_H_
+#endif // D_NETRC_H
diff --git a/src/NetrcAuthResolver.h b/src/NetrcAuthResolver.h
index 48f50fee..153ac686 100644
--- a/src/NetrcAuthResolver.h
+++ b/src/NetrcAuthResolver.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_NETRC_AUTH_RESOLVER_H_
-#define _D_NETRC_AUTH_RESOLVER_H_
+#ifndef D_NETRC_AUTH_RESOLVER_H
+#define D_NETRC_AUTH_RESOLVER_H
 
 #include "AbstractAuthResolver.h"
 
@@ -73,4 +73,4 @@ typedef SharedHandle<NetrcAuthResolver> NetrcAuthResolverHandle;
 
 } // namespace aria2
 
-#endif // _D_NETRC_AUTH_RESOLVER_H_
+#endif // D_NETRC_AUTH_RESOLVER_H
diff --git a/src/NsCookieParser.h b/src/NsCookieParser.h
index 7d2b2bb8..5515692f 100644
--- a/src/NsCookieParser.h
+++ b/src/NsCookieParser.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_NS_COOKIE_PARSER_H_
-#define _D_NS_COOKIE_PARSER_H_
+#ifndef D_NS_COOKIE_PARSER_H
+#define D_NS_COOKIE_PARSER_H
 
 #include "common.h"
 
@@ -55,4 +55,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_NS_COOKIE_PARSER_H_
+#endif // D_NS_COOKIE_PARSER_H
diff --git a/src/NullProgressInfoFile.h b/src/NullProgressInfoFile.h
index 5fd95e58..4440b72a 100644
--- a/src/NullProgressInfoFile.h
+++ b/src/NullProgressInfoFile.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_NULL_PROGRESS_INFO_FILE_H_
-#define _D_NULL_PROGRESS_INFO_FILE_H_
+#ifndef D_NULL_PROGRESS_INFO_FILE_H
+#define D_NULL_PROGRESS_INFO_FILE_H
 
 #include "BtProgressInfoFile.h"
 #include "A2STR.h"
@@ -64,4 +64,4 @@ typedef SharedHandle<NullProgressInfoFile> NullProgressInfoFileHandle;
 
 } // namespace aria2
 
-#endif // _D_NULL_PROGRESS_INFO_FILE_H_
+#endif // D_NULL_PROGRESS_INFO_FILE_H
diff --git a/src/NullStatCalc.h b/src/NullStatCalc.h
index 9c29ceb3..e9de0972 100644
--- a/src/NullStatCalc.h
+++ b/src/NullStatCalc.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_NULL_STAT_CALC_H_
-#define _D_NULL_STAT_CALC_H_
+#ifndef D_NULL_STAT_CALC_H
+#define D_NULL_STAT_CALC_H
 
 #include "StatCalc.h"
 
@@ -48,4 +48,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_NULL_STAT_CALC_H_
+#endif // D_NULL_STAT_CALC_H
diff --git a/src/NumberDecorator.h b/src/NumberDecorator.h
index c52c28fe..18f3fe0a 100644
--- a/src/NumberDecorator.h
+++ b/src/NumberDecorator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_NUMBER_DECORATOR_H_
-#define _D_NUMBER_DECORATOR_H_
+#ifndef D_NUMBER_DECORATOR_H
+#define D_NUMBER_DECORATOR_H
 
 #include "common.h"
 
@@ -52,4 +52,4 @@ public:
 
 } // namespace aria2;
 
-#endif // _D_NUMBER_DECORATOR_H_
+#endif // D_NUMBER_DECORATOR_H
diff --git a/src/Option.h b/src/Option.h
index fdea715a..53656cb6 100644
--- a/src/Option.h
+++ b/src/Option.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_OPTION_H_
-#define _D_OPTION_H_
+#ifndef D_OPTION_H
+#define D_OPTION_H
 
 #include "common.h"
 #include <string>
@@ -78,4 +78,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_OPTION_H_
+#endif // D_OPTION_H
diff --git a/src/OptionHandler.h b/src/OptionHandler.h
index 362f5c88..24fea546 100644
--- a/src/OptionHandler.h
+++ b/src/OptionHandler.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_OPTION_HANDLER_H_
-#define _D_OPTION_HANDLER_H_
+#ifndef D_OPTION_HANDLER_H
+#define D_OPTION_HANDLER_H
 
 #include "common.h"
 
@@ -116,4 +116,4 @@ std::ostream& operator<<(std::ostream& o, const OptionHandler& optionHandler);
 
 } // namespace aria2
 
-#endif // _D_OPTION_HANDLER_H_
+#endif // D_OPTION_HANDLER_H
diff --git a/src/OptionHandlerException.h b/src/OptionHandlerException.h
index 689c1911..9eb024a8 100644
--- a/src/OptionHandlerException.h
+++ b/src/OptionHandlerException.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_OPTION_HANDLER_EXCEPTION_H_
-#define _D_OPTION_HANDLER_EXCEPTION_H_
+#ifndef D_OPTION_HANDLER_EXCEPTION_H
+#define D_OPTION_HANDLER_EXCEPTION_H
 #include "RecoverableException.h"
 
 namespace aria2 {
@@ -67,4 +67,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_OPTION_HANDLER_EXCEPTION_EX_H_
+#endif // D_OPTION_HANDLER_EXCEPTION_EX_H
diff --git a/src/OptionHandlerFactory.h b/src/OptionHandlerFactory.h
index 961931cf..247614d4 100644
--- a/src/OptionHandlerFactory.h
+++ b/src/OptionHandlerFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_OPTION_HANDLER_FACTORY_H_
-#define _D_OPTION_HANDLER_FACTORY_H_
+#ifndef D_OPTION_HANDLER_FACTORY_H
+#define D_OPTION_HANDLER_FACTORY_H
 
 #include "common.h"
 
@@ -52,4 +52,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_OPTION_HANDLER_FACTORY_H_
+#endif // D_OPTION_HANDLER_FACTORY_H
diff --git a/src/OptionHandlerImpl.h b/src/OptionHandlerImpl.h
index e43bffd8..82c9460e 100644
--- a/src/OptionHandlerImpl.h
+++ b/src/OptionHandlerImpl.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_OPTION_HANDLER_IMPL_H_
-#define _D_OPTION_HANDLER_IMPL_H_
+#ifndef D_OPTION_HANDLER_IMPL_H
+#define D_OPTION_HANDLER_IMPL_H
 
 #include "OptionHandler.h"
 
@@ -758,4 +758,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_OPTION_HANDLER_IMPL_H_
+#endif // D_OPTION_HANDLER_IMPL_H
diff --git a/src/OptionParser.h b/src/OptionParser.h
index 6ef579e1..13d1b827 100644
--- a/src/OptionParser.h
+++ b/src/OptionParser.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_OPTION_PARSER_H_
-#define _D_OPTION_PARSER_H_
+#ifndef D_OPTION_PARSER_H
+#define D_OPTION_PARSER_H
 
 #include "common.h"
 
@@ -108,4 +108,4 @@ typedef SharedHandle<OptionParser> OptionParserHandle;
 
 } // namespace aria2
 
-#endif // _D_OPTION_PARSER_H_
+#endif // D_OPTION_PARSER_H
diff --git a/src/PStringBuildVisitor.h b/src/PStringBuildVisitor.h
index 37e5e82e..bcf3b772 100644
--- a/src/PStringBuildVisitor.h
+++ b/src/PStringBuildVisitor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_P_STRING_BUILD_VISITOR_H_
-#define _D_P_STRING_BUILD_VISITOR_H_
+#ifndef D_P_STRING_BUILD_VISITOR_H
+#define D_P_STRING_BUILD_VISITOR_H
 
 #include "PStringVisitor.h"
 
@@ -69,4 +69,4 @@ typedef SharedHandle<PStringBuildVisitor> PStringBuildVisitorHandle;
 
 } // namespace aria2
 
-#endif // _D_P_STRING_BUILD_VISITOR_H_
+#endif // D_P_STRING_BUILD_VISITOR_H
diff --git a/src/PStringDatum.h b/src/PStringDatum.h
index 256c65fb..c27595e2 100644
--- a/src/PStringDatum.h
+++ b/src/PStringDatum.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_P_STRING_DATUM_H_
-#define _D_P_STRING_DATUM_H_
+#ifndef D_P_STRING_DATUM_H
+#define D_P_STRING_DATUM_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -51,4 +51,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_P_STRING_DATUM_H_
+#endif // D_P_STRING_DATUM_H
diff --git a/src/PStringNumLoop.h b/src/PStringNumLoop.h
index d7694646..f50d269a 100644
--- a/src/PStringNumLoop.h
+++ b/src/PStringNumLoop.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_P_STRING_NUM_LOOP_H_
-#define _D_P_STRING_NUM_LOOP_H_
+#ifndef D_P_STRING_NUM_LOOP_H
+#define D_P_STRING_NUM_LOOP_H
 
 #include "PStringDatum.h"
 #include "PStringSegment.h"
@@ -111,4 +111,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_P_STRING_NUM_LOOP_H_
+#endif // D_P_STRING_NUM_LOOP_H
diff --git a/src/PStringSegment.h b/src/PStringSegment.h
index 3ee8df17..3de754ac 100644
--- a/src/PStringSegment.h
+++ b/src/PStringSegment.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_P_STRING_SEGMENT_H_
-#define _D_P_STRING_SEGMENT_H_
+#ifndef D_P_STRING_SEGMENT_H
+#define D_P_STRING_SEGMENT_H
 
 #include "PStringDatum.h"
 #include <string>
@@ -67,4 +67,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_P_STRING_SEGMENT_H_
+#endif // D_P_STRING_SEGMENT_H
diff --git a/src/PStringSelect.h b/src/PStringSelect.h
index d27d4c41..690f2828 100644
--- a/src/PStringSelect.h
+++ b/src/PStringSelect.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_P_STRING_SELECT_H_
-#define _D_P_STRING_SELECT_H_
+#ifndef D_P_STRING_SELECT_H
+#define D_P_STRING_SELECT_H
 
 #include "PStringDatum.h"
 #include "PStringSegment.h"
@@ -78,4 +78,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_P_STRING_SELECT_H_
+#endif // D_P_STRING_SELECT_H
diff --git a/src/PStringVisitor.h b/src/PStringVisitor.h
index ac031b68..03b04b52 100644
--- a/src/PStringVisitor.h
+++ b/src/PStringVisitor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_P_STRING_VISITOR_H_
-#define _D_P_STRING_VISITOR_H_
+#ifndef D_P_STRING_VISITOR_H
+#define D_P_STRING_VISITOR_H
 
 #include "common.h"
 
@@ -56,4 +56,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_P_STRING_VISITOR_H_
+#endif // D_P_STRING_VISITOR_H
diff --git a/src/ParameterizedStringParser.h b/src/ParameterizedStringParser.h
index dcab033a..91a23db1 100644
--- a/src/ParameterizedStringParser.h
+++ b/src/ParameterizedStringParser.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PARAMETERIZED_STRING_PARSER_H_
-#define _D_PARAMETERIZED_STRING_PARSER_H_
+#ifndef D_PARAMETERIZED_STRING_PARSER_H
+#define D_PARAMETERIZED_STRING_PARSER_H
 
 #include "common.h"
 #include "PStringDatum.h"
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PARAMETERIZED_STRING_PARSER_H_
+#endif // D_PARAMETERIZED_STRING_PARSER_H
diff --git a/src/Peer.h b/src/Peer.h
index 972a22c9..99bf9ab4 100644
--- a/src/Peer.h
+++ b/src/Peer.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PEER_H_
-#define _D_PEER_H_
+#ifndef D_PEER_H
+#define D_PEER_H
 
 #include "common.h"
 
@@ -335,4 +335,4 @@ size_t countSeeder(InputIterator first, InputIterator last)
 
 } // namespace aria2
 
-#endif // _D_PEER_H_
+#endif // D_PEER_H
diff --git a/src/PeerAbstractCommand.h b/src/PeerAbstractCommand.h
index a3cb6aa7..511c422a 100644
--- a/src/PeerAbstractCommand.h
+++ b/src/PeerAbstractCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PEER_ABSTRACT_COMMAND_H_
-#define _D_PEER_ABSTRACT_COMMAND_H_
+#ifndef D_PEER_ABSTRACT_COMMAND_H
+#define D_PEER_ABSTRACT_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -105,4 +105,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PEER_ABSTRACT_COMMAND_H_
+#endif // D_PEER_ABSTRACT_COMMAND_H
diff --git a/src/PeerAddrEntry.h b/src/PeerAddrEntry.h
index e539e6d9..874027be 100644
--- a/src/PeerAddrEntry.h
+++ b/src/PeerAddrEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DHT_PEER_ADDR_ENTRY_H_
-#define _D_DHT_PEER_ADDR_ENTRY_H_
+#ifndef D_DHT_PEER_ADDR_ENTRY_H
+#define D_DHT_PEER_ADDR_ENTRY_H
 
 #include "common.h"
 
@@ -83,4 +83,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_DHT_PEER_ADDR_ENTRY_H_
+#endif // D_DHT_PEER_ADDR_ENTRY_H
diff --git a/src/PeerChokeCommand.h b/src/PeerChokeCommand.h
index a6e2a70c..54feb6eb 100644
--- a/src/PeerChokeCommand.h
+++ b/src/PeerChokeCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PEER_CHOKE_COMMAND_H_
-#define _D_PEER_CHOKE_COMMAND_H_
+#ifndef D_PEER_CHOKE_COMMAND_H
+#define D_PEER_CHOKE_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -66,4 +66,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PEER_CHOKE_COMMAND_H_
+#endif // D_PEER_CHOKE_COMMAND_H
diff --git a/src/PeerConnection.h b/src/PeerConnection.h
index 0659f414..d632f35e 100644
--- a/src/PeerConnection.h
+++ b/src/PeerConnection.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PEER_CONNECTION_H_
-#define _D_PEER_CONNECTION_H_
+#ifndef D_PEER_CONNECTION_H
+#define D_PEER_CONNECTION_H
 
 #include "common.h"
 
@@ -132,4 +132,4 @@ typedef WeakHandle<PeerConnection> PeerConnectionWeakHandle;
 
 } // namespace aria2
 
-#endif // _D_PEER_CONNECTION_H_
+#endif // D_PEER_CONNECTION_H
diff --git a/src/PeerInitiateConnectionCommand.h b/src/PeerInitiateConnectionCommand.h
index 2e01423b..db7262db 100644
--- a/src/PeerInitiateConnectionCommand.h
+++ b/src/PeerInitiateConnectionCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PEER_INITIATE_CONNECTION_H_
-#define _D_PEER_INITIATE_CONNECTION_H_
+#ifndef D_PEER_INITIATE_CONNECTION_H
+#define D_PEER_INITIATE_CONNECTION_H
 
 #include "PeerAbstractCommand.h"
 
@@ -78,4 +78,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PEER_INITIATE_CONNECTION_H_
+#endif // D_PEER_INITIATE_CONNECTION_H
diff --git a/src/PeerInteractionCommand.h b/src/PeerInteractionCommand.h
index e8ffae43..8e4fc6d3 100644
--- a/src/PeerInteractionCommand.h
+++ b/src/PeerInteractionCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PEER_INTERACTION_COMMAND_H_
-#define _D_PEER_INTERACTION_COMMAND_H_
+#ifndef D_PEER_INTERACTION_COMMAND_H
+#define D_PEER_INTERACTION_COMMAND_H
 
 #include "PeerAbstractCommand.h"
 
@@ -91,4 +91,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PEER_INTERACTION_COMMAND_H_
+#endif // D_PEER_INTERACTION_COMMAND_H
diff --git a/src/PeerListenCommand.h b/src/PeerListenCommand.h
index 0055b726..7e0b1d4d 100644
--- a/src/PeerListenCommand.h
+++ b/src/PeerListenCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PEER_LISTEN_COMMAND_H_
-#define _D_PEER_LISTEN_COMMAND_H_
+#ifndef D_PEER_LISTEN_COMMAND_H
+#define D_PEER_LISTEN_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -88,4 +88,4 @@ public:
 
 } // namespace aria2 
 
-#endif // _D_PEER_LISTEN_COMMAND_H_
+#endif // D_PEER_LISTEN_COMMAND_H
diff --git a/src/PeerReceiveHandshakeCommand.h b/src/PeerReceiveHandshakeCommand.h
index d0b8cb2e..dee52d18 100644
--- a/src/PeerReceiveHandshakeCommand.h
+++ b/src/PeerReceiveHandshakeCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PEER_RECEIVE_HANDSHAKE_COMMAND_H_
-#define _D_PEER_RECEIVE_HANDSHAKE_COMMAND_H_
+#ifndef D_PEER_RECEIVE_HANDSHAKE_COMMAND_H
+#define D_PEER_RECEIVE_HANDSHAKE_COMMAND_H
 
 #include "PeerAbstractCommand.h"
 
@@ -64,4 +64,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PEER_RECEIVE_HANDSHAKE_COMMAND_H_
+#endif // D_PEER_RECEIVE_HANDSHAKE_COMMAND_H
diff --git a/src/PeerSessionResource.h b/src/PeerSessionResource.h
index c20460bd..7e677ecb 100644
--- a/src/PeerSessionResource.h
+++ b/src/PeerSessionResource.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PEER_SESSION_RESOURCE_H_
-#define _D_PEER_SESSION_RESOURCE_H_
+#ifndef D_PEER_SESSION_RESOURCE_H
+#define D_PEER_SESSION_RESOURCE_H
 
 #include "common.h"
 
@@ -237,4 +237,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PEER_SESSION_RESOURCE_H_
+#endif // D_PEER_SESSION_RESOURCE_H
diff --git a/src/PeerStat.h b/src/PeerStat.h
index 1ab12030..b84571bd 100644
--- a/src/PeerStat.h
+++ b/src/PeerStat.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PEER_STAT_H_
-#define _D_PEER_STAT_H_
+#ifndef D_PEER_STAT_H
+#define D_PEER_STAT_H
 
 #include "common.h"
 
@@ -193,4 +193,4 @@ typedef SharedHandle<PeerStat> PeerStatHandle;
 
 } // namespace aria2
 
-#endif // _D_PEER_STAT_H_
+#endif // D_PEER_STAT_H
diff --git a/src/PeerStorage.h b/src/PeerStorage.h
index 23d6038e..442fd719 100644
--- a/src/PeerStorage.h
+++ b/src/PeerStorage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PEER_STORAGE_H_
-#define _D_PEER_STORAGE_H_
+#ifndef D_PEER_STORAGE_H
+#define D_PEER_STORAGE_H
 
 #include "common.h"
 
@@ -111,4 +111,4 @@ typedef SharedHandle<PeerStorage> PeerStorageHandle;
 
 } // namespace aria2
 
-#endif // _D_PEER_STORAGE_H_
+#endif // D_PEER_STORAGE_H
diff --git a/src/Piece.h b/src/Piece.h
index dcfc63c0..a857e8a3 100644
--- a/src/Piece.h
+++ b/src/Piece.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PIECE_H_
-#define _D_PIECE_H_
+#ifndef D_PIECE_H
+#define D_PIECE_H
 
 #include "common.h"
 
@@ -181,4 +181,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PIECE_H_
+#endif // D_PIECE_H
diff --git a/src/PieceHashCheckIntegrityEntry.h b/src/PieceHashCheckIntegrityEntry.h
index eb8148a6..821af5f7 100644
--- a/src/PieceHashCheckIntegrityEntry.h
+++ b/src/PieceHashCheckIntegrityEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PIECE_HASH_CHECK_INTEGRITY_ENTRY_H_
-#define _D_PIECE_HASH_CHECK_INTEGRITY_ENTRY_H_
+#ifndef D_PIECE_HASH_CHECK_INTEGRITY_ENTRY_H
+#define D_PIECE_HASH_CHECK_INTEGRITY_ENTRY_H
 
 #include "CheckIntegrityEntry.h"
 
@@ -53,4 +53,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PIECE_HASH_CHECK_INTEGRITY_ENTRY_H_
+#endif // D_PIECE_HASH_CHECK_INTEGRITY_ENTRY_H
diff --git a/src/PieceSelector.h b/src/PieceSelector.h
index 36047ae3..659a386a 100644
--- a/src/PieceSelector.h
+++ b/src/PieceSelector.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PIECE_SELECTOR_H_
-#define _D_PIECE_SELECTOR_H_
+#ifndef D_PIECE_SELECTOR_H
+#define D_PIECE_SELECTOR_H
 
 #include "common.h"
 
@@ -51,4 +51,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PIECE_SELECTOR_H_
+#endif // D_PIECE_SELECTOR_H
diff --git a/src/PieceStatMan.h b/src/PieceStatMan.h
index 5a6c9df3..1bc9ee11 100644
--- a/src/PieceStatMan.h
+++ b/src/PieceStatMan.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PIECE_STAT_MAN_H_
-#define _D_PIECE_STAT_MAN_H_
+#ifndef D_PIECE_STAT_MAN_H
+#define D_PIECE_STAT_MAN_H
 
 #include "common.h"
 
@@ -120,4 +120,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PIECE_STAT_MAN_H_
+#endif // D_PIECE_STAT_MAN_H
diff --git a/src/PieceStorage.h b/src/PieceStorage.h
index cb586255..6f3c09bc 100644
--- a/src/PieceStorage.h
+++ b/src/PieceStorage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PIECE_STORAGE_H_
-#define _D_PIECE_STORAGE_H_
+#ifndef D_PIECE_STORAGE_H
+#define D_PIECE_STORAGE_H
 
 #include "common.h"
 
@@ -281,4 +281,4 @@ typedef SharedHandle<PieceStorage> PieceStorageHandle;
 
 } // namespace aria2
 
-#endif // _D_PIECE_STORAGE_H_
+#endif // D_PIECE_STORAGE_H
diff --git a/src/PiecedSegment.h b/src/PiecedSegment.h
index fb279c11..00d3a386 100644
--- a/src/PiecedSegment.h
+++ b/src/PiecedSegment.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PIECED_SEGMENT_H_
-#define _D_PIECED_SEGMENT_H_
+#ifndef D_PIECED_SEGMENT_H
+#define D_PIECED_SEGMENT_H
 
 #include "Segment.h"
 
@@ -95,5 +95,5 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PIECED_SEGMENT_H_
+#endif // D_PIECED_SEGMENT_H
 
diff --git a/src/Platform.h b/src/Platform.h
index 81fa2c83..c05ba96b 100644
--- a/src/Platform.h
+++ b/src/Platform.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PLATFORM_H_
-#define _D_PLATFORM_H_
+#ifndef D_PLATFORM_H
+#define D_PLATFORM_H
 
 #include "common.h"
 
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PLATFORM_H_
+#endif // D_PLATFORM_H
diff --git a/src/PollEventPoll.h b/src/PollEventPoll.h
index c452d19d..eddac2c9 100644
--- a/src/PollEventPoll.h
+++ b/src/PollEventPoll.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_POLL_EVENT_POLL_H_
-#define _D_POLL_EVENT_POLL_H_
+#ifndef D_POLL_EVENT_POLL_H
+#define D_POLL_EVENT_POLL_H
 
 #include "EventPoll.h"
 
@@ -125,4 +125,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_POLL_EVENT_POLL_H_
+#endif // D_POLL_EVENT_POLL_H
diff --git a/src/PortEventPoll.h b/src/PortEventPoll.h
index 35de0d66..9abc7d81 100644
--- a/src/PortEventPoll.h
+++ b/src/PortEventPoll.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PORT_EVENT_POLL_H_
-#define _D_PORT_EVENT_POLL_H_
+#ifndef D_PORT_EVENT_POLL_H
+#define D_PORT_EVENT_POLL_H
 
 #include "EventPoll.h"
 
@@ -133,4 +133,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PORT_EVENT_POLL_H_
+#endif // D_PORT_EVENT_POLL_H
diff --git a/src/PostDownloadHandler.h b/src/PostDownloadHandler.h
index d442bd53..e89b14d1 100644
--- a/src/PostDownloadHandler.h
+++ b/src/PostDownloadHandler.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_POST_DOWNLOAD_HANDLER_H_
-#define _D_POST_DOWNLOAD_HANDLER_H_
+#ifndef D_POST_DOWNLOAD_HANDLER_H
+#define D_POST_DOWNLOAD_HANDLER_H
 
 #include "DownloadHandler.h"
 
@@ -55,4 +55,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_POST_DOWNLOAD_HANDLER_H_
+#endif // D_POST_DOWNLOAD_HANDLER_H
diff --git a/src/PreDownloadHandler.h b/src/PreDownloadHandler.h
index bc0a377d..fbb5cd5a 100644
--- a/src/PreDownloadHandler.h
+++ b/src/PreDownloadHandler.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PRE_DOWNLOAD_HANDLER_H_
-#define _D_PRE_DOWNLOAD_HANDLER_H_
+#ifndef D_PRE_DOWNLOAD_HANDLER_H
+#define D_PRE_DOWNLOAD_HANDLER_H
 
 #include "DownloadHandler.h"
 
@@ -51,4 +51,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PRE_DOWNLOAD_HANDLER_H_
+#endif // D_PRE_DOWNLOAD_HANDLER_H
diff --git a/src/PriorityPieceSelector.h b/src/PriorityPieceSelector.h
index 6726d916..5401747d 100644
--- a/src/PriorityPieceSelector.h
+++ b/src/PriorityPieceSelector.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PRIORITY_PIECE_SELECTOR_H_
-#define _D_PRIORITY_PIECE_SELECTOR_H_
+#ifndef D_PRIORITY_PIECE_SELECTOR_H
+#define D_PRIORITY_PIECE_SELECTOR_H
 
 #include "PieceSelector.h"
 
@@ -64,4 +64,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PRIORITY_PIECE_SELECTOR_H_
+#endif // D_PRIORITY_PIECE_SELECTOR_H
diff --git a/src/ProgressAwareEntry.h b/src/ProgressAwareEntry.h
index b6105310..07732e4b 100644
--- a/src/ProgressAwareEntry.h
+++ b/src/ProgressAwareEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PROGRESS_AWARE_ENTRY_H_
-#define _D_PROGRESS_AWARE_ENTRY_H_
+#ifndef D_PROGRESS_AWARE_ENTRY_H
+#define D_PROGRESS_AWARE_ENTRY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -57,4 +57,4 @@ typedef SharedHandle<ProgressAwareEntry> ProgressAwareEntryHandle;
 
 } // namespace aria2
 
-#endif // _D_PROGRESS_AWARE_ENTRY_H_
+#endif // D_PROGRESS_AWARE_ENTRY_H
diff --git a/src/ProtocolDetector.h b/src/ProtocolDetector.h
index 0cd78c19..54652cb1 100644
--- a/src/ProtocolDetector.h
+++ b/src/ProtocolDetector.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PROTOCOL_DETECTOR_H_
-#define _D_PROTOCOL_DETECTOR_H_
+#ifndef D_PROTOCOL_DETECTOR_H
+#define D_PROTOCOL_DETECTOR_H
 
 #include "common.h"
 #include <string>
@@ -64,4 +64,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_PROTOCOL_DETECTOR_H_
+#endif // D_PROTOCOL_DETECTOR_H
diff --git a/src/Randomizer.h b/src/Randomizer.h
index b1772cfb..16427d28 100644
--- a/src/Randomizer.h
+++ b/src/Randomizer.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_RANDOMIZER_H_
-#define _D_RANDOMIZER_H_
+#ifndef D_RANDOMIZER_H
+#define D_RANDOMIZER_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -58,4 +58,4 @@ typedef SharedHandle<Randomizer> RandomizerHandle;
 
 } // namespace aria2
 
-#endif // _D_RANDOMIZER_H_
+#endif // D_RANDOMIZER_H
diff --git a/src/Range.h b/src/Range.h
index 86ee970c..c3ed4b61 100644
--- a/src/Range.h
+++ b/src/Range.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_RANGE_H_
-#define _D_RANGE_H_
+#ifndef D_RANGE_H
+#define D_RANGE_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -92,4 +92,4 @@ typedef SharedHandle<Range> RangeHandle;
 
 } // namespace aria2
 
-#endif // _D_RANGE_H_
+#endif // D_RANGE_H
diff --git a/src/RangeBtMessage.h b/src/RangeBtMessage.h
index a1f8cb84..dfa20462 100644
--- a/src/RangeBtMessage.h
+++ b/src/RangeBtMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_RANGE_BT_MESSAGE_H_
-#define _D_RANGE_BT_MESSAGE_H_
+#ifndef D_RANGE_BT_MESSAGE_H
+#define D_RANGE_BT_MESSAGE_H
 
 #include "SimpleBtMessage.h"
 #include "bittorrent_helper.h"
@@ -85,4 +85,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_RANGE_BT_MESSAGE_H_
+#endif // D_RANGE_BT_MESSAGE_H
diff --git a/src/RangeBtMessageValidator.h b/src/RangeBtMessageValidator.h
index e7242412..a7af8104 100644
--- a/src/RangeBtMessageValidator.h
+++ b/src/RangeBtMessageValidator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_RANGE_BT_MESSAGE_VALIDATOR_H_
-#define _D_RANGE_BT_MESSAGE_VALIDATOR_H_
+#ifndef D_RANGE_BT_MESSAGE_VALIDATOR_H
+#define D_RANGE_BT_MESSAGE_VALIDATOR_H
 
 #include "BtMessageValidator.h"
 #include "RangeBtMessage.h"
@@ -67,4 +67,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_RANGE_BT_MESSAGE_VALIDATOR_H_
+#endif // D_RANGE_BT_MESSAGE_VALIDATOR_H
diff --git a/src/RarestPieceSelector.h b/src/RarestPieceSelector.h
index 94f0ba1d..4496e602 100644
--- a/src/RarestPieceSelector.h
+++ b/src/RarestPieceSelector.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_RAREST_PIECE_SELECTOR_H_
-#define _D_RAREST_PIECE_SELECTOR_H_
+#ifndef D_RAREST_PIECE_SELECTOR_H
+#define D_RAREST_PIECE_SELECTOR_H
 
 #include "PieceSelector.h"
 #include "SharedHandle.h"
@@ -54,5 +54,5 @@ public:
 
 } // namespace aria2
 
-#endif // _D_RAREST_PIECE_SELECTOR_H_
+#endif // D_RAREST_PIECE_SELECTOR_H
 
diff --git a/src/RealtimeCommand.h b/src/RealtimeCommand.h
index 29d82dae..6373a126 100644
--- a/src/RealtimeCommand.h
+++ b/src/RealtimeCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_REALTIME_COMMAND_H_
-#define _D_REALTIME_COMMAND_H_
+#ifndef D_REALTIME_COMMAND_H
+#define D_REALTIME_COMMAND_H
 
 #include "Command.h"
 
@@ -71,4 +71,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_REALTIME_COMMAND_H_
+#endif // D_REALTIME_COMMAND_H
diff --git a/src/ReceiverMSEHandshakeCommand.h b/src/ReceiverMSEHandshakeCommand.h
index ea055913..eb76acc0 100644
--- a/src/ReceiverMSEHandshakeCommand.h
+++ b/src/ReceiverMSEHandshakeCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_RECEIVER_MSE_HANDSHAKE_COMMAND_H_
-#define _D_RECEIVER_MSE_HANDSHAKE_COMMAND_H_
+#ifndef D_RECEIVER_MSE_HANDSHAKE_COMMAND_H
+#define D_RECEIVER_MSE_HANDSHAKE_COMMAND_H
 
 #include "PeerAbstractCommand.h"
 
@@ -77,4 +77,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_RECEIVER_MSE_HANDSHAKE_COMMAND_H_
+#endif // D_RECEIVER_MSE_HANDSHAKE_COMMAND_H
diff --git a/src/RecoverableException.h b/src/RecoverableException.h
index ccfc52ef..ea90db68 100644
--- a/src/RecoverableException.h
+++ b/src/RecoverableException.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_RECOVERABLE_EXCEPTION_H_
-#define _D_RECOVERABLE_EXCEPTION_H_
+#ifndef D_RECOVERABLE_EXCEPTION_H
+#define D_RECOVERABLE_EXCEPTION_H
 #include "Exception.h"
 #include "DownloadResultCode.h"
 
@@ -65,4 +65,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_RECOVERABLE_EXCEPTION_EX_H_
+#endif // D_RECOVERABLE_EXCEPTION_EX_H
diff --git a/src/Request.h b/src/Request.h
index f0738526..0ce648eb 100644
--- a/src/Request.h
+++ b/src/Request.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_REQUEST_H_
-#define _D_REQUEST_H_
+#ifndef D_REQUEST_H
+#define D_REQUEST_H
 #include "common.h"
 
 #include <string>
@@ -260,4 +260,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_REQUEST_H_
+#endif // D_REQUEST_H
diff --git a/src/RequestGroup.h b/src/RequestGroup.h
index a49bbbc3..108fdd5c 100644
--- a/src/RequestGroup.h
+++ b/src/RequestGroup.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_REQUEST_GROUP_H_
-#define _D_REQUEST_GROUP_H_
+#ifndef D_REQUEST_GROUP_H
+#define D_REQUEST_GROUP_H
 
 #include "common.h"
 
@@ -552,4 +552,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_REQUEST_GROUP_H_
+#endif // D_REQUEST_GROUP_H
diff --git a/src/RequestGroupCriteria.h b/src/RequestGroupCriteria.h
index daf57abd..69e4ae69 100644
--- a/src/RequestGroupCriteria.h
+++ b/src/RequestGroupCriteria.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_REQUEST_GROUP_CRITERIA_H_
-#define _D_REQUEST_GROUP_CRITERIA_H_
+#ifndef D_REQUEST_GROUP_CRITERIA_H
+#define D_REQUEST_GROUP_CRITERIA_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -54,4 +54,4 @@ typedef SharedHandle<RequestGroupCriteria> RequestGroupCriteriaHandle;
 
 } // namespace aria2
 
-#endif // _D_REQUEST_GROUP_CRITERIA_H_
+#endif // D_REQUEST_GROUP_CRITERIA_H
diff --git a/src/RequestGroupEntry.h b/src/RequestGroupEntry.h
index 330225ab..30e8a942 100644
--- a/src/RequestGroupEntry.h
+++ b/src/RequestGroupEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_REQUEST_GROUP_ENTRY_H_
-#define _D_REQUEST_GROUP_ENTRY_H_
+#ifndef D_REQUEST_GROUP_ENTRY_H
+#define D_REQUEST_GROUP_ENTRY_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -77,4 +77,4 @@ typedef SharedHandle<RequestGroupEntry> RequestGroupEntryHandle;
 
 } // namespace aria2
 
-#endif // _D_REQUEST_GROUP_ENTRY_H_
+#endif // D_REQUEST_GROUP_ENTRY_H
diff --git a/src/RequestGroupMan.h b/src/RequestGroupMan.h
index 2c9f7872..45ab77b9 100644
--- a/src/RequestGroupMan.h
+++ b/src/RequestGroupMan.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_REQUEST_GROUP_MAN_H_
-#define _D_REQUEST_GROUP_MAN_H_
+#ifndef D_REQUEST_GROUP_MAN_H
+#define D_REQUEST_GROUP_MAN_H
 
 #include "common.h"
 
@@ -293,4 +293,4 @@ typedef SharedHandle<RequestGroupMan> RequestGroupManHandle;
 
 } // namespace aria2
 
-#endif // _D_REQUEST_GROUP_MAN_H_
+#endif // D_REQUEST_GROUP_MAN_H
diff --git a/src/RequestSlot.h b/src/RequestSlot.h
index 933a9af1..b8d219dd 100644
--- a/src/RequestSlot.h
+++ b/src/RequestSlot.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_REQUEST_SLOT_H_
-#define _D_REQUEST_SLOT_H_
+#ifndef D_REQUEST_SLOT_H
+#define D_REQUEST_SLOT_H
 
 #include "common.h"
 #include "TimerA2.h"
@@ -145,4 +145,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_REQUEST_SLOT_H_
+#endif // D_REQUEST_SLOT_H
diff --git a/src/SeedCheckCommand.h b/src/SeedCheckCommand.h
index dd42d702..bcc33bf0 100644
--- a/src/SeedCheckCommand.h
+++ b/src/SeedCheckCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SEED_CHECK_COMMAND_H_
-#define _D_SEED_CHECK_COMMAND_H_
+#ifndef D_SEED_CHECK_COMMAND_H
+#define D_SEED_CHECK_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -74,4 +74,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SEED_CHECK_COMMAND_H_
+#endif // D_SEED_CHECK_COMMAND_H
diff --git a/src/SeedCriteria.h b/src/SeedCriteria.h
index 47953d0f..5129de62 100644
--- a/src/SeedCriteria.h
+++ b/src/SeedCriteria.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SEED_CRITERIA_H_
-#define _D_SEED_CRITERIA_H_
+#ifndef D_SEED_CRITERIA_H
+#define D_SEED_CRITERIA_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SEED_CRITERIA_H_
+#endif // D_SEED_CRITERIA_H
diff --git a/src/Segment.h b/src/Segment.h
index c35d6a70..17efcad6 100644
--- a/src/Segment.h
+++ b/src/Segment.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SEGMENT_H_
-#define _D_SEGMENT_H_
+#ifndef D_SEGMENT_H
+#define D_SEGMENT_H
 
 #include "common.h"
 
@@ -91,5 +91,5 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SEGMENT_H_
+#endif // D_SEGMENT_H
 
diff --git a/src/SegmentMan.h b/src/SegmentMan.h
index 50fcf8b3..2166b1d4 100644
--- a/src/SegmentMan.h
+++ b/src/SegmentMan.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SEGMENT_MAN_H_
-#define _D_SEGMENT_MAN_H_
+#ifndef D_SEGMENT_MAN_H
+#define D_SEGMENT_MAN_H
 
 #include "common.h"
 
@@ -251,4 +251,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SEGMENT_MAN_H_
+#endif // D_SEGMENT_MAN_H
diff --git a/src/SelectEventPoll.h b/src/SelectEventPoll.h
index 37f734ab..5396fdfe 100644
--- a/src/SelectEventPoll.h
+++ b/src/SelectEventPoll.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SELECT_EVENT_POLL_H_
-#define _D_SELECT_EVENT_POLL_H_
+#ifndef D_SELECT_EVENT_POLL_H
+#define D_SELECT_EVENT_POLL_H
 
 #include "EventPoll.h"
 
@@ -194,4 +194,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SELECT_EVENT_POLL_H_
+#endif // D_SELECT_EVENT_POLL_H
diff --git a/src/Sequence.h b/src/Sequence.h
index dc3aa35f..7652e017 100644
--- a/src/Sequence.h
+++ b/src/Sequence.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SEQUENCE_H_
-#define _D_SEQUENCE_H_
+#ifndef D_SEQUENCE_H
+#define D_SEQUENCE_H
 
 #include <vector>
 
@@ -101,4 +101,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SEQUENCE_H_
+#endif // D_SEQUENCE_H
diff --git a/src/SequentialDispatcherCommand.h b/src/SequentialDispatcherCommand.h
index 611a9069..92f30f15 100644
--- a/src/SequentialDispatcherCommand.h
+++ b/src/SequentialDispatcherCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SEQUENTIAL_DISPATCHER_COMMAND_H_
-#define _D_SEQUENTIAL_DISPATCHER_COMMAND_H_
+#ifndef D_SEQUENTIAL_DISPATCHER_COMMAND_H
+#define D_SEQUENTIAL_DISPATCHER_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -86,4 +86,4 @@ protected:
 
 } // namespace aria2
 
-#endif // _D_SEQUENTIAL_DISPATCHER_COMMAND_H_
+#endif // D_SEQUENTIAL_DISPATCHER_COMMAND_H
diff --git a/src/SequentialPicker.h b/src/SequentialPicker.h
index 5f02f0e0..85a64b31 100644
--- a/src/SequentialPicker.h
+++ b/src/SequentialPicker.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SEQUENTIAL_PICKER_H_
-#define _D_SEQUENTIAL_PICKER_H_
+#ifndef D_SEQUENTIAL_PICKER_H
+#define D_SEQUENTIAL_PICKER_H
 
 #include "common.h"
 
@@ -93,4 +93,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SEQUENTIAL_PICKER_H_
+#endif // D_SEQUENTIAL_PICKER_H
diff --git a/src/ServerStat.h b/src/ServerStat.h
index ea469845..8cb699d9 100644
--- a/src/ServerStat.h
+++ b/src/ServerStat.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SERVER_STAT_H_
-#define _D_SERVER_STAT_H_
+#ifndef D_SERVER_STAT_H
+#define D_SERVER_STAT_H
 #include "common.h"
 
 #include <string>
@@ -173,4 +173,4 @@ std::ostream& operator<<(std::ostream& o, const ServerStat& serverStat);
 
 } // namespace aria2
 
-#endif // _D_SERVER_STAT_H_
+#endif // D_SERVER_STAT_H
diff --git a/src/ServerStatMan.h b/src/ServerStatMan.h
index d1c33c95..fea6e384 100644
--- a/src/ServerStatMan.h
+++ b/src/ServerStatMan.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SERVER_STAT_MAN_H_
-#define _D_SERVER_STAT_MAN_H_
+#ifndef D_SERVER_STAT_MAN_H
+#define D_SERVER_STAT_MAN_H
 #include "common.h"
 
 #include <string>
@@ -69,4 +69,4 @@ private:
 
 } // namespace aria2
 
-#endif // _D_SERVER_STAT_MAN_H_
+#endif // D_SERVER_STAT_MAN_H
diff --git a/src/SessionSerializer.h b/src/SessionSerializer.h
index 49498997..9f02af95 100644
--- a/src/SessionSerializer.h
+++ b/src/SessionSerializer.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SESSION_SERIALIZER_H_
-#define _D_SESSION_SERIALIZER_H_
+#ifndef D_SESSION_SERIALIZER_H
+#define D_SESSION_SERIALIZER_H
 
 #include "common.h"
 
@@ -62,4 +62,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SESSION_SERIALIZER_H_
+#endif // D_SESSION_SERIALIZER_H
diff --git a/src/ShareRatioSeedCriteria.h b/src/ShareRatioSeedCriteria.h
index 0d95d465..50ef2f4a 100644
--- a/src/ShareRatioSeedCriteria.h
+++ b/src/ShareRatioSeedCriteria.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SHARE_RATIO_SEED_CRITERIA_H_
-#define _D_SHARE_RATIO_SEED_CRITERIA_H_
+#ifndef D_SHARE_RATIO_SEED_CRITERIA_H
+#define D_SHARE_RATIO_SEED_CRITERIA_H
 
 #include "SeedCriteria.h"
 #include "DownloadContext.h"
@@ -89,4 +89,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SHARE_RATIO_SEED_CRITERIA_H_
+#endif // D_SHARE_RATIO_SEED_CRITERIA_H
diff --git a/src/SharedHandle.h b/src/SharedHandle.h
index 1e5c29cb..2fe5d62f 100644
--- a/src/SharedHandle.h
+++ b/src/SharedHandle.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SHARED_HANDLE_H_
-#define _D_SHARED_HANDLE_H_
+#ifndef D_SHARED_HANDLE_H
+#define D_SHARED_HANDLE_H
 
 #include <iosfwd>
 
@@ -411,4 +411,4 @@ dynamic_pointer_cast(const WeakHandle<S>& t) {
 
 } // namespace aria2
 
-#endif // _D_SHARED_HANDLE_H_
+#endif // D_SHARED_HANDLE_H
diff --git a/src/Signature.h b/src/Signature.h
index 4b85b4a0..71803af0 100644
--- a/src/Signature.h
+++ b/src/Signature.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SIGNATURE_H_
-#define _D_SIGNATURE_H_
+#ifndef D_SIGNATURE_H
+#define D_SIGNATURE_H
 
 #include "common.h"
 
@@ -81,4 +81,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SIGNATURE_H_
+#endif // D_SIGNATURE_H
diff --git a/src/SimpleBtMessage.h b/src/SimpleBtMessage.h
index 3a807c5e..70db0994 100644
--- a/src/SimpleBtMessage.h
+++ b/src/SimpleBtMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SIMPLE_BT_MESSAGE_H_
-#define _D_SIMPLE_BT_MESSAGE_H_
+#ifndef D_SIMPLE_BT_MESSAGE_H
+#define D_SIMPLE_BT_MESSAGE_H
 
 #include "AbstractBtMessage.h"
 
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SIMPLE_BT_MESSAGE_H_
+#endif // D_SIMPLE_BT_MESSAGE_H
diff --git a/src/SimpleRandomizer.h b/src/SimpleRandomizer.h
index c2a10c10..e99564c9 100644
--- a/src/SimpleRandomizer.h
+++ b/src/SimpleRandomizer.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SIMPLE_RANDOMIZER_H_
-#define _D_SIMPLE_RANDOMIZER_H_
+#ifndef D_SIMPLE_RANDOMIZER_H
+#define D_SIMPLE_RANDOMIZER_H
 
 #include "Randomizer.h"
 
@@ -66,4 +66,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SIMPLE_RANDOMIZER_H_
+#endif // D_SIMPLE_RANDOMIZER_H
diff --git a/src/SingleFileAllocationIterator.h b/src/SingleFileAllocationIterator.h
index 3efc0d9e..68cc57cc 100644
--- a/src/SingleFileAllocationIterator.h
+++ b/src/SingleFileAllocationIterator.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SINGLE_FILE_ALLOCATION_ITERATOR_H_
-#define _D_SINGLE_FILE_ALLOCATION_ITERATOR_H_
+#ifndef D_SINGLE_FILE_ALLOCATION_ITERATOR_H
+#define D_SINGLE_FILE_ALLOCATION_ITERATOR_H
 
 #include "FileAllocationIterator.h"
 
@@ -81,4 +81,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SINGLE_FILE_ALLOCATION_ITERATOR_H_
+#endif // D_SINGLE_FILE_ALLOCATION_ITERATOR_H
diff --git a/src/SingletonHolder.h b/src/SingletonHolder.h
index 7963125f..e6664bd0 100644
--- a/src/SingletonHolder.h
+++ b/src/SingletonHolder.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SINGLETON_HOLDER_H_
-#define _D_SINGLETON_HOLDER_H_
+#ifndef D_SINGLETON_HOLDER_H
+#define D_SINGLETON_HOLDER_H
 
 namespace aria2 {
 
@@ -62,4 +62,4 @@ T SingletonHolder<T>::instance_;
 
 } // namespace aria2
 
-#endif // _D_SINGLETON_HOLDER_H_
+#endif // D_SINGLETON_HOLDER_H
diff --git a/src/SleepCommand.h b/src/SleepCommand.h
index b437971e..32633fc4 100644
--- a/src/SleepCommand.h
+++ b/src/SleepCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SLEEP_COMMAND_H_
-#define _D_SLEEP_COMMAND_H_
+#ifndef D_SLEEP_COMMAND_H
+#define D_SLEEP_COMMAND_H
 
 #include "Command.h"
 #include "TimerA2.h"
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SLEEP_COMMAND_H_
+#endif // D_SLEEP_COMMAND_H
diff --git a/src/Socket.h b/src/Socket.h
index 83725e45..41e36cdc 100644
--- a/src/Socket.h
+++ b/src/Socket.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SOCKET_H_
-#define _D_SOCKET_H_
+#ifndef D_SOCKET_H
+#define D_SOCKET_H
 
 #include "SocketCore.h"
 #include "SharedHandle.h"
@@ -44,4 +44,4 @@ typedef SharedHandle<SocketCore> SocketHandle;
 
 } // namespace aria2
 
-#endif // _D_SOCKET_H_
+#endif // D_SOCKET_H
diff --git a/src/SocketBuffer.h b/src/SocketBuffer.h
index 3dbf50b0..910f1f9a 100644
--- a/src/SocketBuffer.h
+++ b/src/SocketBuffer.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SOCKET_BUFFER_H_
-#define _D_SOCKET_BUFFER_H_
+#ifndef D_SOCKET_BUFFER_H
+#define D_SOCKET_BUFFER_H
 
 #include "common.h"
 
@@ -114,4 +114,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SOCKET_BUFFER_H_
+#endif // D_SOCKET_BUFFER_H
diff --git a/src/SocketCore.h b/src/SocketCore.h
index 3ea31b87..ed91195e 100644
--- a/src/SocketCore.h
+++ b/src/SocketCore.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SOCKET_CORE_H_
-#define _D_SOCKET_CORE_H_
+#ifndef D_SOCKET_CORE_H
+#define D_SOCKET_CORE_H
 
 #include "common.h"
 
@@ -395,4 +395,4 @@ void getInterfaceAddress
 
 } // namespace aria2
 
-#endif // _D_SOCKET_CORE_H_
+#endif // D_SOCKET_CORE_H
diff --git a/src/SpeedCalc.h b/src/SpeedCalc.h
index b19442ab..716831b3 100644
--- a/src/SpeedCalc.h
+++ b/src/SpeedCalc.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SPEED_CALC_H_
-#define _D_SPEED_CALC_H_
+#ifndef D_SPEED_CALC_H
+#define D_SPEED_CALC_H
 
 #include "common.h"
 #include "TimerA2.h"
@@ -77,4 +77,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_SPEED_CALC_H_
+#endif // D_SPEED_CALC_H
diff --git a/src/StatCalc.h b/src/StatCalc.h
index ab5372f5..8c00a369 100644
--- a/src/StatCalc.h
+++ b/src/StatCalc.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_STAT_CALC_H_
-#define _D_STAT_CALC_H_
+#ifndef D_STAT_CALC_H
+#define D_STAT_CALC_H
 
 #include "common.h"
 #include "SharedHandle.h"
@@ -53,4 +53,4 @@ typedef SharedHandle<StatCalc> StatCalcHandle;
 
 } // namespace aria2
 
-#endif // _D_STAT_CALC_H_
+#endif // D_STAT_CALC_H
diff --git a/src/StreamCheckIntegrityEntry.h b/src/StreamCheckIntegrityEntry.h
index c231e4c6..72f88ac0 100644
--- a/src/StreamCheckIntegrityEntry.h
+++ b/src/StreamCheckIntegrityEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_STREAM_CHECK_INTEGRITY_ENTRY_H_
-#define _D_STREAM_CHECK_INTEGRITY_ENTRY_H_
+#ifndef D_STREAM_CHECK_INTEGRITY_ENTRY_H
+#define D_STREAM_CHECK_INTEGRITY_ENTRY_H
 
 #include "PieceHashCheckIntegrityEntry.h"
 
@@ -58,4 +58,4 @@ typedef SharedHandle<StreamCheckIntegrityEntry> StreamCheckIntegrityEntryHandle;
 
 } // namespace aria2
 
-#endif // _D_STREAM_CHECK_INTEGRITY_ENTRY_H_
+#endif // D_STREAM_CHECK_INTEGRITY_ENTRY_H
diff --git a/src/StreamFileAllocationEntry.h b/src/StreamFileAllocationEntry.h
index e277705e..b7635bab 100644
--- a/src/StreamFileAllocationEntry.h
+++ b/src/StreamFileAllocationEntry.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_STREAM_FILE_ALLOCATION_ENTRY_H_
-#define _D_STREAM_FILE_ALLOCATION_ENTRY_H_
+#ifndef D_STREAM_FILE_ALLOCATION_ENTRY_H
+#define D_STREAM_FILE_ALLOCATION_ENTRY_H
 
 #include "FileAllocationEntry.h"
 
@@ -52,4 +52,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_STREAM_FILE_ALLOCATION_ENTRY_H_
+#endif // D_STREAM_FILE_ALLOCATION_ENTRY_H
diff --git a/src/StringFormat.h b/src/StringFormat.h
index 42b1c1fa..8fa536ac 100644
--- a/src/StringFormat.h
+++ b/src/StringFormat.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_STRING_FORMAT_H_
-#define _D_STRING_FORMAT_H_
+#ifndef D_STRING_FORMAT_H
+#define D_STRING_FORMAT_H
 
 #include "common.h"
 
@@ -57,4 +57,4 @@ std::ostream& operator<<(std::ostream& o, const StringFormat& fmt);
 
 } // namespace aria2
 
-#endif // _D_STRING_FORMAT_H_
+#endif // D_STRING_FORMAT_H
diff --git a/src/TLSContext.h b/src/TLSContext.h
index de59409c..9a3f509b 100644
--- a/src/TLSContext.h
+++ b/src/TLSContext.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_TLS_CONTEXT_H_
-#define _D_TLS_CONTEXT_H_
+#ifndef D_TLS_CONTEXT_H
+#define D_TLS_CONTEXT_H
 
 #include "common.h"
 
@@ -43,4 +43,4 @@
 # include "LibgnutlsTLSContext.h"
 #endif // HAVE_LIBGNUTLS
 
-#endif // _D_TLS_CONTEXT_H_
+#endif // D_TLS_CONTEXT_H
diff --git a/src/TimeA2.h b/src/TimeA2.h
index 5763200d..97302a55 100644
--- a/src/TimeA2.h
+++ b/src/TimeA2.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_TIME_H_
-#define _D_TIME_H_
+#ifndef D_TIME_H
+#define D_TIME_H
 
 #include "common.h"
 
@@ -143,4 +143,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_TIME_H_
+#endif // D_TIME_H
diff --git a/src/TimeBasedCommand.h b/src/TimeBasedCommand.h
index 9f3d2556..967ebf9b 100644
--- a/src/TimeBasedCommand.h
+++ b/src/TimeBasedCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_TIME_BASED_COMMAND_H_
-#define _D_TIME_BASED_COMMAND_H_
+#ifndef D_TIME_BASED_COMMAND_H
+#define D_TIME_BASED_COMMAND_H
 
 #include "Command.h"
 #include "TimerA2.h"
@@ -104,4 +104,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_TIME_BASED_COMMAND_H_
+#endif // D_TIME_BASED_COMMAND_H
diff --git a/src/TimeSeedCriteria.h b/src/TimeSeedCriteria.h
index 595fb368..af7676a0 100644
--- a/src/TimeSeedCriteria.h
+++ b/src/TimeSeedCriteria.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_TIME_SEED_CRITERIA_H_
-#define _D_TIME_SEED_CRITERIA_H_
+#ifndef D_TIME_SEED_CRITERIA_H
+#define D_TIME_SEED_CRITERIA_H
 
 #include "SeedCriteria.h"
 #include "TimerA2.h"
@@ -69,4 +69,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_TIME_SEED_CRITERIA_H_
+#endif // D_TIME_SEED_CRITERIA_H
diff --git a/src/TimedHaltCommand.h b/src/TimedHaltCommand.h
index bbac55d4..c5052706 100644
--- a/src/TimedHaltCommand.h
+++ b/src/TimedHaltCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_TIMED_HALT_COMMAND_H_
-#define _D_TIMED_HALT_COMMAND_H_
+#ifndef D_TIMED_HALT_COMMAND_H
+#define D_TIMED_HALT_COMMAND_H
 
 #include "TimeBasedCommand.h"
 
@@ -55,4 +55,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_TIMED_HALT_COMMAND_H_
+#endif // D_TIMED_HALT_COMMAND_H
diff --git a/src/TimerA2.h b/src/TimerA2.h
index 830bd4b5..42235fac 100644
--- a/src/TimerA2.h
+++ b/src/TimerA2.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_TIMER_A2_H_
-#define _D_TIMER_A2_H_
+#ifndef D_TIMER_A2_H
+#define D_TIMER_A2_H
 
 #include "common.h"
 #include "a2time.h"
@@ -102,4 +102,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_TIMER_A2_H_
+#endif // D_TIMER_A2_H
diff --git a/src/TrackerWatcherCommand.h b/src/TrackerWatcherCommand.h
index bc4a7251..a38bc815 100644
--- a/src/TrackerWatcherCommand.h
+++ b/src/TrackerWatcherCommand.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_TRACKER_WATCHER_COMMAND_H_
-#define _D_TRACKER_WATCHER_COMMAND_H_
+#ifndef D_TRACKER_WATCHER_COMMAND_H
+#define D_TRACKER_WATCHER_COMMAND_H
 
 #include "Command.h"
 #include "SharedHandle.h"
@@ -97,4 +97,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_TRACKER_WATCHER_COMMAND_H_
+#endif // D_TRACKER_WATCHER_COMMAND_H
diff --git a/src/TransferStat.h b/src/TransferStat.h
index e791bb14..b8ffef46 100644
--- a/src/TransferStat.h
+++ b/src/TransferStat.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_TRANSFER_STAT_H_
-#define _D_TRANSFER_STAT_H_
+#ifndef D_TRANSFER_STAT_H
+#define D_TRANSFER_STAT_H
 
 #include "common.h"
 #include <stdint.h>
@@ -131,4 +131,4 @@ TransferStat operator-(const TransferStat& a, const TransferStat& b);
 
 } // namespace aria2
 
-#endif // _D_TRANSFER_STAT_H_
+#endif // D_TRANSFER_STAT_H
diff --git a/src/TrueRequestGroupCriteria.h b/src/TrueRequestGroupCriteria.h
index 9702f4bf..3f8e0911 100644
--- a/src/TrueRequestGroupCriteria.h
+++ b/src/TrueRequestGroupCriteria.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_TRUE_REQUEST_GROUP_CRITERIA_H_
-#define _D_TRUE_REQUEST_GROUP_CRITERIA_H_
+#ifndef D_TRUE_REQUEST_GROUP_CRITERIA_H
+#define D_TRUE_REQUEST_GROUP_CRITERIA_H
 
 #include "RequestGroupCriteria.h"
 
@@ -54,4 +54,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_TRUE_REQUEST_GROUP_CRITERIA_H_
+#endif // D_TRUE_REQUEST_GROUP_CRITERIA_H
diff --git a/src/URIResult.h b/src/URIResult.h
index 4000300f..bef47b34 100644
--- a/src/URIResult.h
+++ b/src/URIResult.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_URI_RESULT_H_
-#define _D_URI_RESULT_H_
+#ifndef D_URI_RESULT_H
+#define D_URI_RESULT_H
 
 #include "common.h"
 
@@ -66,4 +66,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_URI_RESULT_H_
+#endif // D_URI_RESULT_H
diff --git a/src/URISelector.h b/src/URISelector.h
index d05c020b..78bab46e 100644
--- a/src/URISelector.h
+++ b/src/URISelector.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_URI_SELECTOR_H_
-#define _D_URI_SELECTOR_H_
+#ifndef D_URI_SELECTOR_H
+#define D_URI_SELECTOR_H
 #include "common.h"
 
 #include <string>
@@ -61,4 +61,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_URI_SELECTOR_H_
+#endif // D_URI_SELECTOR_H
diff --git a/src/UTMetadataDataExtensionMessage.h b/src/UTMetadataDataExtensionMessage.h
index 1c032786..a79aa8ea 100644
--- a/src/UTMetadataDataExtensionMessage.h
+++ b/src/UTMetadataDataExtensionMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_UT_METADATA_DATA_EXTENSION_MESSAGE_H_
-#define _D_UT_METADATA_DATA_EXTENSION_MESSAGE_H_
+#ifndef D_UT_METADATA_DATA_EXTENSION_MESSAGE_H
+#define D_UT_METADATA_DATA_EXTENSION_MESSAGE_H
 
 #include "UTMetadataExtensionMessage.h"
 
@@ -105,4 +105,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_UT_METADATA_DATA_EXTENSION_MESSAGE_H_
+#endif // D_UT_METADATA_DATA_EXTENSION_MESSAGE_H
diff --git a/src/UTMetadataExtensionMessage.h b/src/UTMetadataExtensionMessage.h
index 54752d4f..4fa47f7e 100644
--- a/src/UTMetadataExtensionMessage.h
+++ b/src/UTMetadataExtensionMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_UT_METADATA_EXTENSION_MESSAGE_H_
-#define _D_UT_METADATA_EXTENSION_MESSAGE_H_
+#ifndef D_UT_METADATA_EXTENSION_MESSAGE_H
+#define D_UT_METADATA_EXTENSION_MESSAGE_H
 
 #include "ExtensionMessage.h"
 
@@ -72,4 +72,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_UT_METADATA_EXTENSION_MESSAGE_H_
+#endif // D_UT_METADATA_EXTENSION_MESSAGE_H
diff --git a/src/UTMetadataPostDownloadHandler.h b/src/UTMetadataPostDownloadHandler.h
index 318ab351..0e8293ef 100644
--- a/src/UTMetadataPostDownloadHandler.h
+++ b/src/UTMetadataPostDownloadHandler.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_UT_METADATA_POST_DOWNLOAD_HANDLER_H_
-#define _D_UT_METADATA_POST_DOWNLOAD_HANDLER_H_
+#ifndef D_UT_METADATA_POST_DOWNLOAD_HANDLER_H
+#define D_UT_METADATA_POST_DOWNLOAD_HANDLER_H
 
 #include "PostDownloadHandler.h"
 #include "RequestGroupCriteria.h"
@@ -62,4 +62,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_UT_METADATA_POST_DOWNLOAD_HANDLER_H_
+#endif // D_UT_METADATA_POST_DOWNLOAD_HANDLER_H
diff --git a/src/UTMetadataRejectExtensionMessage.h b/src/UTMetadataRejectExtensionMessage.h
index 54c0f604..6c596814 100644
--- a/src/UTMetadataRejectExtensionMessage.h
+++ b/src/UTMetadataRejectExtensionMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_UT_METADATA_REJECT_EXTENSION_MESSAGE_H_
-#define _D_UT_METADATA_REJECT_EXTENSION_MESSAGE_H_
+#ifndef D_UT_METADATA_REJECT_EXTENSION_MESSAGE_H
+#define D_UT_METADATA_REJECT_EXTENSION_MESSAGE_H
 
 #include "UTMetadataExtensionMessage.h"
 
@@ -52,4 +52,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_UT_METADATA_REJECT_EXTENSION_MESSAGE_H_
+#endif // D_UT_METADATA_REJECT_EXTENSION_MESSAGE_H
diff --git a/src/UTMetadataRequestExtensionMessage.h b/src/UTMetadataRequestExtensionMessage.h
index ead2c047..28ba0cfe 100644
--- a/src/UTMetadataRequestExtensionMessage.h
+++ b/src/UTMetadataRequestExtensionMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_UT_METADATA_REQUEST_EXTENSION_MESSAGE_H_
-#define _D_UT_METADATA_REQUEST_EXTENSION_MESSAGE_H_
+#ifndef D_UT_METADATA_REQUEST_EXTENSION_MESSAGE_H
+#define D_UT_METADATA_REQUEST_EXTENSION_MESSAGE_H
 
 #include "UTMetadataExtensionMessage.h"
 
@@ -85,4 +85,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_UT_METADATA_REQUEST_EXTENSION_MESSAGE_H_
+#endif // D_UT_METADATA_REQUEST_EXTENSION_MESSAGE_H
diff --git a/src/UTMetadataRequestFactory.h b/src/UTMetadataRequestFactory.h
index fa47f1b6..3826b1f1 100644
--- a/src/UTMetadataRequestFactory.h
+++ b/src/UTMetadataRequestFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _UT_METADATA_REQUEST_FACTORY_H_
-#define _UT_METADATA_REQUEST_FACTORY_H_
+#ifndef D_UT_METADATA_REQUEST_FACTORY_H
+#define D_UT_METADATA_REQUEST_FACTORY_H
 
 #include "common.h"
 
@@ -102,4 +102,4 @@ public:
 
 } // namespace aria2
 
-#endif // _UT_METADATA_REQUEST_FACTORY_H_
+#endif // D_UT_METADATA_REQUEST_FACTORY_H
diff --git a/src/UTMetadataRequestTracker.h b/src/UTMetadataRequestTracker.h
index 5086dd16..fbd93770 100644
--- a/src/UTMetadataRequestTracker.h
+++ b/src/UTMetadataRequestTracker.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _UT_METADATA_REQUEST_TRACKER_H_
-#define _UT_METADATA_REQUEST_TRACKER_H_
+#ifndef D_UT_METADATA_REQUEST_TRACKER_H
+#define D_UT_METADATA_REQUEST_TRACKER_H
 
 #include "common.h"
 
@@ -98,4 +98,4 @@ public:
 
 } // namespace aria2
 
-#endif // _UT_METADATA_REQUEST_TRACKER_H_
+#endif // D_UT_METADATA_REQUEST_TRACKER_H
diff --git a/src/UTPexExtensionMessage.h b/src/UTPexExtensionMessage.h
index 8c554b4c..b74b7ccd 100644
--- a/src/UTPexExtensionMessage.h
+++ b/src/UTPexExtensionMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_UT_PEX_EXTENSION_MESSAGE_H_
-#define _D_UT_PEX_EXTENSION_MESSAGE_H_
+#ifndef D_UT_PEX_EXTENSION_MESSAGE_H
+#define D_UT_PEX_EXTENSION_MESSAGE_H
 
 #include "ExtensionMessage.h"
 
@@ -141,4 +141,4 @@ typedef SharedHandle<UTPexExtensionMessage> UTPexExtensionMessageHandle;
 
 } // namespace aria2
 
-#endif // _D_UT_PEX_EXTENSION_MESSAGE_H_
+#endif // D_UT_PEX_EXTENSION_MESSAGE_H
diff --git a/src/UnionSeedCriteria.h b/src/UnionSeedCriteria.h
index 32beab97..bcb9b7a8 100644
--- a/src/UnionSeedCriteria.h
+++ b/src/UnionSeedCriteria.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_UNION_SEED_CRITERIA_H_
-#define _D_UNION_SEED_CRITERIA_H_
+#ifndef D_UNION_SEED_CRITERIA_H
+#define D_UNION_SEED_CRITERIA_H
 
 #include "SeedCriteria.h"
 #include <algorithm>
@@ -90,4 +90,4 @@ public:
 
 } // namespace aria2
       
-#endif // _D_UNION_SEED_CRITERIA_H_
+#endif // D_UNION_SEED_CRITERIA_H
diff --git a/src/UnknownLengthPieceStorage.h b/src/UnknownLengthPieceStorage.h
index 4f42ec4e..c1b7d4f2 100644
--- a/src/UnknownLengthPieceStorage.h
+++ b/src/UnknownLengthPieceStorage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_UNKNOWN_LENGTH_PIECE_STORAGE_H_
-#define _D_UNKNOWN_LENGTH_PIECE_STORAGE_H_
+#ifndef D_UNKNOWN_LENGTH_PIECE_STORAGE_H
+#define D_UNKNOWN_LENGTH_PIECE_STORAGE_H
 
 #include "PieceStorage.h"
 
@@ -287,4 +287,4 @@ typedef SharedHandle<UnknownLengthPieceStorage> UnknownLengthPieceStorageHandle;
 
 } // namespace aria2
 
-#endif // _D_UNKNOWN_LENGTH_PIECE_STORAGE_H_
+#endif // D_UNKNOWN_LENGTH_PIECE_STORAGE_H
diff --git a/src/UriListParser.h b/src/UriListParser.h
index a1acacba..7ba9970e 100644
--- a/src/UriListParser.h
+++ b/src/UriListParser.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_URI_LIST_PARSER_H_
-#define _D_URI_LIST_PARSER_H_
+#ifndef D_URI_LIST_PARSER_H
+#define D_URI_LIST_PARSER_H
 
 #include "common.h"
 
@@ -67,4 +67,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_URI_LIST_PARSER_H_
+#endif // D_URI_LIST_PARSER_H
diff --git a/src/XML2SAXMetalinkProcessor.h b/src/XML2SAXMetalinkProcessor.h
index bef4255b..54068ebe 100644
--- a/src/XML2SAXMetalinkProcessor.h
+++ b/src/XML2SAXMetalinkProcessor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML2_SAX_METALINK_PROCESSOR_H_
-#define _D_XML2_SAX_METALINK_PROCESSOR_H_
+#ifndef D_XML2_SAX_METALINK_PROCESSOR_H
+#define D_XML2_SAX_METALINK_PROCESSOR_H
 
 #include "common.h"
 
@@ -62,4 +62,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_XML2_SAX_METALINK_PROCESSOR_H_
+#endif // D_XML2_SAX_METALINK_PROCESSOR_H
diff --git a/src/XORCloser.h b/src/XORCloser.h
index 720e8af6..6950a156 100644
--- a/src/XORCloser.h
+++ b/src/XORCloser.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XOR_CLOSER_H_
-#define _D_XOR_CLOSER_H_
+#ifndef D_XOR_CLOSER_H
+#define D_XOR_CLOSER_H
 
 #include "common.h"
 
@@ -67,4 +67,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_XOR_CLOSER_H_
+#endif // D_XOR_CLOSER_H
diff --git a/src/Xml2XmlRpcRequestProcessor.h b/src/Xml2XmlRpcRequestProcessor.h
index cb4e413d..0fe9092a 100644
--- a/src/Xml2XmlRpcRequestProcessor.h
+++ b/src/Xml2XmlRpcRequestProcessor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML2_XML_RPC_REQUEST_PROCESSOR_H_
-#define _D_XML2_XML_RPC_REQUEST_PROCESSOR_H_
+#ifndef D_XML2_XML_RPC_REQUEST_PROCESSOR_H
+#define D_XML2_XML_RPC_REQUEST_PROCESSOR_H
 
 #include "common.h"
 
@@ -59,4 +59,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_XML2_XML_RPC_REQUEST_PROCESSOR_H_
+#endif // D_XML2_XML_RPC_REQUEST_PROCESSOR_H
diff --git a/src/XmlRpcElements.h b/src/XmlRpcElements.h
index 27f94a97..3afa045a 100644
--- a/src/XmlRpcElements.h
+++ b/src/XmlRpcElements.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML_RPC_ELEMENTS_H_
-#define _D_XML_RPC_ELEMENTS_H_
+#ifndef D_XML_RPC_ELEMENTS_H
+#define D_XML_RPC_ELEMENTS_H
 
 #include "common.h"
 
@@ -65,4 +65,4 @@ extern const std::string DATA;
 } // namespace xmlrpc
 } // namespace aria2
 
-#endif // _D_XML_RPC_ELEMENTS_H_
+#endif // D_XML_RPC_ELEMENTS_H
diff --git a/src/XmlRpcMethod.h b/src/XmlRpcMethod.h
index 75a1ee26..e51efe5c 100644
--- a/src/XmlRpcMethod.h
+++ b/src/XmlRpcMethod.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML_RPC_METHOD_H_
-#define _D_XML_RPC_METHOD_H_
+#ifndef D_XML_RPC_METHOD_H
+#define D_XML_RPC_METHOD_H
 
 #include "common.h"
 
@@ -111,4 +111,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_XML_RPC_METHOD_H_
+#endif // D_XML_RPC_METHOD_H
diff --git a/src/XmlRpcMethodFactory.h b/src/XmlRpcMethodFactory.h
index 70c9bd29..468345fd 100644
--- a/src/XmlRpcMethodFactory.h
+++ b/src/XmlRpcMethodFactory.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML_RPC_METHOD_FACTORY_H_
-#define _D_XML_RPC_METHOD_FACTORY_H_
+#ifndef D_XML_RPC_METHOD_FACTORY_H
+#define D_XML_RPC_METHOD_FACTORY_H
 
 #include "common.h"
 
@@ -56,4 +56,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_XML_RPC_METHOD_FACTORY_H_
+#endif // D_XML_RPC_METHOD_FACTORY_H
diff --git a/src/XmlRpcMethodImpl.h b/src/XmlRpcMethodImpl.h
index 2663bdd9..d327a2c2 100644
--- a/src/XmlRpcMethodImpl.h
+++ b/src/XmlRpcMethodImpl.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML_RPC_METHOD_IMPL_H_
-#define _D_XML_RPC_METHOD_IMPL_H_
+#ifndef D_XML_RPC_METHOD_IMPL_H
+#define D_XML_RPC_METHOD_IMPL_H
 
 #include "XmlRpcMethod.h"
 
@@ -571,4 +571,4 @@ void gatherBitTorrentMetadata
 
 } // namespace aria2
 
-#endif // _D_XML_RPC_METHOD_IMPL_H_
+#endif // D_XML_RPC_METHOD_IMPL_H
diff --git a/src/XmlRpcRequest.h b/src/XmlRpcRequest.h
index 2800b192..3d338aef 100644
--- a/src/XmlRpcRequest.h
+++ b/src/XmlRpcRequest.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML_RPC_REQUEST_H_
-#define _D_XML_RPC_REQUEST_H_
+#ifndef D_XML_RPC_REQUEST_H
+#define D_XML_RPC_REQUEST_H
 
 #include "common.h"
 
@@ -66,4 +66,4 @@ struct XmlRpcRequest {
 
 } // namespace aria2
 
-#endif // _D_XML_RPC_REQUEST_H_
+#endif // D_XML_RPC_REQUEST_H
diff --git a/src/XmlRpcRequestParserController.h b/src/XmlRpcRequestParserController.h
index 1dae11b3..0051352e 100644
--- a/src/XmlRpcRequestParserController.h
+++ b/src/XmlRpcRequestParserController.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML_RPC_REQUEST_PARSER_CONTROLLER_H_
-#define _D_XML_RPC_REQUEST_PARSER_CONTROLLER_H_
+#ifndef D_XML_RPC_REQUEST_PARSER_CONTROLLER_H
+#define D_XML_RPC_REQUEST_PARSER_CONTROLLER_H
 
 #include "common.h"
 
@@ -93,4 +93,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_XML_RPC_REQUEST_PARSER_CONTROLLER_H_
+#endif // D_XML_RPC_REQUEST_PARSER_CONTROLLER_H
diff --git a/src/XmlRpcRequestParserState.h b/src/XmlRpcRequestParserState.h
index 0284b322..885e228f 100644
--- a/src/XmlRpcRequestParserState.h
+++ b/src/XmlRpcRequestParserState.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML_RPC_REQUEST_PARSER_STATE_H_
-#define _D_XML_RPC_REQUEST_PARSER_STATE_H_
+#ifndef D_XML_RPC_REQUEST_PARSER_STATE_H
+#define D_XML_RPC_REQUEST_PARSER_STATE_H
 
 #include "common.h"
 
@@ -65,4 +65,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_XML_RPC_REQUEST_PARSER_STATE_H_
+#endif // D_XML_RPC_REQUEST_PARSER_STATE_H
diff --git a/src/XmlRpcRequestParserStateImpl.h b/src/XmlRpcRequestParserStateImpl.h
index b7eefd30..1f3cd2d8 100644
--- a/src/XmlRpcRequestParserStateImpl.h
+++ b/src/XmlRpcRequestParserStateImpl.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML_RPC_REQUEST_PARSER_STATE_IMPL_H_
-#define _D_XML_RPC_REQUEST_PARSER_STATE_IMPL_H_
+#ifndef D_XML_RPC_REQUEST_PARSER_STATE_IMPL_H
+#define D_XML_RPC_REQUEST_PARSER_STATE_IMPL_H
 
 #include "XmlRpcRequestParserState.h"
 
@@ -235,4 +235,4 @@ class ArrayValueXmlRpcRequestParserState:public ValueXmlRpcRequestParserState {
 
 } // namespace aria2
 
-#endif // _D_XML_RPC_REQUEST_PARSER_STATE_IMPL_H_
+#endif // D_XML_RPC_REQUEST_PARSER_STATE_IMPL_H
diff --git a/src/XmlRpcRequestParserStateMachine.h b/src/XmlRpcRequestParserStateMachine.h
index 4923c041..44149bf2 100644
--- a/src/XmlRpcRequestParserStateMachine.h
+++ b/src/XmlRpcRequestParserStateMachine.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML_RPC_REQUEST_PARSER_STATE_MACHINE_H_
-#define _D_XML_RPC_REQUEST_PARSER_STATE_MACHINE_H_
+#ifndef D_XML_RPC_REQUEST_PARSER_STATE_MACHINE_H
+#define D_XML_RPC_REQUEST_PARSER_STATE_MACHINE_H
 
 #include "common.h"
 
@@ -169,4 +169,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_XML_RPC_REQUEST_PARSER_STATE_MACHINE_H_
+#endif // D_XML_RPC_REQUEST_PARSER_STATE_MACHINE_H
diff --git a/src/XmlRpcRequestProcessor.h b/src/XmlRpcRequestProcessor.h
index c2256c03..7b8bb17b 100644
--- a/src/XmlRpcRequestProcessor.h
+++ b/src/XmlRpcRequestProcessor.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML_RPC_REQUEST_PROCESSOR_H_
-#define _D_XML_RPC_REQUEST_PROCESSOR_H_
+#ifndef D_XML_RPC_REQUEST_PROCESSOR_H
+#define D_XML_RPC_REQUEST_PROCESSOR_H
 
 #include "common.h"
 
@@ -43,4 +43,4 @@
 # include "ExpatXmlRpcRequestProcessor.h"
 #endif // HAVE_LIBEXPAT
 
-#endif // _D_XML_RPC_REQUEST_PROCESSOR_H_
+#endif // D_XML_RPC_REQUEST_PROCESSOR_H
diff --git a/src/XmlRpcResponse.h b/src/XmlRpcResponse.h
index a3106ff0..e784ba60 100644
--- a/src/XmlRpcResponse.h
+++ b/src/XmlRpcResponse.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_XML_RPC_RESPONSE_H_
-#define _D_XML_RPC_RESPONSE_H_
+#ifndef D_XML_RPC_RESPONSE_H
+#define D_XML_RPC_RESPONSE_H
 
 #include "common.h"
 
@@ -61,4 +61,4 @@ struct XmlRpcResponse {
 
 } // namespace aria2
 
-#endif // _D_XML_RPC_RESPONSE_H_
+#endif // D_XML_RPC_RESPONSE_H
diff --git a/src/ZeroBtMessage.h b/src/ZeroBtMessage.h
index a7c70ef1..f719318f 100644
--- a/src/ZeroBtMessage.h
+++ b/src/ZeroBtMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ZERO_BT_MESSAGE_H_
-#define _D_ZERO_BT_MESSAGE_H_
+#ifndef D_ZERO_BT_MESSAGE_H
+#define D_ZERO_BT_MESSAGE_H
 
 #include "SimpleBtMessage.h"
 #include "bittorrent_helper.h"
@@ -66,4 +66,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_ZERO_BT_MESSAGE_H_
+#endif // D_ZERO_BT_MESSAGE_H
diff --git a/src/a2algo.h b/src/a2algo.h
index 22fbf676..f7cdc43b 100644
--- a/src/a2algo.h
+++ b/src/a2algo.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_A2_ALGO_H_
-#define _D_A2_ALGO_H_
+#ifndef D_A2_ALGO_H
+#define D_A2_ALGO_H
 
 #include <algorithm>
 
@@ -120,4 +120,4 @@ InputIterator find_wrap_if
 
 } // namespace aria2
 
-#endif // _D_A2_ALGO_H_
+#endif // D_A2_ALGO_H
diff --git a/src/a2functional.h b/src/a2functional.h
index 5b101261..7b90cf9e 100644
--- a/src/a2functional.h
+++ b/src/a2functional.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_A2_FUNCTIONAL_H_
-#define _D_A2_FUNCTIONAL_H_
+#ifndef D_A2_FUNCTIONAL_H
+#define D_A2_FUNCTIONAL_H
 
 #include <functional>
 #include <string>
@@ -433,4 +433,4 @@ bool in(T x, S s, S t)
 
 } // namespace aria2
 
-#endif // _D_A2_FUNCTIONAL_H_
+#endif // D_A2_FUNCTIONAL_H
diff --git a/src/a2io.h b/src/a2io.h
index ac0ca4d9..3b065bc9 100644
--- a/src/a2io.h
+++ b/src/a2io.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_A2IO_H_
-#define _D_A2IO_H_
+#ifndef D_A2IO_H
+#define D_A2IO_H
 #include "common.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -144,4 +144,4 @@
 #define OPEN_MODE S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH
 #define DIR_OPEN_MODE S_IRWXU|S_IRWXG|S_IRWXO
 
-#endif // _D_A2IO_H_
+#endif // D_A2IO_H
diff --git a/src/a2netcompat.h b/src/a2netcompat.h
index 068ba536..f19efd18 100644
--- a/src/a2netcompat.h
+++ b/src/a2netcompat.h
@@ -31,8 +31,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_A2NETCOMPAT_H_
-#define _D_A2NETCOMPAT_H_
+#ifndef D_A2NETCOMPAT_H
+#define D_A2NETCOMPAT_H
 
 #include "a2io.h"
 
@@ -126,4 +126,4 @@ public:
 # define WSAAPI_AUTO_DELETE auto_delete
 #endif // !__MINGW32__
 
-#endif // _D_A2NETCOMPAT_H_
+#endif // D_A2NETCOMPAT_H
diff --git a/src/a2time.h b/src/a2time.h
index 0576fdb4..86c94224 100644
--- a/src/a2time.h
+++ b/src/a2time.h
@@ -31,8 +31,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_A2TIME_H_
-#define _D_A2TIME_H_
+#ifndef D_A2TIME_H
+#define D_A2TIME_H
 
 #include <time.h>
 #include <sys/time.h>
@@ -75,4 +75,4 @@
 # endif // !__MINGW32__
 #endif // !HAVE_CLOCK_GETTIME
 
-#endif // _D_A2TIME_H_
+#endif // D_A2TIME_H
diff --git a/src/array_fun.h b/src/array_fun.h
index 4e4951b4..897a7a8b 100644
--- a/src/array_fun.h
+++ b/src/array_fun.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_ARRAY_FUN_H_
-#define _D_ARRAY_FUN_H_
+#ifndef D_ARRAY_FUN_H
+#define D_ARRAY_FUN_H
 
 #include <cstdlib>
 #include <functional>
@@ -215,4 +215,4 @@ operator~(const A& a)
 
 } // namespace aria2
 
-#endif // _D_ARRAY_FUN_H_
+#endif // D_ARRAY_FUN_H
diff --git a/src/base32.h b/src/base32.h
index e068f721..0065b62c 100644
--- a/src/base32.h
+++ b/src/base32.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BASE32_H_
-#define _D_BASE32_H_
+#ifndef D_BASE32_H
+#define D_BASE32_H
 
 #include "common.h"
 
@@ -51,4 +51,4 @@ std::string decode(const std::string& src);
 
 } // namespace aria2
 
-#endif // _D_BASE32_H_
+#endif // D_BASE32_H
diff --git a/src/bencode2.h b/src/bencode2.h
index 27f2896b..7f4e226f 100644
--- a/src/bencode2.h
+++ b/src/bencode2.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BENCODE2_H_
-#define _D_BENCODE2_H_
+#ifndef D_BENCODE2_H
+#define D_BENCODE2_H
 
 #include "common.h"
 
@@ -72,4 +72,4 @@ std::string encode(const SharedHandle<ValueBase>& vlb);
 
 } // namespace aria2
 
-#endif // _D_BENCODE2_H_
+#endif // D_BENCODE2_H
diff --git a/src/bitfield.h b/src/bitfield.h
index eaf3f0a0..39313a19 100644
--- a/src/bitfield.h
+++ b/src/bitfield.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BITFIELD_H_
-#define _D_BITFIELD_H_
+#ifndef D_BITFIELD_H
+#define D_BITFIELD_H
 
 #include "common.h"
 
@@ -178,4 +178,4 @@ size_t getFirstNMissingIndex
 
 } // namespace aria2
 
-#endif // _D_BITFIELD_H_
+#endif // D_BITFIELD_H
diff --git a/src/bittorrent_helper.h b/src/bittorrent_helper.h
index 3efadf37..3259bf7c 100644
--- a/src/bittorrent_helper.h
+++ b/src/bittorrent_helper.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_BITTORRENT_HELPER_H_
-#define _D_BITTORRENT_HELPER_H_
+#ifndef D_BITTORRENT_HELPER_H
+#define D_BITTORRENT_HELPER_H
 
 #include "common.h"
 
@@ -319,4 +319,4 @@ int getCompactLength(int family);
 
 } // namespace aria2
 
-#endif // _D_BITTORRENT_HELPER_H_
+#endif // D_BITTORRENT_HELPER_H
diff --git a/src/clock_gettime_mingw.h b/src/clock_gettime_mingw.h
index 1b1f4815..24637674 100644
--- a/src/clock_gettime_mingw.h
+++ b/src/clock_gettime_mingw.h
@@ -31,11 +31,11 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CLOCK_GETTIME_MINGW_H_
-#define _D_CLOCK_GETTIME_MINGW_H_
+#ifndef D_CLOCK_GETTIME_MINGW_H
+#define D_CLOCK_GETTIME_MINGW_H
 
 #include "timespec.h"
 
 int clock_gettime(int dummyid, struct timespec* tp);
 
-#endif // _D_CLOCK_GETTIME_MINGW_H_
+#endif // D_CLOCK_GETTIME_MINGW_H
diff --git a/src/clock_gettime_osx.h b/src/clock_gettime_osx.h
index 8ede9b27..1fa39d42 100644
--- a/src/clock_gettime_osx.h
+++ b/src/clock_gettime_osx.h
@@ -31,11 +31,11 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_CLOCK_GETTIME_OSX_H_
-#define _D_CLOCK_GETTIME_OSX_H_
+#ifndef D_CLOCK_GETTIME_OSX_H
+#define D_CLOCK_GETTIME_OSX_H
 
 #include "timespec.h"
 
 int clock_gettime(int dummyid, struct timespec* tp);
 
-#endif // _D_CLOCK_GETTIME_OSX_H_
+#endif // D_CLOCK_GETTIME_OSX_H
diff --git a/src/common.h b/src/common.h
index 46420cb5..a41796b7 100644
--- a/src/common.h
+++ b/src/common.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_COMMON_H_
-#define _D_COMMON_H_
+#ifndef D_COMMON_H
+#define D_COMMON_H
 
 #ifdef __MINGW32__
 # undef SIZE_MAX
@@ -71,4 +71,4 @@ typedef _off_t off_t;
 // included here for compatibility issues with old compiler/libraries.
 #include <stdint.h>
 
-#endif // _D_COMMON_H_
+#endif // D_COMMON_H
diff --git a/src/daemon.h b/src/daemon.h
index 70537816..1b3c9e66 100644
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DAEMON_H_
-#define _D_DAEMON_H_
+#ifndef D_DAEMON_H
+#define D_DAEMON_H
 
 #include "common.h"
 
@@ -47,4 +47,4 @@ int daemon(int nochdir, int noclose);
 
 } // namespace aria2
 
-#endif // _D_DAEMON_H_
+#endif // D_DAEMON_H
diff --git a/src/download_helper.h b/src/download_helper.h
index c7edfcd3..47df07cd 100644
--- a/src/download_helper.h
+++ b/src/download_helper.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_DOWNLOAD_HELPER_H_
-#define _D_DOWNLOAD_HELPER_H_
+#ifndef D_DOWNLOAD_HELPER_H
+#define D_DOWNLOAD_HELPER_H
 
 #include "common.h"
 
@@ -109,4 +109,4 @@ createMetadataInfoFromFirstFileEntry(const SharedHandle<DownloadContext>& dctx);
 
 } // namespace aria2
 
-#endif // _D_DOWNLOAD_HELPER_H_
+#endif // D_DOWNLOAD_HELPER_H
diff --git a/src/help_tags.h b/src/help_tags.h
index 4d34f9c8..343505b0 100644
--- a/src/help_tags.h
+++ b/src/help_tags.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_HELP_TAGS_H_
-#define _D_HELP_TAGS_H_
+#ifndef D_HELP_TAGS_H
+#define D_HELP_TAGS_H
 
 #define TAG_BASIC "#basic"
 #define TAG_ADVANCED "#advanced"
@@ -50,4 +50,4 @@
 #define TAG_HELP "#help"
 #define TAG_ALL "#all"
 
-#endif // _D_HELP_TAGS_H_
+#endif // D_HELP_TAGS_H
diff --git a/src/magnet.h b/src/magnet.h
index ea7cd2be..d2de23c7 100644
--- a/src/magnet.h
+++ b/src/magnet.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_MAGNET_H_
-#define _D_MAGNET_H_
+#ifndef D_MAGNET_H
+#define D_MAGNET_H
 
 #include "common.h"
 #include "ValueBase.h"
@@ -54,4 +54,4 @@ SharedHandle<Dict> parse(const std::string& magnet);
 } // namespace aria2
 
 
-#endif // _D_MAGNET_H_
+#endif // D_MAGNET_H
diff --git a/src/message.h b/src/message.h
index 647e633c..e04ab897 100644
--- a/src/message.h
+++ b/src/message.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_MESSAGE_H_
-#define _D_MESSAGE_H_
+#ifndef D_MESSAGE_H
+#define D_MESSAGE_H
 
 #include "common.h"
 
@@ -273,4 +273,4 @@
 #define EX_EXCEPTION_CAUGHT _("Exception caught")
 #define EX_TOO_LONG_PAYLOAD _("Max payload length exceeded or invalid. length = %u")
 #define EX_FILE_LENGTH_MISMATCH_BETWEEN_LOCAL_AND_REMOTE _("Invalid file length. Cannot continue download %s: local %s, remote %s")
-#endif // _D_MESSAGE_H_
+#endif // D_MESSAGE_H
diff --git a/src/messageDigest.h b/src/messageDigest.h
index 590183b6..f19be4ba 100644
--- a/src/messageDigest.h
+++ b/src/messageDigest.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_MESSAGE_DIGEST_H_
-#define _D_MESSAGE_DIGEST_H_
+#ifndef D_MESSAGE_DIGEST_H
+#define D_MESSAGE_DIGEST_H
 
 #include "common.h"
 
@@ -198,4 +198,4 @@ typedef SharedHandle<MessageDigestContext> MessageDigestContextHandle;
 
 } // namespace aria2
 
-#endif // _D_MESSAGE_DIGEST_H_
+#endif // D_MESSAGE_DIGEST_H
diff --git a/src/prefs.h b/src/prefs.h
index e7cc0700..f20a80e2 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_PREFS_H_
-#define _D_PREFS_H_
+#ifndef D_PREFS_H
+#define D_PREFS_H
 
 #include "common.h"
 #include <string>
@@ -412,4 +412,4 @@ extern const std::string PREF_METALINK_ENABLE_UNIQUE_PROTOCOL;
 
 } // namespace aria2
 
-#endif // _D_PREFS_H_
+#endif // D_PREFS_H
diff --git a/src/timegm.h b/src/timegm.h
index 6a78bcf4..f16a1616 100644
--- a/src/timegm.h
+++ b/src/timegm.h
@@ -31,8 +31,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_TIMEGM_H_
-#define _D_TIMEGM_H_
+#ifndef D_TIMEGM_H
+#define D_TIMEGM_H
 
 #ifdef __MINGW32__
 # undef SIZE_MAX
@@ -58,4 +58,4 @@ time_t timegm(struct tm *tm);
 }
 #endif /* __cplusplus */
 
-#endif // _D_TIMEGM_H_
+#endif // D_TIMEGM_H
diff --git a/src/timespec.h b/src/timespec.h
index def9c726..ba941236 100644
--- a/src/timespec.h
+++ b/src/timespec.h
@@ -31,8 +31,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_TIMESPEC_H_
-#define _D_TIMESPEC_H_
+#ifndef D_TIMESPEC_H
+#define D_TIMESPEC_H
 
 #include "common.h"
 
@@ -42,4 +42,4 @@
 struct timespec { time_t tv_sec; long tv_nsec; };
 #endif // !HAVE_STRUCT_TIMESPEC
 
-#endif // _D_TIMESPEC_H_
+#endif // D_TIMESPEC_H
diff --git a/src/util.h b/src/util.h
index 12f37f1d..8c47bf04 100644
--- a/src/util.h
+++ b/src/util.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_UTIL_H_
-#define _D_UTIL_H_
+#ifndef D_UTIL_H
+#define D_UTIL_H
 
 #include "common.h"
 
@@ -431,4 +431,4 @@ std::string encodeNonUtf8(const std::string& s);
 
 } // namespace aria2
 
-#endif // _D_UTIL_H_
+#endif // D_UTIL_H
diff --git a/test/FixedNumberRandomizer.h b/test/FixedNumberRandomizer.h
index dacaad99..0e3be223 100644
--- a/test/FixedNumberRandomizer.h
+++ b/test/FixedNumberRandomizer.h
@@ -1,5 +1,5 @@
-#ifndef _D_FIXED_NUMBER_RANDOMIZER_H_
-#define _D_FIXED_NUMBER_RANDOMIZER_H_
+#ifndef D_FIXED_NUMBER_RANDOMIZER_H
+#define D_FIXED_NUMBER_RANDOMIZER_H
 
 #include "Randomizer.h"
 #include <cstdlib>
@@ -38,4 +38,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_FIXED_NUMBER_RANDOMIZER_H_
+#endif // D_FIXED_NUMBER_RANDOMIZER_H
diff --git a/test/InOrderPieceSelector.h b/test/InOrderPieceSelector.h
index cb174af2..efaafb8b 100644
--- a/test/InOrderPieceSelector.h
+++ b/test/InOrderPieceSelector.h
@@ -1,5 +1,5 @@
-#ifndef _D_IN_ORDER_PIECE_SELECTOR_H_
-#define _D_IN_ORDER_PIECE_SELECTOR_H_
+#ifndef D_IN_ORDER_PIECE_SELECTOR_H
+#define D_IN_ORDER_PIECE_SELECTOR_H
 
 #include "PieceSelector.h"
 #include "bitfield.h"
@@ -23,4 +23,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_IN_ORDER_PIECE_SELECTOR_H_
+#endif // D_IN_ORDER_PIECE_SELECTOR_H
diff --git a/test/MockBtAnnounce.h b/test/MockBtAnnounce.h
index 9d32ab70..c5a6df09 100644
--- a/test/MockBtAnnounce.h
+++ b/test/MockBtAnnounce.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_BT_ANNOUNCE_H_
-#define _D_MOCK_BT_ANNOUNCE_H_
+#ifndef D_MOCK_BT_ANNOUNCE_H
+#define D_MOCK_BT_ANNOUNCE_H
 
 #include "BtAnnounce.h"
 
@@ -65,4 +65,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_BT_ANNOUNCE_H_
+#endif // D_MOCK_BT_ANNOUNCE_H
diff --git a/test/MockBtMessage.h b/test/MockBtMessage.h
index fe3204af..ef4fb185 100644
--- a/test/MockBtMessage.h
+++ b/test/MockBtMessage.h
@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_MOCK_BT_MESSAGE_H_
-#define _D_MOCK_BT_MESSAGE_H_
+#ifndef D_MOCK_BT_MESSAGE_H
+#define D_MOCK_BT_MESSAGE_H
 
 #include "BtMessage.h"
 
@@ -107,4 +107,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_BT_MESSAGE_H_
+#endif // D_MOCK_BT_MESSAGE_H
diff --git a/test/MockBtMessageDispatcher.h b/test/MockBtMessageDispatcher.h
index 6b18f883..bdfdf3fe 100644
--- a/test/MockBtMessageDispatcher.h
+++ b/test/MockBtMessageDispatcher.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_BT_MESSAGE_DISPATCHER_H_
-#define _D_MOCK_BT_MESSAGE_DISPATCHER_H_
+#ifndef D_MOCK_BT_MESSAGE_DISPATCHER_H
+#define D_MOCK_BT_MESSAGE_DISPATCHER_H
 
 #include "BtMessageDispatcher.h"
 
@@ -72,4 +72,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_BT_MESSAGE_DISPATCHER_H_
+#endif // D_MOCK_BT_MESSAGE_DISPATCHER_H
diff --git a/test/MockBtMessageFactory.h b/test/MockBtMessageFactory.h
index fa0a56d2..1a2d491d 100644
--- a/test/MockBtMessageFactory.h
+++ b/test/MockBtMessageFactory.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_BT_MESSAGE_FACTORY_H_
-#define _D_MOCK_BT_MESSAGE_FACTORY_H_
+#ifndef D_MOCK_BT_MESSAGE_FACTORY_H
+#define D_MOCK_BT_MESSAGE_FACTORY_H
 
 #include "BtMessageFactory.h"
 
@@ -103,4 +103,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_BT_MESSAGE_FACTORY_H_
+#endif // D_MOCK_BT_MESSAGE_FACTORY_H
diff --git a/test/MockBtProgressInfoFile.h b/test/MockBtProgressInfoFile.h
index 7858636f..fb253e44 100644
--- a/test/MockBtProgressInfoFile.h
+++ b/test/MockBtProgressInfoFile.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_BT_PROGRESS_INFO_FILE_H_
-#define _D_MOCK_BT_PROGRESS_INFO_FILE_H_
+#ifndef D_MOCK_BT_PROGRESS_INFO_FILE_H
+#define D_MOCK_BT_PROGRESS_INFO_FILE_H
 
 #include "BtProgressInfoFile.h"
 
@@ -35,4 +35,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_BT_PROGRESS_INFO_FILE_H_
+#endif // D_MOCK_BT_PROGRESS_INFO_FILE_H
diff --git a/test/MockBtRequestFactory.h b/test/MockBtRequestFactory.h
index 77e97158..5dbf37ca 100644
--- a/test/MockBtRequestFactory.h
+++ b/test/MockBtRequestFactory.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_BT_REQUEST_FACTORY_H_
-#define _D_MOCK_BT_REQUEST_FACTORY_H_
+#ifndef D_MOCK_BT_REQUEST_FACTORY_H
+#define D_MOCK_BT_REQUEST_FACTORY_H
 
 #include "BtRequestFactory.h"
 
@@ -34,4 +34,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_BT_REQUEST_FACTORY_H_
+#endif // D_MOCK_BT_REQUEST_FACTORY_H
diff --git a/test/MockDHTMessage.h b/test/MockDHTMessage.h
index 665d61a4..bbd784d0 100644
--- a/test/MockDHTMessage.h
+++ b/test/MockDHTMessage.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_DHT_MESSAGE_H_
-#define _D_MOCK_DHT_MESSAGE_H_
+#ifndef D_MOCK_DHT_MESSAGE_H
+#define D_MOCK_DHT_MESSAGE_H
 
 #include "DHTMessage.h"
 #include "DHTQueryMessage.h"
@@ -115,4 +115,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_DHT_MESSAGE_H_
+#endif // D_MOCK_DHT_MESSAGE_H
diff --git a/test/MockDHTMessageCallback.h b/test/MockDHTMessageCallback.h
index 6929074d..79eb17d1 100644
--- a/test/MockDHTMessageCallback.h
+++ b/test/MockDHTMessageCallback.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_DHT_MESSAGE_CALLBACK_H_
-#define _D_MOCK_DHT_MESSAGE_CALLBACK_H_
+#ifndef D_MOCK_DHT_MESSAGE_CALLBACK_H
+#define D_MOCK_DHT_MESSAGE_CALLBACK_H
 
 #include "DHTMessageCallback.h"
 
@@ -24,4 +24,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_DHT_MESSAGE_CALLBACK_H_
+#endif // D_MOCK_DHT_MESSAGE_CALLBACK_H
diff --git a/test/MockDHTMessageDispatcher.h b/test/MockDHTMessageDispatcher.h
index a6e59899..a6400de3 100644
--- a/test/MockDHTMessageDispatcher.h
+++ b/test/MockDHTMessageDispatcher.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_DHT_MESSAGE_DISPATCHER_H_
-#define _D_MOCK_DHT_MESSAGE_DISPATCHER_H_
+#ifndef D_MOCK_DHT_MESSAGE_DISPATCHER_H
+#define D_MOCK_DHT_MESSAGE_DISPATCHER_H
 
 #include "DHTMessageDispatcher.h"
 #include "DHTMessageCallback.h"
@@ -57,4 +57,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_DHT_MESSAGE_DISPATCHER_H_
+#endif // D_MOCK_DHT_MESSAGE_DISPATCHER_H
diff --git a/test/MockDHTMessageFactory.h b/test/MockDHTMessageFactory.h
index 7382bd69..208dca33 100644
--- a/test/MockDHTMessageFactory.h
+++ b/test/MockDHTMessageFactory.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_DHT_MESSAGE_FACTORY_H_
-#define _D_MOCK_DHT_MESSAGE_FACTORY_H_
+#ifndef D_MOCK_DHT_MESSAGE_FACTORY_H
+#define D_MOCK_DHT_MESSAGE_FACTORY_H
 
 #include "DHTMessageFactory.h"
 #include "DHTNode.h"
@@ -120,4 +120,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_DHT_MESSAGE_FACTORY_H_
+#endif // D_MOCK_DHT_MESSAGE_FACTORY_H
diff --git a/test/MockDHTTask.h b/test/MockDHTTask.h
index 9dced596..bef43b83 100644
--- a/test/MockDHTTask.h
+++ b/test/MockDHTTask.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_DHT_TASK_H_
-#define _D_MOCK_DHT_TASK_H_
+#ifndef D_MOCK_DHT_TASK_H
+#define D_MOCK_DHT_TASK_H
 
 #include "DHTTask.h"
 
@@ -39,4 +39,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_DHT_TASK_H_
+#endif // D_MOCK_DHT_TASK_H
diff --git a/test/MockDHTTaskFactory.h b/test/MockDHTTaskFactory.h
index c3313d4f..53ce2fed 100644
--- a/test/MockDHTTaskFactory.h
+++ b/test/MockDHTTaskFactory.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_DHT_TASK_FACTORY_H_
-#define _D_MOCK_DHT_TASK_FACTORY_H_
+#ifndef D_MOCK_DHT_TASK_FACTORY_H
+#define D_MOCK_DHT_TASK_FACTORY_H
 
 #include "DHTTaskFactory.h"
 
@@ -58,4 +58,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_DHT_TASK_FACTORY_H_
+#endif // D_MOCK_DHT_TASK_FACTORY_H
diff --git a/test/MockDHTTaskQueue.h b/test/MockDHTTaskQueue.h
index 616afb41..15ff687f 100644
--- a/test/MockDHTTaskQueue.h
+++ b/test/MockDHTTaskQueue.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_DHT_TASK_QUEUE_H_
-#define _D_MOCK_DHT_TASK_QUEUE_H_
+#ifndef D_MOCK_DHT_TASK_QUEUE_H
+#define D_MOCK_DHT_TASK_QUEUE_H
 
 #include "DHTTaskQueue.h"
 
@@ -37,4 +37,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_DHT_TASK_QUEUE_H_
+#endif // D_MOCK_DHT_TASK_QUEUE_H
diff --git a/test/MockExtensionMessage.h b/test/MockExtensionMessage.h
index fdf5e13c..5ab3a76e 100644
--- a/test/MockExtensionMessage.h
+++ b/test/MockExtensionMessage.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_EXTENSION_MESSAGE_H_
-#define _D_MOCK_EXTENSION_MESSAGE_H_
+#ifndef D_MOCK_EXTENSION_MESSAGE_H
+#define D_MOCK_EXTENSION_MESSAGE_H
 
 #include "ExtensionMessage.h"
 
@@ -58,4 +58,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_EXTENSION_MESSAGE_H_
+#endif // D_MOCK_EXTENSION_MESSAGE_H
diff --git a/test/MockExtensionMessageFactory.h b/test/MockExtensionMessageFactory.h
index a87b7e85..80e02303 100644
--- a/test/MockExtensionMessageFactory.h
+++ b/test/MockExtensionMessageFactory.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_EXTENSION_MESSAGE_FACTORY_H_
-#define _D_MOCK_EXTENSION_MESSAGE_FACTORY_H_
+#ifndef D_MOCK_EXTENSION_MESSAGE_FACTORY_H
+#define D_MOCK_EXTENSION_MESSAGE_FACTORY_H
 
 #include "ExtensionMessageFactory.h"
 #include "MockExtensionMessage.h"
@@ -20,4 +20,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_EXTENSION_MESSAGE_FACTORY_H_
+#endif // D_MOCK_EXTENSION_MESSAGE_FACTORY_H
diff --git a/test/MockPeerStorage.h b/test/MockPeerStorage.h
index 28e9e541..1736c302 100644
--- a/test/MockPeerStorage.h
+++ b/test/MockPeerStorage.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_PEER_STORAGE_H_
-#define _D_MOCK_PEER_STORAGE_H_
+#ifndef D_MOCK_PEER_STORAGE_H
+#define D_MOCK_PEER_STORAGE_H
 
 #include "PeerStorage.h"
 
@@ -93,6 +93,6 @@ public:
   }
 };
 
-#endif // _D_MOCK_PEER_STORAGE_H_
+#endif // D_MOCK_PEER_STORAGE_H
 
 } // namespace aria2
diff --git a/test/MockPieceSelector.h b/test/MockPieceSelector.h
index 25761ad9..7723c97a 100644
--- a/test/MockPieceSelector.h
+++ b/test/MockPieceSelector.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_PIECE_SELECTOR_H_
-#define _D_MOCK_PIECE_SELECTOR_H_
+#ifndef D_MOCK_PIECE_SELECTOR_H
+#define D_MOCK_PIECE_SELECTOR_H
 
 #include "PieceSelector.h"
 
@@ -16,4 +16,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_PIECE_SELECTOR_H_
+#endif // D_MOCK_PIECE_SELECTOR_H
diff --git a/test/MockPieceStorage.h b/test/MockPieceStorage.h
index 1b7fbf3b..534baea4 100644
--- a/test/MockPieceStorage.h
+++ b/test/MockPieceStorage.h
@@ -1,5 +1,5 @@
-#ifndef _D_MOCK_PIECE_STORAGE_H_
-#define _D_MOCK_PIECE_STORAGE_H_
+#ifndef D_MOCK_PIECE_STORAGE_H
+#define D_MOCK_PIECE_STORAGE_H
 
 #include "PieceStorage.h"
 
@@ -272,4 +272,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_MOCK_PIECE_STORAGE_H_
+#endif // D_MOCK_PIECE_STORAGE_H
diff --git a/test/extension_message_test_helper.h b/test/extension_message_test_helper.h
index 54340d20..dfc9ac3f 100644
--- a/test/extension_message_test_helper.h
+++ b/test/extension_message_test_helper.h
@@ -1,5 +1,5 @@
-#ifndef _D_EXTENSION_MESSAGE_TEST_HELPER_H_
-#define _D_EXTENSION_MESSAGE_TEST_HELPER_H_
+#ifndef D_EXTENSION_MESSAGE_TEST_HELPER_H
+#define D_EXTENSION_MESSAGE_TEST_HELPER_H
 
 #include "MockBtMessage.h"
 #include "MockBtMessageFactory.h"
@@ -19,4 +19,4 @@ public:
 
 } // namespace aria2
 
-#endif // _D_EXTENSION_MESSAGE_TEST_HELPER_H_
+#endif // D_EXTENSION_MESSAGE_TEST_HELPER_H