removed headers from *.h and *.cpp