Fixed neglected includes.
Fixed missing tag for Fitbit.