diff --git a/vcg/simplex/face/with/afavfn.h b/vcg/simplex/face/with/afavfn.h
new file mode 100644
index 00000000..d49cb039
--- /dev/null
+++ b/vcg/simplex/face/with/afavfn.h
@@ -0,0 +1,18 @@
+#ifndef __VCGLIB_FACE_AFAVFN_TYPE
+#define __VCGLIB_FACE_AFAVFN_TYPE
+
+#define FACE_TYPE FaceFAFNVA 
+
+#define __VCGLIB_FACE_AF
+#define __VCGLIB_FACE_FN
+#define __VCGLIB_FACE_AV
+
+#include <vcg/simplex/face/base.h> 
+
+#undef FACE_TYPE 
+
+#undef __VCGLIB_FACE_AF
+#undef __VCGLIB_FACE_FN
+#undef __VCGLIB_FACE_AV
+
+#endif
\ No newline at end of file
diff --git a/vcg/simplex/face/with/fafnva.h b/vcg/simplex/face/with/fafnva.h
deleted file mode 100644
index d238a92b..00000000
--- a/vcg/simplex/face/with/fafnva.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __VCGLIB_FACE_FAFNVA_TYPE
-#define __VCGLIB_FACE_FAFNVA_TYPE
-
-#define FACE_TYPE FaceFAFNVA 
-
-#define __VCGLIB_FACE_FA
-#define __VCGLIB_FACE_FN
-#define __VCGLIB_FACE_VA
-
-#include <vcg/simplex/face/base.h> 
-
-#undef FACE_TYPE 
-
-#undef __VCGLIB_FACE_FA
-#undef __VCGLIB_FACE_FN
-#undef __VCGLIB_FACE_VA
-
-#endif
\ No newline at end of file