Cleaned up includes in implementation files
Merge remote-tracking branch 'galdor557/master'
add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt
Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again