diff --git a/Source/gendung.cpp b/Source/gendung.cpp
index 94da50955..586314de0 100644
--- a/Source/gendung.cpp
+++ b/Source/gendung.cpp
@@ -1,71 +1,69 @@
 #include "diablo.h"
 
-WORD level_frame_types[MAXTILES];
-int themeCount;
-BOOLEAN nTransTable[2049];
-//int dword_52D204;
-int dMonster[MAXDUNX][MAXDUNY];
 BYTE dungeon[DMAXX][DMAXY];
-char dObject[MAXDUNX][MAXDUNY];
-BYTE *pSpeedCels;
-int nlevel_frames;
 BYTE pdungeon[DMAXX][DMAXY];
-char dDead[MAXDUNX][MAXDUNY];
-MICROS dpiece_defs_map_1[MAXDUNX * MAXDUNY];
-char dPreLight[MAXDUNX][MAXDUNY];
-char TransVal;
-int MicroTileLen;
 char dflags[DMAXX][DMAXY];
-int dPiece[MAXDUNX][MAXDUNY];
-char dLight[MAXDUNX][MAXDUNY];
+int setpc_x;
+int setpc_y;
+int setpc_w;
+int setpc_h;
+BYTE *pSetPiece;
 BOOL setloadflag;
-int tile_defs[MAXTILES];
+BYTE *pSpecialCels;
 BYTE *pMegaTiles;
 BYTE *pLevelPieces;
-int gnDifficulty;
-char block_lvid[2049];
-//char byte_5B78EB;
-char dTransVal[MAXDUNX][MAXDUNY];
-BOOLEAN nTrapTable[2049];
-BYTE leveltype;
-BYTE currlevel;
-BOOLEAN TransList[256];
-BOOLEAN nSolidTable[2049];
-int level_frame_count[MAXTILES];
-ScrollStruct ScrollInfo;
 BYTE *pDungeonCels;
+BYTE *pSpeedCels;
 int SpeedFrameTbl[128][16];
-THEME_LOC themeLoc[MAXTHEMES];
-char dPlayer[MAXDUNX][MAXDUNY];
-int dword_5C2FF8;
-int dword_5C2FFC;
-int scr_pix_width;
-int scr_pix_height;
-char dArch[MAXDUNX][MAXDUNY];
-BOOLEAN nBlockTable[2049];
-BYTE *pSpecialCels;
-char dFlags[MAXDUNX][MAXDUNY];
-char dItem[MAXDUNX][MAXDUNY];
-BYTE setlvlnum;
+char block_lvid[2049];
+int level_frame_count[MAXTILES];
+int tile_defs[MAXTILES];
+WORD level_frame_types[MAXTILES];
 int level_frame_sizes[MAXTILES];
+int nlevel_frames;
+BOOLEAN nBlockTable[2049];
+BOOLEAN nSolidTable[2049];
+BOOLEAN nTransTable[2049];
 BOOLEAN nMissileTable[2049];
-BYTE *pSetPiece;
-char setlvltype;
-BOOLEAN setlevel;
-int LvlViewY;
-int LvlViewX;
+BOOLEAN nTrapTable[2049];
+int dminx;
+int dminy;
 int dmaxx;
 int dmaxy;
-int setpc_h;
-int setpc_w;
-int setpc_x;
+int gnDifficulty;
+BYTE leveltype;
+BYTE currlevel;
+BOOLEAN setlevel;
+BYTE setlvlnum;
+char setlvltype;
 int ViewX;
 int ViewY;
-int setpc_y;
-char dMissile[MAXDUNX][MAXDUNY];
-int dminx;
-int dminy;
+int scr_pix_width;
+int scr_pix_height;
+int dword_5C2FF8;
+int dword_5C2FFC;
+ScrollStruct ScrollInfo;
+int LvlViewX;
+int LvlViewY;
+int MicroTileLen;
+char TransVal;
+BOOLEAN TransList[256];
+int dPiece[MAXDUNX][MAXDUNY];
 MICROS dpiece_defs_map_2[MAXDUNX][MAXDUNY];
