This makes it easier to build both EAP peer and server functionality into the same project with some toolchains.
In addition, start ordering header file includes to be in more consistent order: system header files, src/utils, src/*, same directory as the *.c file.