Some include clean up; tracing methods of zorro made extern such that
all class can use them for debug tracing.
Removed double defintion of DLLFUNC.