forward-declaratation instead of #include
minor improvements.