diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6b0160e..095e7006 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,8 +127,6 @@ set(API_HEADERS
     src/goose/goose_publisher.h
     src/sampled_values/sv_subscriber.h
     src/sampled_values/sv_publisher.h
-    src/sampled_values/sv_publisher_deprecated.h
-    src/sampled_values/sv_subscriber_deprecated.h
     src/logging/logging_api.h
     src/tls/tls_api.h
     ${CMAKE_CURRENT_BINARY_DIR}/config/stack_config.h
diff --git a/src/Doxyfile.in b/src/Doxyfile.in
index 645161fc..bc9fe073 100644
--- a/src/Doxyfile.in
+++ b/src/Doxyfile.in
@@ -794,7 +794,6 @@ INPUT                  = "iec61850/inc/iec61850_client.h" \
                          "goose/goose_receiver.h" \
                          "sampled_values/sv_subscriber.h" \
                          "sampled_values/sv_publisher.h" \
-                         "sampled_values/sv_publisher_deprecated.h" \
                          "mms/inc/mms_device_model.h" \
                          "mms/inc/mms_types.h" \
                          "mms/inc/mms_common.h" \
diff --git a/src/sampled_values/sv_publisher.c b/src/sampled_values/sv_publisher.c
index 578a1826..7c681899 100644
--- a/src/sampled_values/sv_publisher.c
+++ b/src/sampled_values/sv_publisher.c
@@ -649,3 +649,140 @@ SVPublisher_ASDU_setSmpRate(SVPublisher_ASDU self, uint16_t smpRate)
     self->hasSmpRate = true;
     self->smpRate = smpRate;
 }
+
+
+/*******************************************************************
+ * Wrapper functions to support old API (remove in future versions)
+ *******************************************************************/
+
+SVPublisher
+SampledValuesPublisher_create(CommParameters* parameters, const char* interfaceId)
+{
+    return SVPublisher_create(parameters, interfaceId);
+}
+
+SVPublisher_ASDU
+SampledValuesPublisher_addASDU(SVPublisher self, char* svID, char* datset, uint32_t confRev)
+{
+    return SVPublisher_addASDU(self, svID, datset, confRev);
+}
+
+void
+SampledValuesPublisher_setupComplete(SVPublisher self)
+{
+    SVPublisher_setupComplete(self);
+}
+
+void
+SampledValuesPublisher_publish(SVPublisher self)
+{
+    SVPublisher_publish(self);
+}
+
+void
+SampledValuesPublisher_destroy(SVPublisher self)
+{
+    SVPublisher_destroy(self);
+}
+
+void
+SV_ASDU_resetBuffer(SVPublisher_ASDU self)
+{
+    SVPublisher_ASDU_resetBuffer(self);
+}
+
+int
+SV_ASDU_addINT8(SVPublisher_ASDU self)
+{
+    return SVPublisher_ASDU_addINT8(self);
+}
+
+void
+SV_ASDU_setINT8(SVPublisher_ASDU self, int index, int8_t value)
+{
+    SVPublisher_ASDU_setINT8(self, index, value);
+}
+
+int
+SV_ASDU_addINT32(SVPublisher_ASDU self)
+{
+    return SVPublisher_ASDU_addINT32(self);
+}
+
+void
+SV_ASDU_setINT32(SVPublisher_ASDU self, int index, int32_t value)
+{
+    SVPublisher_ASDU_setINT32(self, index, value);
+}
+
+int
+SV_ASDU_addINT64(SVPublisher_ASDU self)
+{
+    return SVPublisher_ASDU_addINT64(self);
+}
+
+void
+SV_ASDU_setINT64(SVPublisher_ASDU self, int index, int64_t value)
+{
+    SVPublisher_ASDU_setINT64(self, index, value);
+}
+
+int
+SV_ASDU_addFLOAT(SVPublisher_ASDU self)
+{
+    return SVPublisher_ASDU_addFLOAT(self);
+}
+
+void
+SV_ASDU_setFLOAT(SVPublisher_ASDU self, int index, float value)
+{
+    SVPublisher_ASDU_setFLOAT(self, index, value);
+}
+
+int
+SV_ASDU_addFLOAT64(SVPublisher_ASDU self)
+{
+    return SVPublisher_ASDU_addFLOAT64(self);
+}
+
+void
+SV_ASDU_setFLOAT64(SVPublisher_ASDU self, int index, double value)
+{
+    SVPublisher_ASDU_setFLOAT64(self, index, value);
+}
+
+void
+SV_ASDU_setSmpCnt(SVPublisher_ASDU self, uint16_t value)
+{
+    SVPublisher_ASDU_setSmpCnt(self, value);
+}
+
+uint16_t
+SV_ASDU_getSmpCnt(SVPublisher_ASDU self)
+{
+    return SVPublisher_ASDU_getSmpCnt(self);
+}
+
+void
+SV_ASDU_increaseSmpCnt(SVPublisher_ASDU self)
+{
+    SVPublisher_ASDU_increaseSmpCnt(self);
+}
+
+void
+SV_ASDU_setRefrTm(SVPublisher_ASDU self, uint64_t refrTm)
+{
+    SVPublisher_ASDU_setRefrTm(self, refrTm);
+}
+
+void
+SV_ASDU_setSmpMod(SVPublisher_ASDU self, uint8_t smpMod)
+{
+    SVPublisher_ASDU_setSmpMod(self, smpMod);
+}
+
+void
+SV_ASDU_setSmpRate(SVPublisher_ASDU self, uint16_t smpRate)
+{
+    SVPublisher_ASDU_setSmpRate(self, smpRate);
+}
diff --git a/src/sampled_values/sv_publisher.h b/src/sampled_values/sv_publisher.h
index 5ea8676b..82c0cdfc 100644
--- a/src/sampled_values/sv_publisher.h
+++ b/src/sampled_values/sv_publisher.h
@@ -287,10 +287,95 @@ SVPublisher_ASDU_setSmpRate(SVPublisher_ASDU self, uint16_t smpRate);
 
 /**@} @}*/
 
