Removed these headers and placed a copy under /java/devtools/share/plugin/plugin2_mozilla_headers . The README.txt in that directory indicates the origin of the files and slight modifications made. A workspace containing the deltas for these files is being archived at /net/jano1.sfbay/export1/deployment/kbr/ws/plugin2_mozilla_headers/ .
Note that if you build the plug-in and copy the mozilla_headers_18 and mozilla_headers_18.win32 directories to your local machine, you will need to copy the plugin2_mozilla_headers alongside those directories. A .tar.gz file is present under /java/devtools/share/plugin/ for convenience.
Tested by building and running new plug-in on Windows and Solaris/x86. Build changes only; no regression test.