Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 12138)
+++ trunk/src/draw.c	(revision 12139)
@@ -666,9 +666,7 @@
 	case PCB_OBJ_LAYER:
 	case PCB_OBJ_ELINE:
 	case PCB_OBJ_EARC:
-	case PCB_OBJ_CLASS_MASK:
-	case PCB_OBJ_CLASS_OBJ:
-	case PCB_OBJ_ANY:
+	case PCB_OBJ_VOID:
 		break;
 	}
 }
Index: trunk/src/obj_common.c
===================================================================
--- trunk/src/obj_common.c	(revision 12138)
+++ trunk/src/obj_common.c	(revision 12139)
@@ -58,8 +58,6 @@
 		case PCB_OBJ_ELINE:
 		case PCB_OBJ_EARC:
 		case PCB_OBJ_ETEXT:
-		case PCB_OBJ_CLASS_MASK:
-		case PCB_OBJ_ANY:
 			break;
 	}
 	return "<unknown/composite>";
Index: trunk/src/obj_common.h
===================================================================
--- trunk/src/obj_common.h	(revision 12138)
+++ trunk/src/obj_common.h	(revision 12139)
@@ -58,15 +58,18 @@
 	/* temporary, for backward compatibility */
 	PCB_OBJ_ELINE     = 0x200001,
 	PCB_OBJ_EARC      = 0x200002,
-	PCB_OBJ_ETEXT     = 0x200004,
+	PCB_OBJ_ETEXT     = 0x200004
+} pcb_objtype_t;
 
-	/* combinations, groups, masks */
+/* combinations, groups, masks of pcb_objtype_t */
+typedef enum pcb_objmask_e {
 	PCB_OBJ_CLASS_MASK= 0xF00000,
 	PCB_OBJ_CLASS_OBJ = 0x000000, /* anything with common object fields (pcb_any_obj_t) */
 	PCB_OBJ_CLASS_REAL= 0x000FFF, /* global and on-layer objects (but not abstract things like layers) */
 	PCB_OBJ_ANY       = 0xFFFFFF
-} pcb_objtype_t;
+}  pcb_objmask_t;
 
+
 /* point and box type - they are so common everything depends on them */
 struct pcb_point_s {    /* a line/polygon point */
 	pcb_coord_t X, Y, X2, Y2;   /* so Point type can be cast as pcb_box_t */
Index: trunk/src_plugins/io_hyp/write.c
===================================================================
--- trunk/src_plugins/io_hyp/write.c	(revision 12138)
+++ trunk/src_plugins/io_hyp/write.c	(revision 12139)
@@ -417,9 +417,7 @@
 			case PCB_OBJ_ELINE:
 			case PCB_OBJ_EARC:
 			case PCB_OBJ_ETEXT:
-			case PCB_OBJ_CLASS_MASK:
-			case PCB_OBJ_CLASS_OBJ:
-			case PCB_OBJ_ANY:
+			case PCB_OBJ_VOID:
 				break;									/* silently ignore these */
 			}
 		}