+#ifndef DEPRECATED
+#if defined(__GNUC__) || defined(__clang__)
+  #define DEPRECATED __attribute__((deprecated))
+#else
+  #define DEPRECATED
+#endif
+#endif
+
+/**
+ * \addtogroup sv_publisher_deprecated_api_group Deprecated API
+ * \ingroup sv_publisher_api_group IEC 61850 Sampled Values (SV) publisher API
+ * \deprecated
+ * @{
+ */
+
+typedef struct sSVPublisher* SampledValuesPublisher;
+
+typedef struct sSV_ASDU* SV_ASDU;
+
+DEPRECATED SVPublisher
+SampledValuesPublisher_create(CommParameters* parameters, const char* interfaceId);
+
+DEPRECATED SVPublisher_ASDU
+SampledValuesPublisher_addASDU(SVPublisher self, char* svID, char* datset, uint32_t confRev);
+
+DEPRECATED void
+SampledValuesPublisher_setupComplete(SVPublisher self);
+
+DEPRECATED void
+SampledValuesPublisher_publish(SVPublisher self);
+
+DEPRECATED void
+SampledValuesPublisher_destroy(SVPublisher self);
+
+DEPRECATED void
+SV_ASDU_resetBuffer(SVPublisher_ASDU self);
+
+DEPRECATED int
+SV_ASDU_addINT8(SVPublisher_ASDU self);
+
+DEPRECATED void
+SV_ASDU_setINT8(SVPublisher_ASDU self, int index, int8_t value);
+
+DEPRECATED int
+SV_ASDU_addINT32(SVPublisher_ASDU self);
+
+DEPRECATED void
+SV_ASDU_setINT32(SVPublisher_ASDU self, int index, int32_t value);
+
+DEPRECATED int
+SV_ASDU_addINT64(SVPublisher_ASDU self);
+
+DEPRECATED void
+SV_ASDU_setINT64(SVPublisher_ASDU self, int index, int64_t value);
+
+DEPRECATED int
+SV_ASDU_addFLOAT(SVPublisher_ASDU self);
+
+DEPRECATED void
+SV_ASDU_setFLOAT(SVPublisher_ASDU self, int index, float value);
+
+DEPRECATED int
+SV_ASDU_addFLOAT64(SVPublisher_ASDU self);
+
+DEPRECATED void
+SV_ASDU_setFLOAT64(SVPublisher_ASDU self, int index, double value);
+
+void DEPRECATED
+SV_ASDU_setSmpCnt(SVPublisher_ASDU self, uint16_t value);
+
+DEPRECATED uint16_t
+SV_ASDU_getSmpCnt(SVPublisher_ASDU self);
+
+DEPRECATED void
+SV_ASDU_increaseSmpCnt(SVPublisher_ASDU self);
+
+DEPRECATED void
+SV_ASDU_setRefrTm(SVPublisher_ASDU self, uint64_t refrTm);
+
+DEPRECATED void
+SV_ASDU_setSmpMod(SVPublisher_ASDU self, uint8_t smpMod);
+
+DEPRECATED void
+SV_ASDU_setSmpRate(SVPublisher_ASDU self, uint16_t smpRate);
+
+/**@}*/
+
 #ifdef __cplusplus
 }
 #endif
 
