[HACKERS] Trouble building uuid-ossp extension in new versions of Postgres

I cd into <src_trunk>/contrib/uuid-ossp, and type "make" and this happens (on Mac, see compiler version below):

$ make
gcc -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -Wno-unused-command-line-argument -O2  -I../../contrib/pgcrypto -I. -I. -I../../src/include   -c -o uuid-ossp.o uuid-ossp.c

uuid-ossp.c:282:23: error: use of undeclared identifier 'uuid_s_ok'
                                uint32_t        status = uuid_s_ok;
                                                         ^
uuid-ossp.c:285:5: warning: implicit declaration of function 'uuid_create' is invalid in C99 [-Wimplicit-function-declaration]
                                uuid_create(&uu, &status);
                                ^
uuid-ossp.c:287:19: error: use of undeclared identifier 'uuid_s_ok'
                                if (status == uuid_s_ok)
                                              ^
uuid-ossp.c:289:6: warning: implicit declaration of function 'uuid_to_string' is invalid in C99 [-Wimplicit-function-declaration]
                                        uuid_to_string(&uu, &str, &status);
                                        ^
uuid-ossp.c:290:20: error: use of undeclared identifier 'uuid_s_ok'
                                        if (status == uuid_s_ok)
                                                      ^
uuid-ossp.c:306:19: error: use of undeclared identifier 'uuid_s_ok'
                                if (status != uuid_s_ok)

...