Cleanup some extra FMDatabase requirements (although we don't plan to use FMDatabasePool, include's are cleaner this way)