cfwrapper enhanced (cleaning of header files)