Removed unneeded #includes
Made dummy struct members unnamed