Changed include files back to fox-1.6
Merge branch 'master' into openGL2