Fixed file includes and syntax errors