get rid of nullptr and reorder headers
no need for -std=gnu++11 anymore