Cleaned up template function declarations, allowing to drop a lot of macros

By only putting the templated code in the right place (i.e. in the header file where functions are declared), I could drop 2 useless headers and a large bunch of macros.