diff --git a/dokan/dokan.h b/dokan/dokan.h
index e7246fdee..3f5a22c27 100644
--- a/dokan/dokan.h
+++ b/dokan/dokan.h
@@ -19,8 +19,8 @@ You should have received a copy of the GNU Lesser General Public License along
 with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _DOKAN_H_
-#define _DOKAN_H_
+#ifndef DOKAN_H_
+#define DOKAN_H_
 
 #include <windows.h>
 
@@ -359,4 +359,4 @@ void DOKANAPI DokanMapKernelToUserCreateFileFlags(
 }
 #endif
 
-#endif // _DOKAN_H_
+#endif // DOKAN_H_
diff --git a/dokan/dokanc.h b/dokan/dokanc.h
index 1d6e745df..ba8d62a47 100644
--- a/dokan/dokanc.h
+++ b/dokan/dokanc.h
@@ -19,8 +19,8 @@ You should have received a copy of the GNU Lesser General Public License along
 with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _DOKANC_H_
-#define _DOKANC_H_
+#ifndef DOKANC_H_
+#define DOKANC_H_
 
 #include "dokan.h"
 #include <malloc.h>
@@ -141,4 +141,4 @@ BOOL DOKANAPI DokanSetDebugMode(ULONG Mode);
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif // DOKANC_H_
\ No newline at end of file
diff --git a/dokan/dokani.h b/dokan/dokani.h
index 827bea9cf..214f8cb9e 100644
--- a/dokan/dokani.h
+++ b/dokan/dokani.h
@@ -19,8 +19,8 @@ You should have received a copy of the GNU Lesser General Public License along
 with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _DOKANI_H_
-#define _DOKANI_H_
+#ifndef DOKANI_H_
+#define DOKANI_H_
 
 #define WIN32_NO_STATUS
 #include <windows.h>
@@ -169,4 +169,4 @@ VOID ReleaseDokanOpenInfo(PEVENT_INFORMATION EventInfomation,
 }
 #endif
 
-#endif
+#endif // DOKANI_H_
diff --git a/dokan/fileinfo.h b/dokan/fileinfo.h
index 32a639524..bd614f9cc 100644
--- a/dokan/fileinfo.h
+++ b/dokan/fileinfo.h
@@ -19,8 +19,8 @@ You should have received a copy of the GNU Lesser General Public License along
 with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _FILEINFO_H_
-#define _FILEINFO_H_
+#ifndef FILEINFO_H_
+#define FILEINFO_H_
 
 #define IRP_MJ_CREATE 0x00
 #define IRP_MJ_CREATE_NAMED_PIPE 0x01
@@ -505,4 +505,4 @@ typedef struct _UNICODE_STRING {
   PWSTR Buffer;
 } UNICODE_STRING, *PUNICODE_STRING;
 
-#endif // _FILEINFO_H_
+#endif // FILEINFO_H_
diff --git a/dokan/list.h b/dokan/list.h
index 043d43bb3..f5d958c89 100644
--- a/dokan/list.h
+++ b/dokan/list.h
@@ -19,8 +19,8 @@ You should have received a copy of the GNU Lesser General Public License along
 with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _LIST_H_
-#define _LIST_H_
+#ifndef LIST_H_
+#define LIST_H_
 
 #include <windows.h>
 
@@ -134,4 +134,4 @@ VOID PushEntryList(PSINGLE_LIST_ENTRY ListHead, PSINGLE_LIST_ENTRY Entry) {
   ListHead->Next = Entry;
 }
 
-#endif
+#endif // LIST_H_
diff --git a/dokan_fuse/include/dokanfuse.h b/dokan_fuse/include/dokanfuse.h
index 6d226be4d..d8f5bd22a 100644
--- a/dokan_fuse/include/dokanfuse.h
+++ b/dokan_fuse/include/dokanfuse.h
@@ -1,5 +1,5 @@
-#ifndef _DOKAN_FUSE_H_
-#define _DOKAN_FUSE_H_
+#ifndef DOKANFUSE_H_
+#define DOKANFUSE_H_
 
 #include <string>
 
