Index: eps.c
===================================================================
--- eps.c	(revision 19132)
+++ eps.c	(revision 19133)
@@ -382,7 +382,7 @@
 			return 0;
 	}
 
-	is_drill = ((flags & PCB_LYT_PDRILL) || (flags & PCB_LYT_UDRILL));
+	is_drill = PCB_LAYER_IS_DRILL(flags, purpi);
 	is_mask = (flags & PCB_LYT_MASK);
 	is_paste = !!(flags & PCB_LYT_PASTE);
 
Index: ps.c
===================================================================
--- ps.c	(revision 19132)
+++ ps.c	(revision 19133)
@@ -827,7 +827,7 @@
 
 	name = pcb_layer_to_file_name(tmp_ln, layer, flags, purpose, purpi, PCB_FNS_fixed);
 
-	global.is_drill = ((flags & PCB_LYT_PDRILL) || (flags & PCB_LYT_UDRILL));
+	global.is_drill = PCB_LAYER_IS_DRILL(flags, purpi);
 	global.is_mask = !!(flags & PCB_LYT_MASK);
 	global.is_assy = PCB_LAYER_IS_ASSY(flags, purpi);
 	global.is_copper = !!(flags & PCB_LYT_COPPER);