merge: sidebar

 * build fix for old compilers

diff --cc buffy.h
Simple merge

diff --cc mx.h
Simple merge

diff --cc sidebar.h
Simple merge