diff --git a/lib/openpam_constants.h b/lib/openpam_constants.h
index a6cb271..74a85ae 100644
--- a/lib/openpam_constants.h
+++ b/lib/openpam_constants.h
@@ -30,8 +30,8 @@
  * $Id$
  */
 
-#ifndef OPENPAM_CONSTANTS_INCLUDED
-#define OPENPAM_CONSTANTS_INCLUDED
+#ifndef OPENPAM_CONSTANTS_H_INCLUDED
+#define OPENPAM_CONSTANTS_H_INCLUDED
 
 extern const char *pam_err_name[PAM_NUM_ERRORS];
 extern const char *pam_item_name[PAM_NUM_ITEMS];
diff --git a/lib/openpam_debug.h b/lib/openpam_debug.h
index 0e59ee8..4116289 100644
--- a/lib/openpam_debug.h
+++ b/lib/openpam_debug.h
@@ -35,8 +35,8 @@
  * $Id$
  */
 
-#ifndef OPENPAM_DEBUG_INCLUDED
-#define OPENPAM_DEBUG_INCLUDED
+#ifndef OPENPAM_DEBUG_H_INCLUDED
+#define OPENPAM_DEBUG_H_INCLUDED
 
 #ifdef OPENPAM_DEBUG
 #define ENTER() openpam_log(PAM_LOG_LIBDEBUG, "entering")
diff --git a/lib/openpam_features.h b/lib/openpam_features.h
index a17a35c..227b1a9 100644
--- a/lib/openpam_features.h
+++ b/lib/openpam_features.h
@@ -30,8 +30,8 @@
  * $Id$
  */
 
-#ifndef OPENPAM_FEATURES_INCLUDED
-#define OPENPAM_FEATURES_INCLUDED
+#ifndef OPENPAM_FEATURES_H_INCLUDED
+#define OPENPAM_FEATURES_H_INCLUDED
 
 struct openpam_feature {
 	const char *name;