Restructured includes and dependencies to get rid of build errors. Runtime error still because of missing dll/bad ptr