diff --git a/data/eng/Makefile b/data/eng/Makefile
index 0917c23e65..4136c4200c 100644
--- a/data/eng/Makefile
+++ b/data/eng/Makefile
@@ -76,12 +76,12 @@ FASM_PROGRAMS:=\
  vrr_m:VRR_M:$(PROGS)/system/vrr_m/trunk/vrr_m.asm \
  zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \
  3d/3dcube2:3D/3DCUBE2:$(PROGS)/demos/3dcube2/trunk/3DCUBE2.ASM \
+ 3d/3dspiral:3D/3DSPIRAL:$(PROGS)/demos/3dspiral/trunk/3dspiral.asm \
  3d/3dtcub10:3D/3DTCUB10:$(PROGS)/demos/3dtcub10/trunk/3DTCUB10.ASM \
  3d/crownscr:3D/CROWNSCR:$(PROGS)/demos/crownscr/trunk/crownscr.asm  \
+ 3d/flatwav:3D/FLATWAV:$(PROGS)/demos/flatwav/trunk/FLATWAV.ASM \
  3d/free3d04:3D/FREE3D04:$(PROGS)/demos/free3d04/trunk/free3d04.asm \
  3d/view3ds:3D/VIEW3DS:$(PROGS)/demos/3DS/VIEW3DS.ASM \
- 3d/3dspiral:3D/3DSPIRAL:$(PROGS)/demos/3dspiral/trunk/3dspiral.asm \
- 3d/flatwav:3D/FLATWAV:$(PROGS)/demos/flatwav/trunk/FLATWAV.ASM \
  demos/bcdclk:DEMOS/BCDCLK:$(PROGS)/demos/bcdclk/trunk/bcdclk.asm \
  demos/circle:DEMOS/CIRCLE:$(PROGS)/develop/examples/circle/trunk/circle.asm \
  demos/colorref:DEMOS/COLORREF:$(PROGS)/demos/colorref/trunk/colorref.asm \
@@ -124,6 +124,11 @@ FASM_PROGRAMS:=\
  fonts/bgitest:FONTS/BGITEST:$(PROGS)/demos/bgitest/trunk/bgitest.asm \
  games/15:GAMES/15:$(PROGS)/games/15/trunk/15.ASM \
  games/arcanii:GAMES/ARCANII:$(PROGS)/games/arcanii/trunk/arcanii.asm \
+ games/bnc:GAMES/BNC:$(PROGS)/games/bnc/trunk/bnc.asm \
+ games/gomoku:GAMES/GOMOKU:$(PROGS)/games/gomoku/trunk/gomoku.asm \
+ games/msquare:GAMES/MSQUARE:$(PROGS)/games/MSquare/trunk/MSquare.asm \
+ games/sq_game:GAMES/SQ_GAME:$(PROGS)/games/sq_game/trunk/SQ_GAME.ASM \
+ games/sudoku:GAMES/SUDOKU:$(PROGS)/games/sudoku/trunk/sudoku.asm \
  games/freecell:GAMES/FREECELL:$(PROGS)/games/freecell/freecell.ASM \
  games/invaders:GAMES/INVADERS:$(PROGS)/games/invaders/invaders.asm \
  games/kox:GAMES/KOX:$(PROGS)/games/kox/trunk/kox.asm \
@@ -204,8 +209,9 @@ COPY_FILES:=\
 CMM_PROGRAMS:=\
  File|Managers/eolite:File|Managers/EOLITE:$(PROGS)/fs/Eolite/trunk/Eolite.c-- \
  games/clicks:GAMES/CLICKS:$(PROGS)/games/clicks/trunk/clicks.c-- \
+ games/FindNumbers:GAMES/FindNumbers:$(PROGS)/games/FindNumbers/trunk/FindNumbers.c-- \
  games/mine:GAMES/MINE:$(PROGS)/games/mine/trunk/mine.c--:/MEOS \
-# end if list
+# end of list
 
 # List of other files to be included in the image file.
 # Some of them are auto-built with special rules, some just exist before build.
