diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h
index 24dbec767..915ba8b32 100644
--- a/Source/Include/swigwarn.h
+++ b/Source/Include/swigwarn.h
@@ -177,12 +177,11 @@
 #define WARN_JAVA_MULTIPLE_INHERITANCE        813
 #define WARN_JAVA_TYPEMAP_GETCPTR_UNDEF       814
 #define WARN_JAVA_TYPEMAP_CLASSMOD_UNDEF      815
-#define WARN_JAVA_TYPEMAP_PTRCONSTMOD_UNDEF   816
+#define WARN_JAVA_TYPEMAP_JAVABODY_UNDEF      816
 #define WARN_JAVA_TYPEMAP_JAVAOUT_UNDEF       817
 #define WARN_JAVA_TYPEMAP_JAVAIN_UNDEF        818
 #define WARN_JAVA_TYPEMAP_JAVADIRECTORIN_UNDEF    819
 #define WARN_JAVA_TYPEMAP_JAVADIRECTOROUT_UNDEF   820
-#define WARN_JAVA_TYPEMAP_NODIRECTOR_CODE     821
 #define WARN_JAVA_COVARIANT_RET               822
 
 /* please leave 810-829 free for Java */
@@ -193,12 +192,11 @@
 #define WARN_CSHARP_MULTIPLE_INHERITANCE      833
 #define WARN_CSHARP_TYPEMAP_GETCPTR_UNDEF     834
 #define WARN_CSHARP_TYPEMAP_CLASSMOD_UNDEF    835
-#define WARN_CSHARP_TYPEMAP_PTRCONSTMOD_UNDEF 836
+#define WARN_CSHARP_TYPEMAP_CSBODY_UNDEF      836
 #define WARN_CSHARP_TYPEMAP_CSOUT_UNDEF       837
 #define WARN_CSHARP_TYPEMAP_CSIN_UNDEF        838
 #define WARN_CSHARP_TYPEMAP_CSDIRECTORIN_UNDEF    839
 #define WARN_CSHARP_TYPEMAP_CSDIRECTOROUT_UNDEF   840
-#define WARN_CSHARP_TYPEMAP_NODIRECTOR_CODE   841
 #define WARN_CSHARP_COVARIANT_RET             842
 
 /* please leave 830-849 free for C# */