fix GCC/4.7.{0,1} and undo/remove tophat rename operations

Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>
merge it all together again

Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>