-#include "sv_publisher_deprecated.h"
-
 #endif /* LIBIEC61850_SRC_SAMPLED_VALUES_SV_PUBLISHER_H_ */
diff --git a/src/sampled_values/sv_publisher_deprecated.h b/src/sampled_values/sv_publisher_deprecated.h
deleted file mode 100644
index 3fe31ede..00000000
--- a/src/sampled_values/sv_publisher_deprecated.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- *  sv_publisher.h
- *
- *  Copyright 2016 Michael Zillgith
- *
- *  This file is part of libIEC61850.
- *
- *  libIEC61850 is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  libIEC61850 is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with libIEC61850.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  See COPYING file for the complete license text.
- */
-
-
-#ifndef LIBIEC61850_SRC_SAMPLED_VALUES_SV_PUBLISHER_DEPRECATED_H_
-#define LIBIEC61850_SRC_SAMPLED_VALUES_SV_PUBLISHER_DEPRECATED_H_
-
-#include "libiec61850_platform_includes.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__GNUC__) || defined(__clang__)
-  #define DEPRECATED __attribute__((deprecated))
-#else
-  #define DEPRECATED
-#endif
-
-/**
- * \addtogroup sv_publisher_deprecated_api_group Deprecated API
- * \ingroup sv_publisher_api_group IEC 61850 Sampled Values (SV) publisher API
- * \deprecated
- * @{
- */
-
-typedef DEPRECATED struct sSVPublisher* SampledValuesPublisher;
-
-typedef DEPRECATED struct sSV_ASDU* SV_ASDU;
-
-static DEPRECATED
-SVPublisher
-SampledValuesPublisher_create(CommParameters* parameters, const char* interfaceId)
-{
-    return SVPublisher_create(parameters, interfaceId);
-}
-
-static DEPRECATED
-SVPublisher_ASDU
-SampledValuesPublisher_addASDU(SVPublisher self, char* svID, char* datset, uint32_t confRev)
-{
-    return SVPublisher_addASDU(self, svID, datset, confRev);
-}
-
-static DEPRECATED
-void
-SampledValuesPublisher_setupComplete(SVPublisher self)
-{
-    SVPublisher_setupComplete(self);
-}
-
-static DEPRECATED
-void
-SampledValuesPublisher_publish(SVPublisher self)
-{
-    SVPublisher_publish(self);
-}
-
-static DEPRECATED
-void
-SampledValuesPublisher_destroy(SVPublisher self)
-{
-    SVPublisher_destroy(self);
-}
-
-static DEPRECATED
-void
-SV_ASDU_resetBuffer(SVPublisher_ASDU self)
-{
-    SVPublisher_ASDU_resetBuffer(self);
-}
-
-static DEPRECATED
-int
-SV_ASDU_addINT8(SVPublisher_ASDU self)
-{
-    return SVPublisher_ASDU_addINT8(self);
-}
-
-static DEPRECATED
-void
-SV_ASDU_setINT8(SVPublisher_ASDU self, int index, int8_t value)
-{
-    SVPublisher_ASDU_setINT8(self, index, value);
-}
-
-static DEPRECATED
-int
-SV_ASDU_addINT32(SVPublisher_ASDU self)
-{
-    return SVPublisher_ASDU_addINT32(self);
-}
-
-static DEPRECATED
-void
-SV_ASDU_setINT32(SVPublisher_ASDU self, int index, int32_t value)
-{
-    SVPublisher_ASDU_setINT32(self, index, value);
-}
-
-static DEPRECATED
-int
-SV_ASDU_addINT64(SVPublisher_ASDU self)
-{
-    return SVPublisher_ASDU_addINT64(self);
-}
-
-static DEPRECATED
-void
-SV_ASDU_setINT64(SVPublisher_ASDU self, int index, int64_t value)
-{
-    SVPublisher_ASDU_setINT64(self, index, value);
-}
-
-static DEPRECATED
-int
-SV_ASDU_addFLOAT(SVPublisher_ASDU self)
-{
-    return SVPublisher_ASDU_addFLOAT(self);
-}
-
-static DEPRECATED
-void
-SV_ASDU_setFLOAT(SVPublisher_ASDU self, int index, float value)
-{
-    SVPublisher_ASDU_setFLOAT(self, index, value);
-}
-
-static DEPRECATED
-int
-SV_ASDU_addFLOAT64(SVPublisher_ASDU self)
-{
-    return SVPublisher_ASDU_addFLOAT64(self);
-}
-
-static DEPRECATED
-void
-SV_ASDU_setFLOAT64(SVPublisher_ASDU self, int index, double value)
-{
-    SVPublisher_ASDU_setFLOAT64(self, index, value);
-}
-
-static DEPRECATED
-void
-SV_ASDU_setSmpCnt(SVPublisher_ASDU self, uint16_t value)
-{
-    SVPublisher_ASDU_setSmpCnt(self, value);
-}
-
-static DEPRECATED
-uint16_t
-SV_ASDU_getSmpCnt(SVPublisher_ASDU self)
-{
-    return SVPublisher_ASDU_getSmpCnt(self);
-}
-
-static DEPRECATED
-void
-SV_ASDU_increaseSmpCnt(SVPublisher_ASDU self)
-{
-    SVPublisher_ASDU_increaseSmpCnt(self);
-}
-
-static DEPRECATED
-void
-SV_ASDU_setRefrTm(SVPublisher_ASDU self, uint64_t refrTm)
-{
-    SVPublisher_ASDU_setRefrTm(self, refrTm);
-}
-
-static DEPRECATED
-void
-SV_ASDU_setSmpMod(SVPublisher_ASDU self, uint8_t smpMod)
-{
-    SVPublisher_ASDU_setSmpMod(self, smpMod);
-}
-
-static DEPRECATED
-void
-SV_ASDU_setSmpRate(SVPublisher_ASDU self, uint16_t smpRate)
-{
-    SVPublisher_ASDU_setSmpRate(self, smpRate);
-}
-
-/**@}*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LIBIEC61850_SRC_SAMPLED_VALUES_SV_PUBLISHER_DEPRECATED_H_ */
diff --git a/src/sampled_values/sv_subscriber.c b/src/sampled_values/sv_subscriber.c
index 573fc39e..39554063 100644
--- a/src/sampled_values/sv_subscriber.c
+++ b/src/sampled_values/sv_subscriber.c
@@ -832,3 +832,99 @@ SVSubscriber_ASDU_getDataSize(SVSubscriber_ASDU self)
     return self->dataBufferLength;
 }
 
