Add the necessary includes, add an extra empty line for cosmetics