Jeff, your todays header changes have broken the building of HEAD in
case Lua is enabled with --with-lua=internal:

libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -I. -I..
-I../build -I../lib -I../lib -I../rpmdb -I../rpmio -I../misc
-I../lua/local -I../lua/local -I../lua -I../lua -DRPM_VENDOR_OPENPKG
-DRPM_INTEGRITY_FP=\"7971E0F1F694CABDF8EAEF534F64D9D856BE2BA6\"
-DRPM_INTEGRITY_MV=\"0.9.0\" -DRPM_OS_FREEBSD=060300
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/popt-1.14
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/zlib-1.2.3
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/bzip2-1.0.5
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/lzma-4.999.3alpha
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/beecrypt-4.1.2
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/openssl-0.9.8h/include
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/neon-0.28.1/src
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/file-4.25/src
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/db-4.7.25/build_unix
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/sqlite-3.6.0
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/pcre-7.7
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/uuid-1.6.2
-I/d2/u/rse/prj/rpm/src/3rd/bin/ix86-freebsd6.3/xar-1.5.2/include
-Wall -W -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
-Wno-char-subscripts -Wno-missing-field-initializers
-Wno-unused-parameter -O0 -g3 -D_GNU_SOURCE -D_REENTRANT -MT
rpmluaext.lo -MD -MP -MF .deps/rpmluaext.Tpo -c rpmluaext.c -o
rpmluaext.o
In file included from ./rpmcli.h:11,
                 from rpmluaext.c:14:
./rpmps.h:233: error: expected declaration specifiers or '...' before 'fnpyKey'
./rpmps.h:322: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'rpmProblemKey'
In file included from ./rpmcli.h:12,
                 from rpmluaext.c:14:
./rpmte.h:212: error: expected declaration specifiers or '...' before 'fnpyKey'
./rpmte.h:594: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'rpmteKey'
In file included from ./rpmcli.h:13,
                 from rpmluaext.c:14:
./rpmts.h:881: error: expected declaration specifiers or '...' before 'rpmCallbackType'
./rpmts.h:1063: error: expected declaration specifiers or '...' before 'rpmCallbackFunction'
./rpmts.h:1064: error: expected declaration specifiers or '...' before 'rpmCallbackData'
./rpmts.h:1095: warning: type defaults to 'int' in declaration of 'fnpyKey'
./rpmts.h:1095: error: expected ';', ',' or ')' before 'key'
In file included from rpmluaext.c:14:
./rpmcli.h:465: warning: type defaults to 'int' in declaration of 'rpmCallbackType'
./rpmcli.h:465: error: expected ';', ',' or ')' before 'what'
In file included from rpmluaext.c:15:
./rpmds.h:654: warning: type defaults to 'int' in declaration of 'fnpyKey'
./rpmds.h:654: error: expected ';', ',' or ')' before '*' token

                                       Ralf S. Engelschall
                                       rse@engelschall.com
                                       www.engelschall.com