+MICROS dpiece_defs_map_1[MAXDUNX * MAXDUNY];
+char dTransVal[MAXDUNX][MAXDUNY];
+char dLight[MAXDUNX][MAXDUNY];
+char dPreLight[MAXDUNX][MAXDUNY];
+char dFlags[MAXDUNX][MAXDUNY];
+char dPlayer[MAXDUNX][MAXDUNY];
+int dMonster[MAXDUNX][MAXDUNY];
+char dDead[MAXDUNX][MAXDUNY];
+char dObject[MAXDUNX][MAXDUNY];
+char dItem[MAXDUNX][MAXDUNY];
+char dMissile[MAXDUNX][MAXDUNY];
+char dArch[MAXDUNX][MAXDUNY];
+int themeCount;
+THEME_LOC themeLoc[MAXTHEMES];
 
 void FillSolidBlockTbls()
 {
diff --git a/Source/gendung.h b/Source/gendung.h
index b423c2abe..808ef8b59 100644
--- a/Source/gendung.h
+++ b/Source/gendung.h
@@ -2,72 +2,70 @@
 #ifndef __GENDUNG_H__
 #define __GENDUNG_H__
 
-extern WORD level_frame_types[MAXTILES];
-extern int themeCount;
-extern BOOLEAN nTransTable[2049];
-//int dword_52D204;
-extern int dMonster[MAXDUNX][MAXDUNY];
 extern BYTE dungeon[DMAXX][DMAXY];
-extern char dObject[MAXDUNX][MAXDUNY];
-extern BYTE *pSpeedCels;
-extern int nlevel_frames;
 extern BYTE pdungeon[DMAXX][DMAXY];
-extern char dDead[MAXDUNX][MAXDUNY];
-extern MICROS dpiece_defs_map_1[MAXDUNX * MAXDUNY];
-extern char dPreLight[MAXDUNX][MAXDUNY];
-extern char TransVal;
-extern int MicroTileLen;
 extern char dflags[DMAXX][DMAXY];
-extern int dPiece[MAXDUNX][MAXDUNY];
-extern char dLight[MAXDUNX][MAXDUNY];
+extern int setpc_x;
+extern int setpc_y;
+extern int setpc_w;
+extern int setpc_h;
+extern BYTE *pSetPiece;
 extern BOOL setloadflag;
-extern int tile_defs[MAXTILES];
+extern BYTE *pSpecialCels;
 extern BYTE *pMegaTiles;
 extern BYTE *pLevelPieces;
-extern int gnDifficulty;
-extern char block_lvid[2049];
-//char byte_5B78EB;
-extern char dTransVal[MAXDUNX][MAXDUNY];
-extern BOOLEAN nTrapTable[2049];
-extern BYTE leveltype;
-extern BYTE currlevel;
-extern BOOLEAN TransList[256];
-extern BOOLEAN nSolidTable[2049];
-extern int level_frame_count[MAXTILES];
-extern ScrollStruct ScrollInfo;
 extern BYTE *pDungeonCels;
+extern BYTE *pSpeedCels;
 extern int SpeedFrameTbl[128][16];
-extern THEME_LOC themeLoc[MAXTHEMES];
-extern char dPlayer[MAXDUNX][MAXDUNY];
-extern int dword_5C2FF8;
-extern int dword_5C2FFC;
-extern int scr_pix_width;
-extern int scr_pix_height;
-extern char dArch[MAXDUNX][MAXDUNY];
-extern BOOLEAN nBlockTable[2049];
-extern BYTE *pSpecialCels;
-extern char dFlags[MAXDUNX][MAXDUNY];
-extern char dItem[MAXDUNX][MAXDUNY];
-extern BYTE setlvlnum;
+extern char block_lvid[2049];
+extern int level_frame_count[MAXTILES];
+extern int tile_defs[MAXTILES];
+extern WORD level_frame_types[MAXTILES];
 extern int level_frame_sizes[MAXTILES];
+extern int nlevel_frames;
+extern BOOLEAN nBlockTable[2049];
+extern BOOLEAN nSolidTable[2049];
+extern BOOLEAN nTransTable[2049];
 extern BOOLEAN nMissileTable[2049];
-extern BYTE *pSetPiece;
-extern char setlvltype;
-extern BOOLEAN setlevel;
-extern int LvlViewY;
-extern int LvlViewX;
+extern BOOLEAN nTrapTable[2049];
+extern int dminx;
+extern int dminy;
 extern int dmaxx;
 extern int dmaxy;
-extern int setpc_h;
-extern int setpc_w;
-extern int setpc_x;
+extern int gnDifficulty;
+extern BYTE leveltype;
+extern BYTE currlevel;
+extern BOOLEAN setlevel;
+extern BYTE setlvlnum;
+extern char setlvltype;
 extern int ViewX;
 extern int ViewY;
-extern int setpc_y;
-extern char dMissile[MAXDUNX][MAXDUNY];
-extern int dminx;
-extern int dminy;
+extern int scr_pix_width;
+extern int scr_pix_height;
+extern int dword_5C2FF8;
+extern int dword_5C2FFC;
+extern ScrollStruct ScrollInfo;
+extern int LvlViewX;
+extern int LvlViewY;
+extern int MicroTileLen;
+extern char TransVal;
+extern BOOLEAN TransList[256];
+extern int dPiece[MAXDUNX][MAXDUNY];
 extern MICROS dpiece_defs_map_2[MAXDUNX][MAXDUNY];
+extern MICROS dpiece_defs_map_1[MAXDUNX * MAXDUNY];
+extern char dTransVal[MAXDUNX][MAXDUNY];
+extern char dLight[MAXDUNX][MAXDUNY];
+extern char dPreLight[MAXDUNX][MAXDUNY];
+extern char dFlags[MAXDUNX][MAXDUNY];
+extern char dPlayer[MAXDUNX][MAXDUNY];
+extern int dMonster[MAXDUNX][MAXDUNY];
+extern char dDead[MAXDUNX][MAXDUNY];
+extern char dObject[MAXDUNX][MAXDUNY];
+extern char dItem[MAXDUNX][MAXDUNY];
+extern char dMissile[MAXDUNX][MAXDUNY];
+extern char dArch[MAXDUNX][MAXDUNY];
+extern int themeCount;
+extern THEME_LOC themeLoc[MAXTHEMES];
 
 void FillSolidBlockTbls();
 void MakeSpeedCels();