+uint16_t
+SVClientASDU_getSmpCnt(SVSubscriber_ASDU self)
+{
+    return SVSubscriber_ASDU_getSmpCnt(self);
+}
+
+const char*
+SVClientASDU_getSvId(SVSubscriber_ASDU self)
+{
+    return SVSubscriber_ASDU_getSvId(self);
+}
+
+uint32_t
+SVClientASDU_getConfRev(SVSubscriber_ASDU self)
+{
+    return SVSubscriber_ASDU_getConfRev(self);
+}
+
+bool
+SVClientASDU_hasRefrTm(SVSubscriber_ASDU self)
+{
+    return SVSubscriber_ASDU_hasRefrTm(self);
+}
+
+uint64_t
+SVClientASDU_getRefrTmAsMs(SVSubscriber_ASDU self)
+{
+    return SVSubscriber_ASDU_getRefrTmAsMs(self);
+}
+
+int8_t
+SVClientASDU_getINT8(SVSubscriber_ASDU self, int index)
+{
+    return SVSubscriber_ASDU_getINT8(self, index);
+}
+
+int16_t
+SVClientASDU_getINT16(SVSubscriber_ASDU self, int index)
+{
+    return SVSubscriber_ASDU_getINT16(self, index);
+}
+
+int32_t
+SVClientASDU_getINT32(SVSubscriber_ASDU self, int index)
+{
+    return SVSubscriber_ASDU_getINT32(self, index);
+}
+
+int64_t
+SVClientASDU_getINT64(SVSubscriber_ASDU self, int index)
+{
+    return SVSubscriber_ASDU_getINT64(self, index);
+}
+
+uint8_t
+SVClientASDU_getINT8U(SVSubscriber_ASDU self, int index)
+{
+    return SVSubscriber_ASDU_getINT8U(self, index);
+}
+
+uint16_t
+SVClientASDU_getINT16U(SVSubscriber_ASDU self, int index)
+{
+    return SVSubscriber_ASDU_getINT16U(self, index);
+}
+
+uint32_t
+SVClientASDU_getINT32U(SVSubscriber_ASDU self, int index)
+{
+    return SVSubscriber_ASDU_getINT32U(self, index);
+}
+
+uint64_t
+SVClientASDU_getINT64U(SVSubscriber_ASDU self, int index)
+{
+    return SVSubscriber_ASDU_getINT64U(self, index);
+}
+
+float
+SVClientASDU_getFLOAT32(SVSubscriber_ASDU self, int index)
+{
+    return SVSubscriber_ASDU_getFLOAT32(self, index);
+}
+
+double
+SVClientASDU_getFLOAT64(SVSubscriber_ASDU self, int index)
+{
+    return SVSubscriber_ASDU_getFLOAT64(self, index);
+}
+
+int
+SVClientASDU_getDataSize(SVSubscriber_ASDU self)
+{
+    return SVSubscriber_ASDU_getDataSize(self);
+}
+
diff --git a/src/sampled_values/sv_subscriber.h b/src/sampled_values/sv_subscriber.h
index ef5ab875..879736a9 100644
--- a/src/sampled_values/sv_subscriber.h
+++ b/src/sampled_values/sv_subscriber.h
@@ -479,12 +479,75 @@ SVSubscriber_ASDU_getFLOAT64(SVSubscriber_ASDU self, int index);
 int
 SVSubscriber_ASDU_getDataSize(SVSubscriber_ASDU self);
 
