Renamed the source files for the common XFF code
- Fixed all includes
- Updated the makefile