Use the original include paths, instead of full paths.  Also, mark upc_tick.h as being part of the pre-included upcr_proxy.h.  (test30/31)