updating support.h and reducing the number of included header files