Finished item use, cleaned up forward declarations and includes