Revert "Fixed some warnings"

This reverts commit 4cb0b82d1df560ad32c92eede91f466c75a87c87.
Merge branch 'master' into Werror

Conflicts:
	src/ChunkDef.h