Replaced GCC-specific syntax
Combined export.h and compat.hpp