Index: trunk/src/macro.h
===================================================================
--- trunk/src/macro.h	(revision 15873)
+++ trunk/src/macro.h	(revision 15874)
@@ -50,24 +50,6 @@
 #define PCB_SQUARE(x)          ((float) (x) * (float) (x))
 
 /* ---------------------------------------------------------------------------
- * returns the object ID
- */
-#define PCB_OBJECT_ID(p)  (((pcb_any_obj_t *) p)->ID)
-
-/* ---------------------------------------------------------------------------
- *  Determines if object is on front or back
- */
-#define PCB_FRONT(o)	\
-	((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (o)) != 0) == PCB_SWAP_IDENT)
-
-/* ---------------------------------------------------------------------------
- *  Determines if an object is on the given side. side is either PCB_SOLDER_SIDE
- *  or PCB_COMPONENT_SIDE.
- */
-#define PCB_ON_SIDE(element, side) \
-        (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) == (side == PCB_SOLDER_SIDE))
-
-/* ---------------------------------------------------------------------------
  * some loop shortcuts
  *
  * a pointer is created from index addressing because the base pointer
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 15873)
+++ trunk/src/search.c	(revision 15874)
@@ -480,6 +480,9 @@
 	return pcb_false;
 }
 
+#warning subc TODO: this is not how it is done - PCB_FLAG_ONSOLDER is not used for subc
+#define PCB_FRONT(o) ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (o)) != 0) == PCB_SWAP_IDENT)
+
 static pcb_r_dir_t subc_callback(const pcb_box_t *box, void *cl)
 {
 	pcb_subc_t *subc = (pcb_subc_t *) box;
Index: trunk/src/undo_old.c
===================================================================
--- trunk/src/undo_old.c	(revision 15873)
+++ trunk/src/undo_old.c	(revision 15874)
@@ -95,6 +95,7 @@
 static pcb_bool UndoChangeClearSize(UndoListTypePtr);
 static pcb_bool UndoClearPoly(UndoListTypePtr);
 
+#define PCB_OBJECT_ID(p) (((pcb_any_obj_t *) p)->ID)
 
 static void pcb_undo_old_free(void *udata);
 static int pcb_undo_old_undo(void *udata);