Fixed and improved timer definitions
Fixed include statement