diff --git a/jerry-core/jmem/jmem-heap.c b/jerry-core/jmem/jmem-heap.c
index 371c86b34..eb91f9482 100644
--- a/jerry-core/jmem/jmem-heap.c
+++ b/jerry-core/jmem/jmem-heap.c
@@ -690,6 +690,13 @@ jmem_heap_stat_free_iter ()
 } /* jmem_heap_stat_free_iter */
 #endif /* JMEM_STATS */
 
+#undef VALGRIND_NOACCESS_SPACE
+#undef VALGRIND_UNDEFINED_SPACE
+#undef VALGRIND_DEFINED_SPACE
+#undef VALGRIND_FREYA_CHECK_MEMPOOL_REQUEST
+#undef VALGRIND_FREYA_MALLOCLIKE_SPACE
+#undef VALGRIND_FREYA_FREELIKE_SPACE
+
 /**
  * @}
  * @}
diff --git a/jerry-core/jmem/jmem-poolman.c b/jerry-core/jmem/jmem-poolman.c
index ec3ba841c..1e19b6cf9 100644
--- a/jerry-core/jmem/jmem-poolman.c
+++ b/jerry-core/jmem/jmem-poolman.c
@@ -337,6 +337,12 @@ jmem_pools_stat_dealloc (void)
 } /* jmem_pools_stat_dealloc */
 #endif /* JMEM_STATS */
 
+#undef VALGRIND_NOACCESS_SPACE
+#undef VALGRIND_UNDEFINED_SPACE
+#undef VALGRIND_DEFINED_SPACE
+#undef VALGRIND_FREYA_MALLOCLIKE_SPACE
+#undef VALGRIND_FREYA_FREELIKE_SPACE
+
 /**
  * @}
  * @}