[PATCH 01/11] Remove #include <timestamp.h> from files which do not need it