@@ -237,15 +243,10 @@ OTHER_FILES:=asciivju:ASCIIVJU autorun.dat:AUTORUN.DAT \
  File|Managers/kfm_keys.txt:File|Managers/KFM_KEYS.TXT \
  fonts/bold.chr:FONTS/BOLD.CHR fonts/char2.mt:FONTS/CHAR2.MT \
  fonts/char.mt:FONTS/CHAR.MT \
- games/bnc:GAMES/BNC \
- games/checkers:GAMES/CHECKERS \
- games/FindNumbers:GAMES/FindNumbers games/gomoku:GAMES/GOMOKU \
- games/klavisha:GAMES/KLAVISHA games/kosilka:GAMES/KOSILKA \
- games/kosskin.gfx:GAMES/KOSSKIN.GFX games/megamaze:GAMES/MEGAMAZE \
- games/msquare:GAMES/MSQUARE \
+ games/checkers:GAMES/CHECKERS games/klavisha:GAMES/KLAVISHA \
+ games/kosilka:GAMES/KOSILKA games/kosskin.gfx:GAMES/KOSSKIN.GFX \
  games/reversi:GAMES/REVERSI games/rforces:GAMES/RFORCES \
- games/sq_game:GAMES/SQ_GAME \
- games/sudoku:GAMES/SUDOKU games/xonix:GAMES/XONIX \
+ games/xonix:GAMES/XONIX games/megamaze:GAMES/MEGAMAZE \
  lib/cnv_png.obj:LIB/CNV_PNG.OBJ lib/msgbox.obj:LIB/MSGBOX.OBJ \
  lib/pixlib.obj:LIB/PIXLIB.OBJ lib/sort.obj:LIB/SORT.OBJ \
  media/ac97snd:MEDIA/AC97SND media/kiv.ini:MEDIA/KIV.INI \
diff --git a/data/eng/games/FindNumbers b/data/eng/games/FindNumbers
deleted file mode 100644
index 41e2222fd2..0000000000
Binary files a/data/eng/games/FindNumbers and /dev/null differ
diff --git a/data/eng/games/bnc b/data/eng/games/bnc
deleted file mode 100644
index 7967360659..0000000000
Binary files a/data/eng/games/bnc and /dev/null differ
diff --git a/data/eng/games/gomoku b/data/eng/games/gomoku
deleted file mode 100644
index f4c0a48176..0000000000
Binary files a/data/eng/games/gomoku and /dev/null differ
diff --git a/data/eng/games/msquare b/data/eng/games/msquare
deleted file mode 100644
index e9f803b600..0000000000
Binary files a/data/eng/games/msquare and /dev/null differ
diff --git a/data/eng/games/sq_game b/data/eng/games/sq_game
deleted file mode 100644
index a3e275cf65..0000000000
Binary files a/data/eng/games/sq_game and /dev/null differ
diff --git a/data/eng/games/sudoku b/data/eng/games/sudoku
deleted file mode 100644
index d3bbac6756..0000000000
Binary files a/data/eng/games/sudoku and /dev/null differ
diff --git a/data/rus/Makefile b/data/rus/Makefile
index 3183313152..37c78d6013 100644
--- a/data/rus/Makefile
+++ b/data/rus/Makefile
@@ -76,12 +76,12 @@ FASM_PROGRAMS:=\
  vrr_m:VRR_M:$(PROGS)/system/vrr_m/trunk/vrr_m.asm \
  zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \
  3d/3dcube2:3D/3DCUBE2:$(PROGS)/demos/3dcube2/trunk/3DCUBE2.ASM \
+ 3d/3dspiral:3D/3DSPIRAL:$(PROGS)/demos/3dspiral/trunk/3dspiral.asm \
  3d/3dtcub10:3D/3DTCUB10:$(PROGS)/demos/3dtcub10/trunk/3DTCUB10.ASM \
  3d/crownscr:3D/CROWNSCR:$(PROGS)/demos/crownscr/trunk/crownscr.asm  \
