diff --git a/ompi/mca/vprotocol/example/vprotocol_example_recv.c b/ompi/mca/vprotocol/example/vprotocol_example_recv.c
index 349e340270a..dbaaa9c88cf 100644
--- a/ompi/mca/vprotocol/example/vprotocol_example_recv.c
+++ b/ompi/mca/vprotocol/example/vprotocol_example_recv.c
@@ -56,7 +56,7 @@ int mca_vprotocol_example_recv(void *addr,
   int ret;
   V_OUTPUT_VERBOSE(50, "posted\trecv \tcomm %d\tfrom %d\ttag %d\tsize %ld", comm->c_contextid, src, tag, (long) count);
   ret = mca_pml_v.host_pml.pml_recv(addr, count, datatype, src, tag, comm, status);
-# ifdef OPAL_ENABLE_DEBUG
+# if OPAL_ENABLE_DEBUG
     if(status)
       V_OUTPUT_VERBOSE(75, "deliver\trecv \tcomm %d\tfrom %d(%d)\ttag %d(%d)\tsize %ld(%ld)\tstatus %d", comm->c_contextid, src, status->MPI_SOURCE, tag, status->MPI_TAG, (long) count, (long) status->_ucount, status->MPI_ERROR);
     else
diff --git a/oshmem/mca/atomic/base/base.h b/oshmem/mca/atomic/base/base.h
index e8fe9833bbb..e69b84dfac5 100644
--- a/oshmem/mca/atomic/base/base.h
+++ b/oshmem/mca/atomic/base/base.h
@@ -40,7 +40,7 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_atomic_base_framework;
 #define __ATOMIC_FILE__ __FILE__
 #endif
 
-#ifdef OPAL_ENABLE_DEBUG
+#if OPAL_ENABLE_DEBUG
 #define ATOMIC_VERBOSE(level, ...) \
     oshmem_output_verbose(level, oshmem_atomic_base_framework.framework_output, \
         "%s:%d - %s()", __ATOMIC_FILE__, __LINE__, __func__, __VA_ARGS__)
diff --git a/oshmem/mca/memheap/base/base.h b/oshmem/mca/memheap/base/base.h
index 3dc5da77535..97dac884d2a 100644
--- a/oshmem/mca/memheap/base/base.h
+++ b/oshmem/mca/memheap/base/base.h
@@ -137,7 +137,7 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_memheap_base_framework;
 #define __SPML_FILE__ __FILE__
 #endif
 
-#ifdef OPAL_ENABLE_DEBUG
+#if OPAL_ENABLE_DEBUG
 #define MEMHEAP_VERBOSE(level, ...) \
     oshmem_output_verbose(level, oshmem_memheap_base_framework.framework_output, \
         "%s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
diff --git a/oshmem/mca/scoll/base/base.h b/oshmem/mca/scoll/base/base.h
index 08af8e197b5..854f8cebfb2 100644
--- a/oshmem/mca/scoll/base/base.h
+++ b/oshmem/mca/scoll/base/base.h
@@ -52,7 +52,7 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_scoll_base_framework;
 #define __SCOLL_FILE__ __FILE__
 #endif
 
-#ifdef OPAL_ENABLE_DEBUG
+#if OPAL_ENABLE_DEBUG
 #define SCOLL_VERBOSE(level, ...) \
     oshmem_output_verbose(level, oshmem_scoll_base_framework.framework_output, \
        "%s:%d - %s()", __SCOLL_FILE__, __LINE__, __func__, __VA_ARGS__)
diff --git a/oshmem/mca/scoll/mpi/scoll_mpi_debug.h b/oshmem/mca/scoll/mpi/scoll_mpi_debug.h
index eac6008a1de..4009f49d872 100644
--- a/oshmem/mca/scoll/mpi/scoll_mpi_debug.h
+++ b/oshmem/mca/scoll/mpi/scoll_mpi_debug.h
@@ -18,7 +18,7 @@
 #define __MPI_FILE__ __FILE__
 #endif
 
-#ifdef OPAL_ENABLE_DEBUG
+#if OPAL_ENABLE_DEBUG
 #define MPI_COLL_VERBOSE(level, ...) \
     oshmem_output_verbose(level, mca_scoll_mpi_output, "%s:%d - %s() ", \
                         __MPI_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
diff --git a/oshmem/mca/scoll/ucc/scoll_ucc_debug.h b/oshmem/mca/scoll/ucc/scoll_ucc_debug.h
index aa2530838c0..74c86567f2d 100644
--- a/oshmem/mca/scoll/ucc/scoll_ucc_debug.h
+++ b/oshmem/mca/scoll/ucc/scoll_ucc_debug.h
@@ -18,7 +18,7 @@
 #define __UCC_FILE__ __FILE__
 #endif
 
-#ifdef OPAL_ENABLE_DEBUG
+#if OPAL_ENABLE_DEBUG
 #define UCC_VERBOSE(level, ...) \
     oshmem_output_verbose(level, mca_scoll_ucc_output, "%s:%d - %s() ", \
                         __UCC_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
diff --git a/oshmem/mca/spml/base/base.h b/oshmem/mca/spml/base/base.h
index 857e1935699..47b66bc15a5 100644
--- a/oshmem/mca/spml/base/base.h
+++ b/oshmem/mca/spml/base/base.h
@@ -109,7 +109,7 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_spml_base_framework;
 #define __SPML_FILE__ __FILE__
 #endif
 
-#ifdef OPAL_ENABLE_DEBUG
+#if OPAL_ENABLE_DEBUG
 #define SPML_VERBOSE(level, ...) \
     oshmem_output_verbose(level, oshmem_spml_base_framework.framework_output, \
         "%s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
diff --git a/oshmem/shmem/shmem_api_logger.h b/oshmem/shmem/shmem_api_logger.h
index 9a99bf10b00..6daec140823 100644
--- a/oshmem/shmem/shmem_api_logger.h
+++ b/oshmem/shmem/shmem_api_logger.h
@@ -27,7 +27,7 @@ OSHMEM_DECLSPEC extern int shmem_api_logger_output;
 #define __SPML_FILE__ __FILE__
 #endif
 
-#ifdef OPAL_ENABLE_DEBUG
+#if OPAL_ENABLE_DEBUG
 #define SHMEM_API_VERBOSE(level, ...) \
     oshmem_output_verbose(level, shmem_api_logger_output, \
         "%s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)