diff --git a/source/3ds/3ds.h b/source/3ds/3ds.h
index a02a052..738ecd2 100644
--- a/source/3ds/3ds.h
+++ b/source/3ds/3ds.h
@@ -1,5 +1,5 @@
-#ifndef __3DS_H__
-#define __3DS_H__
+#ifndef I_3DS_H
+#define I_3DS_H
 
 #include "cbmd.h"
 #include "cwav.h"
diff --git a/source/3ds/cbmd.h b/source/3ds/cbmd.h
index 384694c..c9cac83 100644
--- a/source/3ds/cbmd.h
+++ b/source/3ds/cbmd.h
@@ -1,5 +1,5 @@
-#ifndef __CBMD_H__
-#define __CBMD_H__
+#ifndef CBMD_H
+#define CBMD_H
 
 #include "../types.h"
 
diff --git a/source/3ds/cwav.h b/source/3ds/cwav.h
index cc04a07..568f7ef 100644
--- a/source/3ds/cwav.h
+++ b/source/3ds/cwav.h
@@ -1,5 +1,5 @@
-#ifndef __CWAV_H__
-#define __CWAV_H__
+#ifndef CWAV_H
+#define CWAV_H
 
 #include "../types.h"
 
diff --git a/source/3ds/lz11.h b/source/3ds/lz11.h
index f9b336c..d590107 100644
--- a/source/3ds/lz11.h
+++ b/source/3ds/lz11.h
@@ -1,5 +1,5 @@
-#ifndef __LZ11_H__
-#define __LZ11_H__
+#ifndef LZ11_H
+#define LZ11_H
 
 #include "../types.h"
 
diff --git a/source/3ds/smdh.h b/source/3ds/smdh.h
index 2b196d7..ff2577e 100644
--- a/source/3ds/smdh.h
+++ b/source/3ds/smdh.h
@@ -1,5 +1,5 @@
-#ifndef __SMDH_H__
-#define __SMDH_H__
+#ifndef SMDH_H
+#define SMDH_H
 
 #include "../types.h"
 
diff --git a/source/3ds/util.h b/source/3ds/util.h
index 6a6689d..9e1d6c7 100644
--- a/source/3ds/util.h
+++ b/source/3ds/util.h
@@ -1,5 +1,5 @@
-#ifndef __UTIL_H__
-#define __UTIL_H__
+#ifndef UTIL_H
+#define UTIL_H
 
 #include "../types.h"
 
diff --git a/source/cmd.h b/source/cmd.h
index a5dfd8a..a672db4 100644
--- a/source/cmd.h
+++ b/source/cmd.h
@@ -1,5 +1,5 @@
-#ifndef __CMD_H__
-#define __CMD_H__
+#ifndef CMD_H
+#define CMD_H
 
 int cmd_process_command(int argc, char* argv[]);
 
diff --git a/source/pc/wav.h b/source/pc/wav.h
index ef5adae..25f33d2 100644
--- a/source/pc/wav.h
+++ b/source/pc/wav.h
@@ -1,5 +1,5 @@
-#ifndef __WAV_H__
-#define __WAV_H__
+#ifndef WAV_H
+#define WAV_H
 
 #include <stdio.h>
 
diff --git a/source/types.h b/source/types.h
index 7d4b75a..50fa311 100644
--- a/source/types.h
+++ b/source/types.h
@@ -1,5 +1,5 @@
-#ifndef __TYPES_H__
-#define __TYPES_H__
+#ifndef TYPES_H
+#define TYPES_H
 
 #include <stddef.h>
 #include <stdint.h>