diff --git a/hypervisor/debug/dump.c b/hypervisor/debug/dump.c
index 4ea551209..75ca914aa 100644
--- a/hypervisor/debug/dump.c
+++ b/hypervisor/debug/dump.c
@@ -6,6 +6,9 @@
 
 #include <hypervisor.h>
 
+#define CALL_TRACE_HIERARCHY_MAX    20U
+#define DUMP_STACK_SIZE 0x200U
+
 /*
  * readable exception descriptors.
  */
diff --git a/hypervisor/include/debug/dump.h b/hypervisor/include/debug/dump.h
index fbc24fd39..5e3783e9e 100644
--- a/hypervisor/include/debug/dump.h
+++ b/hypervisor/include/debug/dump.h
@@ -9,23 +9,7 @@
 
 struct intr_excp_ctx;
 
-#ifdef HV_DEBUG
-#define CALL_TRACE_HIERARCHY_MAX    20U
-#define DUMP_STACK_SIZE 0x200U
-
 void dump_intr_excp_frame(const struct intr_excp_ctx *ctx);
 void dump_exception(struct intr_excp_ctx *ctx, uint16_t pcpu_id);
 
-#else
-static inline void dump_intr_excp_frame(__unused const struct intr_excp_ctx *ctx)
-{
-}
-
-static inline void dump_exception(__unused struct intr_excp_ctx *ctx,
-		__unused uint16_t pcpu_id)
-{
-}
-
-#endif
-
 #endif /* DUMP_H */
diff --git a/hypervisor/release/dump.c b/hypervisor/release/dump.c
new file mode 100644
index 000000000..077c24472
--- /dev/null
+++ b/hypervisor/release/dump.c
@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <hypervisor.h>
+
+void dump_intr_excp_frame(__unused const struct intr_excp_ctx *ctx) {}
+void dump_exception(__unused struct intr_excp_ctx *ctx, __unused uint16_t pcpu_id) {}