Fix constructors
cheader definition scraping