Variables called 'namespace' in include files cause problems when included in c++ codebase

Including files such as rp_header.h and rp_element.h in axis2c/neethi/include generate the following error:
../../../include/axis2-1.1/rp_header.h:57: error: expected ',' or '...' before 'namespace'

This is due to the fact that the word 'namespace' is reserved in c++. It can be fixed by simply renaming the variable to some other values as will be shown by the example diffs I will attach.