diff --git a/lib/crypto_backend/crypto_backend.h b/lib/crypto_backend/crypto_backend.h
index 4bae49af..c2a66db3 100644
--- a/lib/crypto_backend/crypto_backend.h
+++ b/lib/crypto_backend/crypto_backend.h
@@ -14,7 +14,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
-#ifdef HAVE_UCHAR_H
+#if HAVE_UCHAR_H
 #include <uchar.h>
 #else
 #define char32_t uint32_t
diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c
index 4cde3be6..96f3eb25 100644
--- a/lib/libdevmapper.c
+++ b/lib/libdevmapper.c
@@ -15,7 +15,7 @@
 #include <libdevmapper.h>
 #include <uuid/uuid.h>
 #include <sys/stat.h>
-#ifdef HAVE_SYS_SYSMACROS_H
+#if HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>     /* for major, minor */
 #endif
 #include "internal.h"
diff --git a/lib/luks2/hw_opal/hw_opal.c b/lib/luks2/hw_opal/hw_opal.c
index 6017cd7f..15060ff4 100644
--- a/lib/luks2/hw_opal/hw_opal.c
+++ b/lib/luks2/hw_opal/hw_opal.c
@@ -17,7 +17,7 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_SYS_SYSMACROS_H
+#if HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>     /* for major, minor */
 #endif
 
diff --git a/lib/nls.h b/lib/nls.h
index af7ea95a..64a271ff 100644
--- a/lib/nls.h
+++ b/lib/nls.h
@@ -5,7 +5,7 @@
 #define LOCALEDIR "/usr/share/locale"
 #endif
 
-#ifdef HAVE_LOCALE_H
+#if HAVE_LOCALE_H
 # include <locale.h>
 #else
 # undef setlocale
diff --git a/lib/utils_device.c b/lib/utils_device.c
index 8faeca32..998d5e4f 100644
--- a/lib/utils_device.c
+++ b/lib/utils_device.c
@@ -16,10 +16,10 @@
 #include <sys/ioctl.h>
 #include <linux/fs.h>
 #include <unistd.h>
-#ifdef HAVE_SYS_SYSMACROS_H
+#if HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>     /* for major, minor */
 #endif
-#ifdef HAVE_SYS_STATVFS_H
+#if HAVE_SYS_STATVFS_H
 # include <sys/statvfs.h>
 #endif
 #include "internal.h"
@@ -50,7 +50,7 @@ static size_t device_fs_block_size_fd(int fd)
 {
 	size_t page_size = crypt_getpagesize();
 
-#ifdef HAVE_SYS_STATVFS_H
+#if HAVE_SYS_STATVFS_H
 	struct statvfs buf;
 
 	/*
diff --git a/lib/utils_device_locking.c b/lib/utils_device_locking.c
index 9191b09f..88592239 100644
--- a/lib/utils_device_locking.c
+++ b/lib/utils_device_locking.c
@@ -15,7 +15,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#ifdef HAVE_SYS_SYSMACROS_H
+#if HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>     /* for major, minor */
 #endif
 #include <libgen.h>
diff --git a/lib/utils_devpath.c b/lib/utils_devpath.c
index f504389b..fff02459 100644
--- a/lib/utils_devpath.c
+++ b/lib/utils_devpath.c
@@ -17,7 +17,7 @@
 #include <limits.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#ifdef HAVE_SYS_SYSMACROS_H
+#if HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>     /* for major, minor */
 #endif
 #include "internal.h"
diff --git a/lib/utils_loop.c b/lib/utils_loop.c
index ef9b85bf..ec856789 100644
--- a/lib/utils_loop.c
+++ b/lib/utils_loop.c
@@ -15,7 +15,7 @@
 #include <limits.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#ifdef HAVE_SYS_SYSMACROS_H
+#if HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>     /* for major, minor */
 #endif
 #include <linux/types.h>
diff --git a/src/utils_blockdev.c b/src/utils_blockdev.c
index 917bfd5e..e33b8397 100644
--- a/src/utils_blockdev.c
+++ b/src/utils_blockdev.c
@@ -8,7 +8,7 @@
 
 #include "cryptsetup.h"
 #include <dirent.h>
-#ifdef HAVE_SYS_SYSMACROS_H
+#if HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>     /* for major, minor */
 #endif
 #include <uuid/uuid.h>
diff --git a/tests/test_utils.c b/tests/test_utils.c
index 899e98bc..a284c1af 100644
--- a/tests/test_utils.c
+++ b/tests/test_utils.c
@@ -21,7 +21,7 @@
 # include <linux/keyctl.h>
 # include <sys/syscall.h>
 #endif
-#ifdef HAVE_SYS_SYSMACROS_H
+#if HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>
 #endif
 #include <linux/loop.h>