compiler errors fixed...header dependency partially fixed.