Arrange header files

Add some comment to member variables and functions.
For more, remove some unused header includes.