+#ifndef DEPRECATED
+#if defined(__GNUC__) || defined(__clang__)
+  #define DEPRECATED __attribute__((deprecated))
+#else
+  #define DEPRECATED
+#endif
+#endif
+
+/**
+ * \addtogroup sv_subscriber_deprecated_api_group Deprecated API
+ * \ingroup sv_subscriber_api_group IEC 61850 Sampled Values (SV) publisher API
+ * \deprecated
+ * @{
+ */
+
+typedef struct sSVSubscriberASDU* SVClientASDU;
+
+DEPRECATED uint16_t
+SVClientASDU_getSmpCnt(SVSubscriber_ASDU self);
+
+DEPRECATED const char*
+SVClientASDU_getSvId(SVSubscriber_ASDU self);
+
+DEPRECATED uint32_t
+SVClientASDU_getConfRev(SVSubscriber_ASDU self);
+
+DEPRECATED bool
+SVClientASDU_hasRefrTm(SVSubscriber_ASDU self);
+
+DEPRECATED uint64_t
+SVClientASDU_getRefrTmAsMs(SVSubscriber_ASDU self);
+
+DEPRECATED int8_t
+SVClientASDU_getINT8(SVSubscriber_ASDU self, int index);
+
+DEPRECATED int16_t
+SVClientASDU_getINT16(SVSubscriber_ASDU self, int index);
+
+DEPRECATED int32_t
+SVClientASDU_getINT32(SVSubscriber_ASDU self, int index);
+
+DEPRECATED int64_t
+SVClientASDU_getINT64(SVSubscriber_ASDU self, int index);
+
+DEPRECATED uint8_t
+SVClientASDU_getINT8U(SVSubscriber_ASDU self, int index);
+
+DEPRECATED uint16_t
+SVClientASDU_getINT16U(SVSubscriber_ASDU self, int index);
+
+DEPRECATED uint32_t
+SVClientASDU_getINT32U(SVSubscriber_ASDU self, int index);
+
+DEPRECATED uint64_t
+SVClientASDU_getINT64U(SVSubscriber_ASDU self, int index);
+
+DEPRECATED float
+SVClientASDU_getFLOAT32(SVSubscriber_ASDU self, int index);
+
+DEPRECATED double
+SVClientASDU_getFLOAT64(SVSubscriber_ASDU self, int index);
+
+DEPRECATED int
+SVClientASDU_getDataSize(SVSubscriber_ASDU self);
+
 /**@} @}*/
 
 #ifdef __cplusplus
 }
 #endif
 
-#include "sv_subscriber_deprecated.h"
-
 #endif /* SAMPLED_VALUES_SV_SUBSCRIBER_ */
