diff --git a/crypto/lhash/lhash.h b/crypto/lhash/lhash.h
index ac1c400ee..558c11c6e 100644
--- a/crypto/lhash/lhash.h
+++ b/crypto/lhash/lhash.h
@@ -198,7 +198,7 @@ void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out);
 
 #define LHASH_OF(type) struct lhash_st_##type
 
-#define DECLARE_LHASH_OF(type) LHASH_OF(type) { }
+#define DECLARE_LHASH_OF(type) LHASH_OF(type) { int dummy; }
 
 #define CHECKED_LHASH_OF(type,lh) \
   ((_LHASH *)CHECKED_PTR_OF(LHASH_OF(type),lh))
diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index d57519fd5..50de737c4 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -57,13 +57,13 @@
 
 #include <openssl/stack.h>
 
-#ifdef DEBUG_SAFESTACK
-
 #ifndef CHECKED_PTR_OF
 #define CHECKED_PTR_OF(type, p) \
     ((void*) (1 ? p : (type*)0))
 #endif
 
+#ifdef DEBUG_SAFESTACK
+
 #define CHECKED_SK_FREE_FUNC(type, p) \
     ((void (*)(void *)) ((1 ? p : (void (*)(type *))0)))