Fix: Removed status codes. Moved includes to implementation