Make triangle faces in stead of square faces
Select everything in edit mode with A and press CtrlT
Alternatively, if feel that you might still need to make changes while it has square faces, you can add a Triangulate modifier to the model. This will triangulate the faces, but you can still edit it as if it had square faces. This modifier can be applied or removed any time you like.