Refactoring; remove some of header files from plot.h