fixed circular includes