Take out dynamic.h header include from general.h