diff --git a/src/sampled_values/sv_subscriber_deprecated.h b/src/sampled_values/sv_subscriber_deprecated.h
deleted file mode 100644
index 5d5741aa..00000000
--- a/src/sampled_values/sv_subscriber_deprecated.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *  sv_subscriber_deprecated.h
- *
- *  Copyright 2015 Michael Zillgith
- *
- *  This file is part of libIEC61850.
- *
- *  libIEC61850 is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  libIEC61850 is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with libIEC61850.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  See COPYING file for the complete license text.
- */
-
-#ifndef SAMPLED_VALUES_SV_SUBSCRIBER_DEPRECATED_H_
-#define SAMPLED_VALUES_SV_SUBSCRIBER_DEPRECATED_H_
-
-#include "libiec61850_common_api.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__GNUC__) || defined(__clang__)
-  #define DEPRECATED __attribute__((deprecated))
-#else
-  #define DEPRECATED
-#endif
-
-/**
- * \addtogroup sv_subscriber_deprecated_api_group Deprecated API
- * \ingroup sv_subscriber_api_group IEC 61850 Sampled Values (SV) publisher API
- * \deprecated
- * @{
- */
-
-typedef struct sSVSubscriberASDU* SVClientASDU;
-
-static DEPRECATED
-uint16_t
-SVClientASDU_getSmpCnt(SVSubscriber_ASDU self)
-{
-	return SVSubscriber_ASDU_getSmpCnt(self);
-}
-
-static DEPRECATED
-const char*
-SVClientASDU_getSvId(SVSubscriber_ASDU self)
-{
-	return SVSubscriber_ASDU_getSvId(self);
-}
-
-static DEPRECATED
-uint32_t
-SVClientASDU_getConfRev(SVSubscriber_ASDU self)
-{
-	return SVSubscriber_ASDU_getConfRev(self);
-}
-
-static DEPRECATED
-bool
-SVClientASDU_hasRefrTm(SVSubscriber_ASDU self)
-{
-	return SVSubscriber_ASDU_hasRefrTm(self);
-}
-
-static DEPRECATED
-uint64_t
-SVClientASDU_getRefrTmAsMs(SVSubscriber_ASDU self)
-{
-	return SVSubscriber_ASDU_getRefrTmAsMs(self);
-}
-
-static DEPRECATED
-int8_t
-SVClientASDU_getINT8(SVSubscriber_ASDU self, int index)
-{
-	return SVSubscriber_ASDU_getINT8(self, index);
-}
-
-static DEPRECATED
-int16_t
-SVClientASDU_getINT16(SVSubscriber_ASDU self, int index)
-{
-	return SVSubscriber_ASDU_getINT16(self, index);
-}
-
-static DEPRECATED
-int32_t
-SVClientASDU_getINT32(SVSubscriber_ASDU self, int index)
-{
-	return SVSubscriber_ASDU_getINT32(self, index);
-}
-
-static DEPRECATED
-int64_t
-SVClientASDU_getINT64(SVSubscriber_ASDU self, int index)
-{
-	return SVSubscriber_ASDU_getINT64(self, index);
-}
-
-static DEPRECATED
-uint8_t
-SVClientASDU_getINT8U(SVSubscriber_ASDU self, int index)
-{
-	return SVSubscriber_ASDU_getINT8U(self, index);
-}
-
-static DEPRECATED
-uint16_t
-SVClientASDU_getINT16U(SVSubscriber_ASDU self, int index)
-{
-	return SVSubscriber_ASDU_getINT16U(self, index);
-}
-
-static DEPRECATED
-uint32_t
-SVClientASDU_getINT32U(SVSubscriber_ASDU self, int index)
-{
-	return SVSubscriber_ASDU_getINT32U(self, index);
-}
-
-static DEPRECATED
-uint64_t
-SVClientASDU_getINT64U(SVSubscriber_ASDU self, int index)
-{
-	return SVSubscriber_ASDU_getINT64U(self, index);
-}
-
-static DEPRECATED
-float
-SVClientASDU_getFLOAT32(SVSubscriber_ASDU self, int index)
-{
-	return SVSubscriber_ASDU_getFLOAT32(self, index);
-}
-
-static DEPRECATED
-double
-SVClientASDU_getFLOAT64(SVSubscriber_ASDU self, int index)
-{
-	return SVSubscriber_ASDU_getFLOAT64(self, index);
-}
-
-static DEPRECATED
-int
-SVClientASDU_getDataSize(SVSubscriber_ASDU self)
-{
-	return SVSubscriber_ASDU_getDataSize(self);
-}
-
-/**@}*/
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* SAMPLED_VALUES_SV_SUBSCRIBER_DEPRECATED_H_ */