diff --git a/libs/client-sdk/include/launchdarkly/client_side/bindings/c/config/builder.h b/libs/client-sdk/include/launchdarkly/client_side/bindings/c/config/builder.h
index 7e9b4fe1a..8a4f22e88 100644
--- a/libs/client-sdk/include/launchdarkly/client_side/bindings/c/config/builder.h
+++ b/libs/client-sdk/include/launchdarkly/client_side/bindings/c/config/builder.h
@@ -532,7 +532,12 @@ LD_EXPORT(void)
 LDClientConfigBuilder_Persistence_None(LDClientConfigBuilder b);
 
 /**
- * Creates an LDClientConfig. The LDClientConfigBuilder is consumed.
+ * Creates an LDClientConfig. The LDClientConfigBuilder is automatically freed.
+ *
+ * WARNING: Do not call any other
+ * LDClientConfigBuilder function on the provided LDClientConfigBuilder after
+ * calling this function. It is undefined behavior.
+ *
  * On success, the config will be stored in out_config; otherwise,
  * out_config will be set to NULL and the returned LDStatus will indicate
  * the error.
diff --git a/libs/common/include/launchdarkly/bindings/c/context_builder.h b/libs/common/include/launchdarkly/bindings/c/context_builder.h
index 9c29dc3e2..166c98ba3 100644
--- a/libs/common/include/launchdarkly/bindings/c/context_builder.h
+++ b/libs/common/include/launchdarkly/bindings/c/context_builder.h
@@ -35,10 +35,12 @@ LD_EXPORT(void)
 LDContextBuilder_Free(LDContextBuilder builder);
 
 /**
- * Construct a context from a context builder.
+ * Construct a context from a context builder. The builder is automatically
+ * freed.
  *
- * When building a context using @ref LDContextBuilder_Build the builder will be
- * consumed and you do not need to call @ref LDContextBuilder_Free.
+ * WARNING: Do not call any other
+ * LDContextBuilder function on the provided LDContextBuilder after
+ * calling this function. It is undefined behavior.
  *
  * @param builder The builder to build a context from. Must not be NULL.
  * @return The built context.
diff --git a/libs/server-sdk/include/launchdarkly/server_side/bindings/c/config/builder.h b/libs/server-sdk/include/launchdarkly/server_side/bindings/c/config/builder.h
index 3129a9f6f..1e4cbba53 100644
--- a/libs/server-sdk/include/launchdarkly/server_side/bindings/c/config/builder.h
+++ b/libs/server-sdk/include/launchdarkly/server_side/bindings/c/config/builder.h
@@ -185,7 +185,13 @@ LDServerConfigBuilder_Events_PrivateAttribute(LDServerConfigBuilder b,
                                               char const* attribute_reference);
 
 /**
- * Configures the Background Sync data system with a Streaming synchronizer.
+ * Configures the Background Sync data system with a Streaming synchronizer. The
+ * builder is automatically freed.
+ *
+ * WARNING: Do not call any other
+ * LDServerDataSourceStreamBuilder function on the provided
+ * LDServerDataSourceStreamBuilder after calling this function. It is undefined
+ * behavior.
  *
  * This is the default data system configuration for the SDK.
  *
@@ -196,7 +202,7 @@ LDServerConfigBuilder_Events_PrivateAttribute(LDServerConfigBuilder b,
  *
  * @param b Server config builder. Must not be NULL.
  * @param stream_builder The streaming builder. The builder is consumed; do not
- * free it.
+ * free it. Must not be NULL.
  */
 LD_EXPORT(void)
 LDServerConfigBuilder_DataSystem_BackgroundSync_Streaming(
@@ -204,7 +210,13 @@ LDServerConfigBuilder_DataSystem_BackgroundSync_Streaming(
     LDServerDataSourceStreamBuilder stream_builder);
 
 /**
- * Configures the Background Sync data system with a Polling synchronizer.
+ * Configures the Background Sync data system with a Polling synchronizer. The
+ * builder is automatically freed.
+ *
+ * WARNING: Do not call any other
+ * LDServerDataSourcePollBuilder function on the provided
+ * LDServerDataSourcePollBuilder after calling this function. It is undefined
+ * behavior.
  *
  * This synchronizer may be chosen to override the default Streaming mode.
  *
@@ -214,7 +226,7 @@ LDServerConfigBuilder_DataSystem_BackgroundSync_Streaming(
  *
  * @param b Server config builder. Must not be NULL.
  * @param poll_builder The polling builder. The builder is consumed; do not free
- * it.
+ * it. Must not be NULL.
  */
 LD_EXPORT(void)
 LDServerConfigBuilder_DataSystem_BackgroundSync_Polling(
@@ -222,9 +234,15 @@ LDServerConfigBuilder_DataSystem_BackgroundSync_Polling(
     LDServerDataSourcePollBuilder poll_builder);
 
 /**
- * Configures the Lazy Load data system. This method is mutually exclusive with
+ * Configures the Lazy Load data system. The builder is automatically consumed.
+ *
+ * This method is mutually exclusive with
  * the BackgroundSync_Polling and BackgroundSync_Streaming builders.
  *
+ * WARNING: Do not call any other
+ * LDServerLazyLoadBuilder function on the provided LDServerLazyLoadBuilder
+ * after calling this function. It is undefined behavior.
+ *
  * In this mode the SDK will query a data source on-demand as required, with an
  * in-memory cache to reduce the number of queries.
  *
@@ -396,7 +414,13 @@ LDServerConfigBuilder_HttpProperties_Header(LDServerConfigBuilder b,
                                             char const* value);
 
 /**
- * Sets the TLS options builder. The builder is consumed; do not free it.
+ * Sets the TLS options builder. The builder is automatically freed.
+ *
+ * WARNING: Do not call any other
+ * LDServerHttpPropertiesTlsBuilder function on the provided
+ * LDServerHttpPropertiesTlsBuilder after calling this function. It is undefined
+ * behavior.
+ *
  * @param b Server config builder. Must not be NULL.
  * @param tls_builder The TLS options builder. Must not be NULL.
  */
@@ -468,7 +492,12 @@ LD_EXPORT(void)
 LDServerConfigBuilder_Logging_Disable(LDServerConfigBuilder b);
 
 /**
- * Configures the SDK with basic logging.
+ * Configures the SDK with basic logging. The builder is automatically freed.
+ *
+ * WARNING: Do not call any other
+ * LDLoggingBasicBuilder function on the provided LDLoggingBasicBuilder after
+ * calling this function. It is undefined behavior.
+ *
  * @param b  Server config builder. Must not be NULL.
  * @param basic_builder The basic logging builder. Must not be NULL.
  */
@@ -486,7 +515,12 @@ LDServerConfigBuilder_Logging_Custom(LDServerConfigBuilder b,
                                      LDLoggingCustomBuilder custom_builder);
 
 /**
- * Creates an LDClientConfig. The LDServerConfigBuilder is consumed.
+ * Creates an LDClientConfig. The builder is automatically freed.
+ *
+ * WARNING: Do not call any other
+ * LDServerConfigBuilder function on the provided LDServerConfigBuilder after
+ * calling this function. It is undefined behavior.
+ *
  * On success, the config will be stored in out_config; otherwise,
  * out_config will be set to NULL and the returned LDStatus will indicate
  * the error.