moved some includes to header file