Fixed SQL and removed Includes