Add proper includes & fix syntax errors