Reverting typedef to #define to preserve compatibility
Copying the Makefile.in is probably better than symlinking