Index: gcode.c
===================================================================
--- gcode.c	(revision 19132)
+++ gcode.c	(revision 19133)
@@ -69,6 +69,7 @@
 #include "trace.h"
 #include "decompose.h"
 #include "pcb-printf.h"
+#include "funchash_core.h"
 
 #include "hid_init.h"
 #include "hid_attrib.h"
@@ -557,7 +558,7 @@
 	if ((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK)
 		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);
 
 	if (is_mask) {