diff --git a/lib/nls.h b/lib/nls.h
index 39760b14..af7ea95a 100644
--- a/lib/nls.h
+++ b/lib/nls.h
@@ -12,7 +12,7 @@
 # define setlocale(Category, Locale) /* empty */
 #endif
 
-#ifdef ENABLE_NLS
+#if ENABLE_NLS
 # include <libintl.h>
 # define _(Text) gettext (Text)
 # ifdef gettext_noop
diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index d12b6133..05b91211 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -3619,7 +3619,7 @@ static void help(poptContext popt_context,
 			 DEFAULT_CIPHER(PLAIN), DEFAULT_PLAIN_KEYBITS, DEFAULT_PLAIN_HASH,
 			 DEFAULT_CIPHER(LUKS1), DEFAULT_LUKS1_KEYBITS, DEFAULT_LUKS1_HASH,
 			 DEFAULT_RNG);
-#if defined(ENABLE_LUKS_ADJUST_XTS_KEYSIZE) && DEFAULT_LUKS1_KEYBITS != 512
+#if ENABLE_LUKS_ADJUST_XTS_KEYSIZE && DEFAULT_LUKS1_KEYBITS != 512
 		log_std(_("\tLUKS: Default keysize with XTS mode (two internal keys) will be doubled.\n"));
 #endif
 		tools_cleanup();
diff --git a/src/utils_luks.c b/src/utils_luks.c
index aa4bfe64..5bee9109 100644
--- a/src/utils_luks.c
+++ b/src/utils_luks.c
@@ -143,7 +143,7 @@ int get_adjusted_key_size(const char *cipher_mode, uint32_t default_size_bits, i
 {
 	uint32_t keysize_bits = ARG_UINT32(OPT_KEY_SIZE_ID);
 
-#ifdef ENABLE_LUKS_ADJUST_XTS_KEYSIZE
+#if ENABLE_LUKS_ADJUST_XTS_KEYSIZE
 	if (!ARG_SET(OPT_KEY_SIZE_ID) && !strncmp(cipher_mode, "xts-", 4)) {
 		if (default_size_bits == 128)
 			keysize_bits = 256;
diff --git a/src/utils_tools.c b/src/utils_tools.c
index 1cb2d26a..3dd77cb4 100644
--- a/src/utils_tools.c
+++ b/src/utils_tools.c
@@ -434,7 +434,7 @@ void tools_package_version(const char *name, bool use_pwlibs)
 #if KERNEL_KEYRING
 	keyring = true;
 #endif
-#ifdef ENABLE_FIPS
+#if ENABLE_FIPS
 	fips = true;
 #endif
 #if ENABLE_AF_ALG