+ 3d/flatwav:3D/FLATWAV:$(PROGS)/demos/flatwav/trunk/FLATWAV.ASM \
  3d/free3d04:3D/FREE3D04:$(PROGS)/demos/free3d04/trunk/free3d04.asm \
  3d/view3ds:3D/VIEW3DS:$(PROGS)/demos/3DS/VIEW3DS.ASM \
- 3d/3dspiral:3D/3DSPIRAL:$(PROGS)/demos/3dspiral/trunk/3dspiral.asm \
- 3d/flatwav:3D/FLATWAV:$(PROGS)/demos/flatwav/trunk/FLATWAV.ASM \
  demos/bcdclk:DEMOS/BCDCLK:$(PROGS)/demos/bcdclk/trunk/bcdclk.asm \
  demos/circle:DEMOS/CIRCLE:$(PROGS)/develop/examples/circle/trunk/circle.asm \
  demos/colorref:DEMOS/COLORREF:$(PROGS)/demos/colorref/trunk/colorref.asm \
@@ -124,6 +124,11 @@ FASM_PROGRAMS:=\
  fonts/bgitest:FONTS/BGITEST:$(PROGS)/demos/bgitest/trunk/bgitest.asm \
  games/15:GAMES/15:$(PROGS)/games/15/trunk/15.ASM \
  games/arcanii:GAMES/ARCANII:$(PROGS)/games/arcanii/trunk/arcanii.asm \
+ games/bnc:GAMES/BNC:$(PROGS)/games/bnc/trunk/bnc.asm \
+ games/gomoku:GAMES/GOMOKU:$(PROGS)/games/gomoku/trunk/gomoku.asm \
+ games/msquare:GAMES/MSQUARE:$(PROGS)/games/MSquare/trunk/MSquare.asm \
+ games/sq_game:GAMES/SQ_GAME:$(PROGS)/games/sq_game/trunk/SQ_GAME.ASM \
+ games/sudoku:GAMES/SUDOKU:$(PROGS)/games/sudoku/trunk/sudoku.asm \
  games/freecell:GAMES/FREECELL:$(PROGS)/games/freecell/freecell.ASM \
  games/invaders:GAMES/INVADERS:$(PROGS)/games/invaders/invaders.asm \
  games/kox:GAMES/KOX:$(PROGS)/games/kox/trunk/kox.asm \
@@ -204,6 +209,7 @@ COPY_FILES:=\
 CMM_PROGRAMS:=\
  File|Managers/eolite:File|Managers/EOLITE:$(PROGS)/fs/Eolite/trunk/Eolite.c-- \
  games/clicks:GAMES/CLICKS:$(PROGS)/games/clicks/trunk/clicks.c-- \
+ games/FindNumbers:GAMES/FindNumbers:$(PROGS)/games/FindNumbers/trunk/FindNumbers.c-- \
  games/mine:GAMES/MINE:$(PROGS)/games/mine/trunk/mine.c--:/MEOS \
 # end if list
 
@@ -238,16 +244,12 @@ OTHER_FILES:=asciivju:ASCIIVJU autorun.dat:AUTORUN.DAT \
  fonts/bold.chr:FONTS/BOLD.CHR fonts/char2.mt:FONTS/CHAR2.MT \
  fonts/char.mt:FONTS/CHAR.MT \
  games/appdata.dat:GAMES/APPDATA.DAT games/ataka:GAMES/ATAKA \
- games/basekurs.kla:GAMES/BASEKURS.KLA games/bnc:GAMES/BNC \
- games/checkers:GAMES/CHECKERS \
- games/FindNumbers:GAMES/FindNumbers games/gomoku:GAMES/GOMOKU \
+ games/basekurs.kla:GAMES/BASEKURS.KLA games/checkers:GAMES/CHECKERS \
  games/klavisha:GAMES/KLAVISHA games/kosilka:GAMES/KOSILKA \
  games/kosskin.gfx:GAMES/KOSSKIN.GFX games/megamaze:GAMES/MEGAMAZE \