@@ -60,4 +60,4 @@ struct fuse
 	}
 };
 
-#endif //_DOKAN_FUSE_H_
+#endif //DOKANFUSE_H_
diff --git a/dokan_fuse/include/fuse.h b/dokan_fuse/include/fuse.h
index 9ad12dc0d..ec0ec8bf0 100644
--- a/dokan_fuse/include/fuse.h
+++ b/dokan_fuse/include/fuse.h
@@ -6,8 +6,8 @@
   See the file COPYING.LIB.
 */
 
-#ifndef _FUSE_H_
-#define _FUSE_H_
+#ifndef FUSE_H_
+#define FUSE_H_
 
 /* Include Windows compatibility stuff early*/
 #ifdef _WIN32
@@ -851,4 +851,4 @@ struct fuse_session *fuse_get_session(struct fuse *f);
 }
 #endif
 
-#endif /* _FUSE_H_ */
+#endif /* FUSE_H_ */
diff --git a/dokan_fuse/include/fuse_common.h b/dokan_fuse/include/fuse_common.h
index 2a9bdc380..9cc2a44d3 100644
--- a/dokan_fuse/include/fuse_common.h
+++ b/dokan_fuse/include/fuse_common.h
@@ -8,12 +8,12 @@
 
 /** @file */
 
-#if !defined(_FUSE_H_) && !defined(_FUSE_LOWLEVEL_H_)
+#if !defined(FUSE_H_) && !defined(FUSE_LOWLEVEL_H_)
 #error "Never include <fuse_common.h> directly; use <fuse.h> or <fuse_lowlevel.h> instead."
 #endif
 
-#ifndef _FUSE_COMMON_H_
-#define _FUSE_COMMON_H_
+#ifndef FUSE_COMMON_H_
+#define FUSE_COMMON_H_
 
 #include "fuse_opt.h"
 #ifndef _MSC_VER
@@ -246,4 +246,4 @@ void fuse_remove_signal_handlers(struct fuse_session *se);
 }
 #endif
 
-#endif /* _FUSE_COMMON_H_ */
+#endif /* FUSE_COMMON_H_ */
diff --git a/dokan_fuse/include/fuse_opt.h b/dokan_fuse/include/fuse_opt.h
index cc0ab4008..e3de9c6f2 100644
--- a/dokan_fuse/include/fuse_opt.h
+++ b/dokan_fuse/include/fuse_opt.h
@@ -6,8 +6,8 @@
   See the file COPYING.LIB.
 */
 
-#ifndef _FUSE_OPT_H_
-#define _FUSE_OPT_H_
+#ifndef FUSE_OPT_H_
+#define FUSE_OPT_H_
 
 /** @file
  *
@@ -264,4 +264,4 @@ int fuse_opt_match(const struct fuse_opt opts[], const char *opt);
 }
 #endif
 
-#endif /* _FUSE_OPT_H_ */
+#endif /* FUSE_OPT_H_ */
diff --git a/dokan_fuse/include/fuse_sem_fix.h b/dokan_fuse/include/fuse_sem_fix.h
index baa7a8171..f73c80e07 100644
--- a/dokan_fuse/include/fuse_sem_fix.h
+++ b/dokan_fuse/include/fuse_sem_fix.h
@@ -1,5 +1,5 @@
-#ifndef FUSE_SEM_FIX_H
-#define FUSE_SEM_FIX_H
+#ifndef FUSE_SEM_FIX_H_
+#define FUSE_SEM_FIX_H_
 
 #ifdef __CYGWIN__
 #include <semaphore.h>
@@ -24,4 +24,4 @@ int my_sem_wait (sem_t * sem);
 
 #endif
 
-#endif //FUSE_SEM_FIX_H
+#endif //FUSE_SEM_FIX_H_
diff --git a/dokan_fuse/include/fuse_win.h b/dokan_fuse/include/fuse_win.h
index bee30fbbb..1fde12c43 100644
--- a/dokan_fuse/include/fuse_win.h
+++ b/dokan_fuse/include/fuse_win.h
@@ -2,8 +2,8 @@
 * Win32 helper functions                                       *
 * Compilation on MSVC requires /Zc:wchar_t compiler option     *
 * ----------------------------------------------------------- */
