PCem v16 merge almost done. It boots and at least A2286 BIOS detects FPU if enabled. Most merge issues were again C vs C++ and GCC/MSVC differences.
Hopefully PCem author can accept some patches that should make future merges easier and faster. Otherwise PCem code is quite nicely modular.
I'll post testing thread later. I am not going to do any more testing than to confirm DOS disk boots
Test thread posted. This gets closed.