Updated include files; removed shared_ptrs to queues