Update and rename m4.hpp to m4.h