Update Makefile to include header files.
Solve problem 1061.
Finish comments for problem 1061.