conflicting forward declaration fixed (issue #60)