3 files changed, 1 insertions, 25 deletions
diff --git a/include/odp/api/abi-default/classification.h b/include/odp/api/abi-default/classification.h
index e0573fd40..1e73f439b 100644
--- a/include/odp/api/abi-default/classification.h
+++ b/include/odp/api/abi-default/classification.h
@@ -11,8 +11,6 @@
 extern "C" {
 #endif
 
-#include <odp/api/deprecated.h>
-
 /** @internal Dummy type for strong typing */
 typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_cos_t;
 
@@ -29,14 +27,6 @@ typedef _odp_abi_pmr_t *odp_pmr_t;
 #define ODP_COS_INVALID   ((odp_cos_t)0)
 #define ODP_PMR_INVALID   ((odp_pmr_t)0)
 
-#if ODP_DEPRECATED_API
-#define ODP_PMR_INVAL     ODP_PMR_INVALID
-#else
-/* Required to prevent Doxygen warning */
-#define ODP_PMR_INVAL
-#undef ODP_PMR_INVAL
-#endif
-
 #define ODP_COS_NAME_LEN  32
 
 /**
diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h
index 633963692..15b2183da 100644
--- a/include/odp/api/spec/classification.h
+++ b/include/odp/api/spec/classification.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2014-2018, Linaro Limited
- * Copyright (c) 2021, Nokia
+ * Copyright (c) 2021-2022, Nokia
  * All rights reserved.
  *
  * SPDX-License-Identifier:     BSD-3-Clause
@@ -52,11 +52,6 @@ extern "C" {
  */
 
 /**
- * @def ODP_PMR_INVAL
- * @deprecated Use ODP_PMR_INVALID instead
- */
-
-/**
  * Supported PMR term values
  *
  * Supported Packet Matching Rule term values in a bit field structure.
diff --git a/platform/linux-generic/include-abi/odp/api/abi/classification.h b/platform/linux-generic/include-abi/odp/api/abi/classification.h
index 843e15f6c..342f4124c 100644
--- a/platform/linux-generic/include-abi/odp/api/abi/classification.h
+++ b/platform/linux-generic/include-abi/odp/api/abi/classification.h
@@ -18,7 +18,6 @@ extern "C" {
 #endif
 
 #include <odp/api/plat/strong_types.h>
-#include <odp/api/deprecated.h>
 
 /** @ingroup odp_classification
  *  @{
@@ -30,14 +29,6 @@ typedef ODP_HANDLE_T(odp_cos_t);
 typedef ODP_HANDLE_T(odp_pmr_t);
 #define ODP_PMR_INVALID     _odp_cast_scalar(odp_pmr_t, 0)
 
-#if ODP_DEPRECATED_API
-#define ODP_PMR_INVAL     ODP_PMR_INVALID
-#else
-/* Required to prevent Doxygen warning */
-#define ODP_PMR_INVAL
-#undef ODP_PMR_INVAL
-#endif
-
 #define ODP_COS_NAME_LEN  32
 
 /**