Fix clean rule
Organize includes