Index: layer_compat.c
===================================================================
--- layer_compat.c	(revision 15618)
+++ layer_compat.c	(revision 15619)
@@ -34,7 +34,6 @@
 
 #include "board.h"
 #include "data.h"
-#include "obj_pinvia.h"
 
 static void swap_one_thermal(int lid1, int lid2, pcb_pin_t * pin)
 {
@@ -59,18 +58,15 @@
 	pcb_layer_move_(&pcb->Data->Layer[lid1], &l2tmp);
 	pcb_layer_move_(&pcb->Data->Layer[lid2], &l1tmp);
 
+#warning padstack TODO: rewrite this for padstack, if needed
+#if 0
 	PCB_VIA_LOOP(pcb->Data);
 	{
 		swap_one_thermal(lid1, lid2, via);
 	}
 	PCB_END_LOOP;
+#endif
 
-	PCB_PIN_ALL_LOOP(pcb->Data);
-	{
-		swap_one_thermal(lid1, lid2, pin);
-	}
-	PCB_ENDALL_LOOP;
-
 	for(gid = 0; gid < pcb_max_group(pcb); gid++) {
 		pcb_layergrp_t *g = &pcb->LayerGroups.grp[gid];
 		int n;