broker split up, headers with ifdef stuff, socket tests