Removed recursive include issue