-#ifndef _FUSE_WIN_H_
-#define _FUSE_WIN_H_
+#ifndef FUSE_WIN_H_
+#define FUSE_WIN_H_
 
 #include <time.h>
 #include <sys/types.h>
@@ -217,4 +217,4 @@ struct stat64 {
 #define F_UNLCK	2
 #define F_SETLK	6
 
-#endif //_FUSE_WIN_H_
+#endif // FUSE_WIN_H_
diff --git a/dokan_fuse/include/fusemain.h b/dokan_fuse/include/fusemain.h
index 87d3bf4a6..94a6f80a1 100644
--- a/dokan_fuse/include/fusemain.h
+++ b/dokan_fuse/include/fusemain.h
@@ -1,5 +1,5 @@
-#ifndef FUSEMAIN_H
-#define FUSEMAIN_H
+#ifndef FUSEMAIN_H_
+#define FUSEMAIN_H_
 
 #include "../../dokan/dokan.h"
 #include "fuse.h"
@@ -231,4 +231,4 @@ class impl_file_handle
 	int unlock(long long start, long long len) { return file_lock->unlock_file(this, start, len); }
 };
 
-#endif //FUSEMAIN_H
+#endif // FUSEMAIN_H_
diff --git a/dokan_fuse/include/utils.h b/dokan_fuse/include/utils.h
index 448cb8c78..5be6d4c7a 100644
--- a/dokan_fuse/include/utils.h
+++ b/dokan_fuse/include/utils.h
@@ -1,5 +1,5 @@
-#ifndef _UTILS_H_
-#define _UTILS_H_
+#ifndef UTILS_H_
+#define UTILS_H_
 
 #include <string>
 #include <sys/stat.h>
@@ -56,4 +56,4 @@ template<class T> void convertStatlikeBuf(const struct FUSE_STAT *stbuf, const s
 		find_data->dwFileAttributes|=FILE_ATTRIBUTE_HIDDEN;
 }
 
-#endif
+#endif // UTILS_H_
diff --git a/sys/dokan.h b/sys/dokan.h
index 8a35774a2..eb15ad91b 100644
--- a/sys/dokan.h
+++ b/sys/dokan.h
@@ -24,8 +24,8 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
 
 --*/
 
-#ifndef _DOKAN_H_
-#define _DOKAN_H_
+#ifndef DOKAN_H_
+#define DOKAN_H_
 
 #include <ntifs.h>
 #include <ntdddisk.h>
@@ -593,4 +593,4 @@ NTSTATUS DokanSendVolumeArrivalNotification(PUNICODE_STRING DeviceName);
 static UNICODE_STRING sddl = RTL_CONSTANT_STRING(
     L"D:P(A;;GA;;;SY)(A;;GRGWGX;;;BA)(A;;GRGWGX;;;WD)(A;;GRGX;;;RC)");
 
-#endif // _DOKAN_H_
+#endif // DOKAN_H_
diff --git a/sys/public.h b/sys/public.h
index 83ead3200..0636bd7eb 100644
--- a/sys/public.h
+++ b/sys/public.h
@@ -19,8 +19,8 @@ You should have received a copy of the GNU Lesser General Public License along
 with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _PUBLIC_H_
-#define _PUBLIC_H_
+#ifndef PUBLIC_H_
+#define PUBLIC_H_
 
 #define DOKAN_MAJOR_API_VERSION L"1"
 #define DOKAN_DRIVER_VERSION 0x0000190
@@ -365,4 +365,4 @@ typedef struct _DOKAN_LINK_INFORMATION {
   WCHAR FileName[1];
 } DOKAN_LINK_INFORMATION, *PDOKAN_LINK_INFORMATION;
 
-#endif // _PUBLIC_H_
+#endif // PUBLIC_H_