Fix forwarding declaration of some headers

Signed-off-by: Karfield Chen <karfield@126.com>