fix some forward defines and includes
0.11.1