diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index 816d39965ee..4d15fbea542 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -104,8 +104,8 @@ typedef enum eCustomDataType {
   CD_AUTO_FROM_NAME = -1,
 
 #ifdef DNA_DEPRECATED_ALLOW
-  CD_MVERT = 0,   /* DEPRECATED */
-  CD_MSTICKY = 1, /* DEPRECATED */
+  CD_MVERT = 0,
+  CD_MSTICKY = 1,
 #endif
   CD_MDEFORMVERT = 2, /* Array of `MDeformVert`. */
   CD_MEDGE = 3,
@@ -125,9 +125,9 @@ typedef enum eCustomDataType {
   CD_ORIGSPACE = 13, /* for modifier stack face location mapping */
   CD_ORCO = 14,      /* undeformed vertex coordinates, normalized to 0..1 range */
 #ifdef DNA_DEPRECATED_ALLOW
-  CD_MTEXPOLY = 15, /* deprecated */
-#endif
+  CD_MTEXPOLY = 15,
   CD_MLOOPUV = 16,
+#endif
   CD_PROP_BYTE_COLOR = 17,
   CD_TANGENT = 18,
   CD_MDISPS = 19,
@@ -138,7 +138,9 @@ typedef enum eCustomDataType {
   /* CD_RECAST = 24, */ /* UNUSED */
 
   CD_MPOLY = 25,
+#ifdef DNA_DEPRECATED_ALLOW
   CD_MLOOP = 26,
+#endif
   CD_SHAPE_KEYINDEX = 27,
   CD_SHAPEKEY = 28,
   CD_BWEIGHT = 29,
@@ -156,7 +158,9 @@ typedef enum eCustomDataType {
   CD_MLOOPTANGENT = 39,
   CD_TESSLOOPNORMAL = 40,
   CD_CUSTOMLOOPNORMAL = 41,
+#ifdef DNA_DEPRECATED_ALLOW
   CD_SCULPT_FACE_SETS = 42,
+#endif
 
   /* CD_LOCATION = 43, */ /* UNUSED */
   /* CD_RADIUS = 44, */   /* UNUSED */
@@ -174,8 +178,6 @@ typedef enum eCustomDataType {
 } eCustomDataType;
 
 /* Bits for eCustomDataMask */
-// #define CD_MASK_MVERT (1 << CD_MVERT) /* DEPRECATED */
-// #define CD_MASK_MSTICKY      (1 << CD_MSTICKY)  /* DEPRECATED */
 #define CD_MASK_MDEFORMVERT (1 << CD_MDEFORMVERT)
 #define CD_MASK_MEDGE (1 << CD_MEDGE)
 #define CD_MASK_MFACE (1 << CD_MFACE)
@@ -189,13 +191,11 @@ typedef enum eCustomDataType {
 #define CD_MASK_PROP_STRING (1 << CD_PROP_STRING)
 #define CD_MASK_ORIGSPACE (1 << CD_ORIGSPACE)
 #define CD_MASK_ORCO (1 << CD_ORCO)
-// #define CD_MASK_MTEXPOLY (1 << CD_MTEXPOLY)  /* DEPRECATED */
 #define CD_MASK_PROP_BYTE_COLOR (1 << CD_PROP_BYTE_COLOR)
 #define CD_MASK_TANGENT (1 << CD_TANGENT)
 #define CD_MASK_MDISPS (1 << CD_MDISPS)
 #define CD_MASK_PREVIEW_MCOL (1 << CD_PREVIEW_MCOL)
 #define CD_MASK_CLOTH_ORCO (1 << CD_CLOTH_ORCO)
-// #define CD_MASK_RECAST (1 << CD_RECAST)  /* DEPRECATED */
 
 #define CD_MASK_SHAPE_KEYINDEX (1 << CD_SHAPE_KEYINDEX)
 #define CD_MASK_SHAPEKEY (1 << CD_SHAPEKEY)