diff --git a/bacnet-stack/demo/object/ai.h b/bacnet-stack/demo/object/ai.h
index 30302042..1ed75c92 100644
--- a/bacnet-stack/demo/object/ai.h
+++ b/bacnet-stack/demo/object/ai.h
@@ -153,6 +153,12 @@ extern "C" {
         BACNET_GET_ALARM_SUMMARY_DATA * getalarm_data);
 #endif
 
+    bool Analog_Input_Create(
+        uint32_t object_instance);
+    bool Analog_Input_Delete(
+        uint32_t object_instance);
+    void Analog_Input_Cleanup(
+        void);
     void Analog_Input_Init(
         void);
 
diff --git a/bacnet-stack/demo/object/ao.h b/bacnet-stack/demo/object/ao.h
index 84dbdaf7..34286e54 100644
--- a/bacnet-stack/demo/object/ao.h
+++ b/bacnet-stack/demo/object/ao.h
@@ -107,14 +107,20 @@ extern "C" {
         uint32_t instance,
         bool oos_flag);
 
-    void Analog_Output_Init(
-        void);
-
     int Analog_Output_Read_Property(
         BACNET_READ_PROPERTY_DATA * rpdata);
     bool Analog_Output_Write_Property(
         BACNET_WRITE_PROPERTY_DATA * wp_data);
 
+    bool Analog_Output_Create(
+        uint32_t object_instance);
+    bool Analog_Output_Delete(
+        uint32_t object_instance);
+    void Analog_Output_Cleanup(
+        void);
+    void Analog_Output_Init(
+        void);
+
 #ifdef TEST
 #include "ctest.h"
     void testAnalogOutput(
diff --git a/bacnet-stack/demo/object/av.h b/bacnet-stack/demo/object/av.h
index 8895a0bd..30e07e84 100644
--- a/bacnet-stack/demo/object/av.h
+++ b/bacnet-stack/demo/object/av.h
@@ -147,6 +147,12 @@ extern "C" {
         BACNET_GET_ALARM_SUMMARY_DATA * getalarm_data);
 #endif
 
+    bool Analog_Value_Create(
+        uint32_t object_instance);
+    bool Analog_Value_Delete(
+        uint32_t object_instance);
+    void Analog_Value_Cleanup(
+        void);
     void Analog_Value_Init(
         void);
 
diff --git a/bacnet-stack/demo/object/bi.h b/bacnet-stack/demo/object/bi.h
index 7974c484..112761a8 100644
--- a/bacnet-stack/demo/object/bi.h
+++ b/bacnet-stack/demo/object/bi.h
@@ -107,6 +107,13 @@ extern "C" {
 
     bool Binary_Input_Write_Property(
         BACNET_WRITE_PROPERTY_DATA * wp_data);
+
+    bool Binary_Input_Create(
+        uint32_t object_instance);
+    bool Binary_Input_Delete(
+        uint32_t object_instance);
+    void Binary_Input_Cleanup(
+        void);
     void Binary_Input_Init(
         void);
 
diff --git a/bacnet-stack/demo/object/bo.h b/bacnet-stack/demo/object/bo.h
index df7ef1d7..52ebde43 100644
--- a/bacnet-stack/demo/object/bo.h
+++ b/bacnet-stack/demo/object/bo.h
@@ -117,9 +117,12 @@ extern "C" {
     void Binary_Output_Change_Of_Value_Clear(
         uint32_t instance);
 
-    int Binary_Output_Read_Property(
-        BACNET_READ_PROPERTY_DATA * rpdata);
-
+    bool Binary_Output_Create(
+        uint32_t object_instance);
+    bool Binary_Output_Delete(
+        uint32_t object_instance);
+    void Binary_Output_Cleanup(
+        void);
     bool Binary_Output_Write_Property(
         BACNET_WRITE_PROPERTY_DATA * wp_data);
 
diff --git a/bacnet-stack/demo/object/bv.h b/bacnet-stack/demo/object/bv.h
index 0c075ffd..8f9d8078 100644
--- a/bacnet-stack/demo/object/bv.h
+++ b/bacnet-stack/demo/object/bv.h
@@ -127,6 +127,12 @@ extern "C" {
     bool Binary_Value_Polarity_Set(
         uint32_t object_instance,
         BACNET_POLARITY polarity);
+    bool Binary_Value_Create(
+        uint32_t object_instance);
+    bool Binary_Value_Delete(
+        uint32_t object_instance);
+    void Binary_Value_Cleanup(
+        void);
 
 #ifdef TEST
 #include "ctest.h"