fixed includes for usenew static