Minor code improvements

Fixed some headers duplication issues during compilation