diff --git a/src/compiler.h b/src/compiler.h
index 18e1a32..5a2b28e 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -19,6 +19,8 @@
 		      "`unused` attribute is required");
 	static_assert(__has_attribute(warn_unused_result),
 		      "`warn_unused_result` attribute is required");
+	static_assert(__has_attribute(cleanup),
+		      "`cleanup` attribute is required");
 	int compliance;
 } pldm_required_attributes __attribute__((unused));
 
@@ -30,6 +32,7 @@
 #error Missing definition for LIBPLDM_CC_NONNULL
 #endif
 
+#define LIBPLDM_CC_CLEANUP(fn)	      __attribute__((cleanup(fn)))
 #define LIBPLDM_CC_NONNULL_ARGS(...)  __attribute__((nonnull(__VA_ARGS__)))
 #define LIBPLDM_CC_UNUSED	      __attribute__((unused))
 #define LIBPLDM_CC_WARN_UNUSED_RESULT __attribute__((warn_unused_result))