Remove forward declaration
Add attribution