- games/msquare:GAMES/MSQUARE games/padenie:GAMES/PADENIE \
+ games/padenie:GAMES/PADENIE \
  games/reversi:GAMES/REVERSI games/rforces:GAMES/RFORCES \
- games/sq_game:GAMES/SQ_GAME \
- games/sudoku:GAMES/SUDOKU games/whowtbam:GAMES/WHOWTBAM \
- games/xonix:GAMES/XONIX \
+ games/whowtbam:GAMES/WHOWTBAM games/xonix:GAMES/XONIX \
  lib/cnv_png.obj:LIB/CNV_PNG.OBJ lib/msgbox.obj:LIB/MSGBOX.OBJ \
  lib/pixlib.obj:LIB/PIXLIB.OBJ lib/sort.obj:LIB/SORT.OBJ \
  media/ac97snd:MEDIA/AC97SND media/kiv.ini:MEDIA/KIV.INI \
diff --git a/data/rus/games/FindNumbers b/data/rus/games/FindNumbers
deleted file mode 100644
index 41e2222fd2..0000000000
Binary files a/data/rus/games/FindNumbers and /dev/null differ
diff --git a/data/rus/games/bnc b/data/rus/games/bnc
deleted file mode 100644
index 7967360659..0000000000
Binary files a/data/rus/games/bnc and /dev/null differ
diff --git a/data/rus/games/gomoku b/data/rus/games/gomoku
deleted file mode 100644
index 10fbdcd422..0000000000
Binary files a/data/rus/games/gomoku and /dev/null differ
diff --git a/data/rus/games/msquare b/data/rus/games/msquare
deleted file mode 100644
index c1586911e5..0000000000
Binary files a/data/rus/games/msquare and /dev/null differ
diff --git a/data/rus/games/sq_game b/data/rus/games/sq_game
deleted file mode 100644
index d52ea1b5f8..0000000000
Binary files a/data/rus/games/sq_game and /dev/null differ
diff --git a/data/rus/games/sudoku b/data/rus/games/sudoku
deleted file mode 100644
index a6d53bc594..0000000000
Binary files a/data/rus/games/sudoku and /dev/null differ
diff --git a/programs/games/MSquare/trunk/MSquare.asm b/programs/games/MSquare/trunk/MSquare.asm
index 8b3587a3c2..71ba156a57 100644
--- a/programs/games/MSquare/trunk/MSquare.asm
+++ b/programs/games/MSquare/trunk/MSquare.asm
@@ -45,7 +45,7 @@ debug_print_dec num
 popad
 }
 
-include 'macros.inc'
+include '../../../macros.inc'
 ;include 'debug.inc'
 include 'editbox_ex.mac'
 include 'lang.inc'
diff --git a/programs/games/gomoku/trunk/gomoku.asm b/programs/games/gomoku/trunk/gomoku.asm
index 6d4f774392..8cb55553ca 100644
--- a/programs/games/gomoku/trunk/gomoku.asm
+++ b/programs/games/gomoku/trunk/gomoku.asm
@@ -12,7 +12,7 @@ use32
 	dd	(I_END+200+13*N*N) and not 3
 	dd	0x0,0x0
 
-include 'macros.inc'
+include '../../../macros.inc'
 include 'lang.inc'
 
 AttackFactor dw 1	; Importance of attack (1..16)
diff --git a/programs/games/sudoku/trunk/sudoku.asm b/programs/games/sudoku/trunk/sudoku.asm
index 879644948d..873d3fc8b4 100644
--- a/programs/games/sudoku/trunk/sudoku.asm
+++ b/programs/games/sudoku/trunk/sudoku.asm
@@ -49,7 +49,7 @@ debug_print_dec num
 popad
 }
 
-include 'macros.inc'
+include '../../../macros.inc'
 ;include 'debug.inc'
 include 'editbox_ex.mac'
 include 'lang.inc'