diff --git a/include/arch/arm/arch/api/constants.h b/include/arch/arm/arch/api/constants.h
index 527033f96..5e0b3c29c 100644
--- a/include/arch/arm/arch/api/constants.h
+++ b/include/arch/arm/arch/api/constants.h
@@ -11,6 +11,8 @@
 #ifndef __ARCH_API_CONSTANTS_H
 #define __ARCH_API_CONSTANTS_H
 
+#if CONFIG_MAX_NUM_TRACE_POINTS > 0
 #define seL4_LogBufferSize (1<<20)
+#endif /* CONFIG_MAX_NUM_TRACE_POINTS > 0 */
 
 #endif
diff --git a/include/arch/x86/arch/api/constants.h b/include/arch/x86/arch/api/constants.h
index 2ee1643db..8b7ff6d68 100644
--- a/include/arch/x86/arch/api/constants.h
+++ b/include/arch/x86/arch/api/constants.h
@@ -11,6 +11,8 @@
 #ifndef __ARCH_API_CONSTANTS_H
 #define __ARCH_API_CONSTANTS_H
 
+#if CONFIG_MAX_NUM_TRACE_POINTS > 0
 #define seL4_LogBufferSize (BIT(LARGE_PAGE_BITS))
+#endif /* CONFIG_MAX_NUM_TRACE_POINTS > 0 */
 
 #endif
diff --git a/libsel4/arch_include/arm/sel4/arch/constants.h b/libsel4/arch_include/arm/sel4/arch/constants.h
index 0fb89b567..f1e91fcb4 100644
--- a/libsel4/arch_include/arm/sel4/arch/constants.h
+++ b/libsel4/arch_include/arm/sel4/arch/constants.h
@@ -13,7 +13,9 @@
 
 #include <sel4/arch/objecttype.h>
 
+#if CONFIG_MAX_NUM_TRACE_POINTS > 0
 /* size of kernel log buffer in bytes */
 #define seL4_LogBufferSize (1<<20)
+#endif /* CONFIG_MAX_NUM_TRACE_POINTS > 0 */
 
 #endif
diff --git a/libsel4/arch_include/x86/sel4/arch/constants.h b/libsel4/arch_include/x86/sel4/arch/constants.h
index 603895217..2b66c3f08 100644
--- a/libsel4/arch_include/x86/sel4/arch/constants.h
+++ b/libsel4/arch_include/x86/sel4/arch/constants.h
@@ -41,7 +41,9 @@
 #define MSI_MAX 0x1d
 #endif
 
+#if CONFIG_MAX_NUM_TRACE_POINTS > 0
 /* size of kernel log buffer in bytes */
 #define seL4_LogBufferSize (BIT(seL4_LargePageBits))
+#endif /* CONFIG_MAX_NUM_TRACE_POINTS > 0 */
 
 #endif
diff --git a/libsel4/include/sel4/types.h b/libsel4/include/sel4/types.h
index e3b47e6e0..44e7c9b2c 100644
--- a/libsel4/include/sel4/types.h
+++ b/libsel4/include/sel4/types.h
@@ -71,10 +71,12 @@ typedef seL4_CPtr seL4_DomainSet;
 
 #define seL4_NilData seL4_CapData_Badge_new(0)
 
+#if CONFIG_MAX_NUM_TRACE_POINTS > 0
 typedef struct {
     seL4_Word key;
     seL4_Word data;
 } seL4_LogEntry;
+#endif /* CONFIG_MAX_NUM_TRACE_POINTS > 0 */
 
 #include <sel4/arch/constants.h>