Moved some includes to header file