Index: layer_compat.c
===================================================================
--- layer_compat.c	(revision 15678)
+++ layer_compat.c	(revision 15679)
@@ -35,6 +35,8 @@
 #include "board.h"
 #include "data.h"
 
+#warning padstack TODO: rewrite this for padstack, if needed
+#if 0
 static void swap_one_thermal(int lid1, int lid2, pcb_pin_t * pin)
 {
 	int was_on_l1 = !!PCB_FLAG_THERM_GET(lid1, pin);
@@ -43,6 +45,7 @@
 	PCB_FLAG_THERM_ASSIGN(lid2, was_on_l1, pin);
 	PCB_FLAG_THERM_ASSIGN(lid1, was_on_l2, pin);
 }
+#endif
 
 int pcb_layer_swap(pcb_board_t *pcb, pcb_layer_id_t lid1, pcb_layer_id_t lid2)
 {
Index: pstk_help.c
===================================================================
--- pstk_help.c	(revision 15678)
+++ pstk_help.c	(revision 15679)
@@ -136,12 +136,6 @@
 
 		/* find holes */
 		switch(h->type) {
-			case PCB_OBJ_VIA:
-				cx = ((pcb_pin_t *)h)->X;
-				cy = ((pcb_pin_t *)h)->Y;
-				d = ((pcb_pin_t *)d)->DrillingHole;
-				plated = !PCB_FLAG_TEST(PCB_FLAG_HOLE, h);
-				break;
 			case PCB_OBJ_PSTK:
 				p = pcb_pstk_get_proto((pcb_pstk_t *)h);
 				if ((p == NULL) || (p->hdia <= 0))