Cleanup header files
Merge branch 'master' of https://github.com/mipani/Mega-Swirl into Issue-20