diff -r e0a76ee1bb2b -r efeb98bc69c9 src/chess/rules.h
--- a/src/chess/rules.h	Tue Apr 01 14:04:00 2014 +0200
+++ b/src/chess/rules.h	Thu Apr 03 16:07:04 2014 +0200
@@ -77,8 +77,6 @@
     uint8_t torow;
     uint8_t promotion;
     _Bool check;
-    _Bool checkmate;
-    _Bool stalemate; // TODO: find a better place for checkmate and stalemate
     _Bool capture;
 } Move;
 
@@ -94,6 +92,8 @@
     uint8_t mycolor;
     MoveList* movelist;
     MoveList* lastmove;
+    _Bool checkmate;
+    _Bool stalemate;
 } GameState;
 
 #define opponent_color(color) ((color)==WHITE?BLACK:WHITE)