Formal changes to build with gcc

Apply some formal changes needed to allow building with gcc (tested with gcc 5.2, 5.4 and 7.3) on an Ubuntu-based system