diff --git a/src/include/hashset.h b/src/include/hashset.h
index a5f744d..a98fac4 100644
--- a/src/include/hashset.h
+++ b/src/include/hashset.h
@@ -16,8 +16,8 @@
  limitations under the License.
 */
 
-#ifndef _HASHSET_H_
-#define _HASHSET_H_
+#ifndef HASHSET_H
+#define HASHSET_H
 
 #include "hstr_utils.h"
 
diff --git a/src/include/hstr.h b/src/include/hstr.h
index 8c8b4ee..6376b47 100644
--- a/src/include/hstr.h
+++ b/src/include/hstr.h
@@ -16,8 +16,8 @@
  limitations under the License.
  */
 
-#ifndef HSTR_H_
-#define HSTR_H_
+#ifndef HSTR_H
+#define HSTR_H
 
 #include <getopt.h>
 #include <locale.h>
diff --git a/src/include/hstr_blacklist.h b/src/include/hstr_blacklist.h
index 692c9eb..d197022 100644
--- a/src/include/hstr_blacklist.h
+++ b/src/include/hstr_blacklist.h
@@ -16,8 +16,8 @@
  limitations under the License.
  */
 
-#ifndef HSTR_BLACKLIST_H_
-#define HSTR_BLACKLIST_H_
+#ifndef HSTR_BLACKLIST_H
+#define HSTR_BLACKLIST_H
 
 #include "hashset.h"
 
diff --git a/src/include/hstr_curses.h b/src/include/hstr_curses.h
index afb7ce1..045673e 100644
--- a/src/include/hstr_curses.h
+++ b/src/include/hstr_curses.h
@@ -16,8 +16,8 @@
  limitations under the License.
 */
 
-#ifndef _HSTR_CURSES_H
-#define _HSTR_CURSES_H
+#ifndef HSTR_CURSES_H
+#define HSTR_CURSES_H
 
 #ifdef __APPLE__
 #include <curses.h>
diff --git a/src/include/hstr_favorites.h b/src/include/hstr_favorites.h
index e4fe177..354a740 100644
--- a/src/include/hstr_favorites.h
+++ b/src/include/hstr_favorites.h
@@ -16,8 +16,8 @@
  limitations under the License.
 */
 
-#ifndef _HSTR_FAVORITES_H_
-#define _HSTR_FAVORITES_H_
+#ifndef HSTR_FAVORITES_H
+#define HSTR_FAVORITES_H
 
 #include "hashset.h"
 
diff --git a/src/include/hstr_history.h b/src/include/hstr_history.h
index 6fd4641..c403142 100644
--- a/src/include/hstr_history.h
+++ b/src/include/hstr_history.h
@@ -16,8 +16,8 @@
  limitations under the License.
 */
 
-#ifndef _HSTR_HISTORY_H_
-#define _HSTR_HISTORY_H_
+#ifndef HSTR_HISTORY_H
+#define HSTR_HISTORY_H
 
 #include <fcntl.h>
 #include <limits.h>
diff --git a/src/include/hstr_regexp.h b/src/include/hstr_regexp.h
index 0a2f761..29adb3c 100644
--- a/src/include/hstr_regexp.h
+++ b/src/include/hstr_regexp.h
@@ -16,8 +16,8 @@
  limitations under the License.
 */
 
-#ifndef _HSTR_REGEXP_H
-#define _HSTR_REGEXP_H
+#ifndef HSTR_REGEXP_H
+#define HSTR_REGEXP_H
 
 #include <regex.h>
 
diff --git a/src/include/hstr_utils.h b/src/include/hstr_utils.h
index 93dafe7..660b041 100644
--- a/src/include/hstr_utils.h
+++ b/src/include/hstr_utils.h
@@ -16,8 +16,8 @@
  limitations under the License.
 */
 
-#ifndef _HSTR_UTILS_H
-#define _HSTR_UTILS_H
+#ifndef HSTR_UTILS_H
+#define HSTR_UTILS_H
 
 #include <ctype.h>
 #include <sys/ioctl.h>
diff --git a/src/include/radixsort.h b/src/include/radixsort.h
index 8e417c4..f7ac1f9 100644
--- a/src/include/radixsort.h
+++ b/src/include/radixsort.h
@@ -16,8 +16,8 @@
  limitations under the License.
 */
 
-#ifndef RADIXSORT_H_
-#define RADIXSORT_H_
+#ifndef RADIXSORT_H
+#define RADIXSORT_H
 
 #include <math.h>
 #include <stddef.h>
@@ -68,4 +68,4 @@ RadixItem** radixsort_dump(RadixSorter* rs);
 void radixsort_destroy(RadixSorter* rs);
 void radixsort_stat(RadixSorter* rs, bool listing);
 
-#endif /* RADIXSORT_H_ */
+#endif