Hello, The attached goes through and adds a number of header dependencies to Makefile.in and #ifdef XX_H \ #define XX_H \ #endif wrappers to some of the corresponding header files. Some of the .h files had #define EXTERN extern wackiness and I let them be. I've checked it in as obvious. Andrew