diff --git a/Source/pack.cpp b/Source/pack.cpp
index 87a9d0a..d93533d 100644
--- a/Source/pack.cpp
+++ b/Source/pack.cpp
@@ -6,7 +6,6 @@ int pack_cpp_init_value; // weak
 
 int pack_inf = 0x7F800000; // weak
 
-//----- (0044875A) --------------------------------------------------------
 struct pack_cpp_init
 {
 	pack_cpp_init()
@@ -17,7 +16,6 @@ struct pack_cpp_init
 // 47F168: using guessed type int pack_inf;
 // 67D7C8: using guessed type int pack_cpp_init_value;
 
-//----- (00448765) --------------------------------------------------------
 void __fastcall PackPlayer(PkPlayerStruct *pPack, int pnum, bool manashield)
 {
 	PlayerStruct *pPlayer; // edi
@@ -86,7 +84,6 @@ void __fastcall PackPlayer(PkPlayerStruct *pPack, int pnum, bool manashield)
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (00448953) --------------------------------------------------------
 void __fastcall PackItem(PkItemStruct *id, ItemStruct *is)
 {
 	short v2; // ax
@@ -130,7 +127,6 @@ void __fastcall PackItem(PkItemStruct *id, ItemStruct *is)
 	}
 }
 
-//----- (00448A5E) --------------------------------------------------------
 void __fastcall VerifyGoldSeeds(PlayerStruct *pPlayer)
 {
 	int i; // ebp
@@ -155,7 +151,6 @@ void __fastcall VerifyGoldSeeds(PlayerStruct *pPlayer)
 	}
 }
 
-//----- (00448AD0) --------------------------------------------------------
 void __fastcall UnPackPlayer(PkPlayerStruct *pPack, int pnum, bool killok)
 {
 	PlayerStruct *pPlayer; // esi
@@ -246,7 +241,6 @@ void __fastcall UnPackPlayer(PkPlayerStruct *pPack, int pnum, bool killok)
 	pPlayer->pManaShield = pPack->pManaShield;
 }
 
-//----- (00448D48) --------------------------------------------------------
 void __fastcall UnPackItem(PkItemStruct *is, ItemStruct *id)
 {
 	PkItemStruct *v2; // esi
diff --git a/Source/pack.h b/Source/pack.h
index ebff7de..f88fafb 100644
--- a/Source/pack.h
+++ b/Source/pack.h
@@ -1,6 +1,7 @@
 //HEADER_GOES_HERE
+#ifndef __PACK_H__
+#define __PACK_H__
 
-//pack
 extern int pack_cpp_init_value; // weak
 
 void __cdecl pack_cpp_init();
@@ -13,3 +14,5 @@ void __fastcall UnPackItem(PkItemStruct *is, ItemStruct *id);
 /* data */
 
 extern int pack_inf; // weak
+
+#endif /* __PACK_H__ */
diff --git a/Source/palette.cpp b/Source/palette.cpp
index 42f6b5d..c98199a 100644
--- a/Source/palette.cpp
+++ b/Source/palette.cpp
@@ -16,7 +16,6 @@ int gamma_correction = 100; // idb
 int color_cycling_enabled = 1; // idb
 bool sgbFadedIn = 1;
 
-//----- (00448DFA) --------------------------------------------------------
 struct palette_cpp_init
 {
 	palette_cpp_init()
@@ -27,14 +26,12 @@ struct palette_cpp_init
 // 47F16C: using guessed type int palette_inf;
 // 67DBCC: using guessed type int palette_cpp_init_value;
 
-//----- (00448E05) --------------------------------------------------------
 void __cdecl palette_save_gamme()
 {
 	SRegSaveValue("Diablo", "Gamma Correction", 0, gamma_correction);
 	SRegSaveValue("Diablo", "Color Cycling", 0, color_cycling_enabled);
 }
 
-//----- (00448E33) --------------------------------------------------------
 void __cdecl palette_init()
 {
 	int v0; // eax
@@ -51,7 +48,6 @@ void __cdecl palette_init()
 		TermDlg(111, v1, "C:\\Src\\Diablo\\Source\\PALETTE.CPP", 146);
 }
 
-//----- (00448EAB) --------------------------------------------------------
 void __cdecl palette_load_gamma()
 {
 	int v3; // eax
@@ -77,7 +73,6 @@ void __cdecl palette_load_gamma()
 	color_cycling_enabled = v3;
 }
 
-//----- (00448F20) --------------------------------------------------------
 void __cdecl LoadSysPal()
 {
 	HDC hDC; // ebx
@@ -106,7 +101,6 @@ void __cdecl LoadSysPal()
 }
 // 484364: using guessed type int fullscreen;
 
-//----- (00448FC9) --------------------------------------------------------
 void __fastcall LoadPalette(char *pszFileName)
 {
 	int i; // eax
@@ -126,7 +120,6 @@ void __fastcall LoadPalette(char *pszFileName)
 	}
 }
 
-//----- (00449025) --------------------------------------------------------
 void __fastcall LoadRndLvlPal(int l)
 {
 	char *pszPal; // ecx
@@ -144,7 +137,6 @@ void __fastcall LoadRndLvlPal(int l)
 	LoadPalette(pszPal);
 }
 
-//----- (0044906C) --------------------------------------------------------
 void __cdecl ResetPal()
 {
 	if ( !lpDDSPrimary
@@ -155,7 +147,6 @@ void __cdecl ResetPal()
 	}
 }
 
-//----- (00449097) --------------------------------------------------------
 void __cdecl palette_inc_gamma()
 {
 	if ( gamma_correction < 100 )
@@ -168,7 +159,6 @@ void __cdecl palette_inc_gamma()
 	}
 }
 
-//----- (004490D0) --------------------------------------------------------
 void __cdecl palette_update()
 {
 	int v0; // ecx
@@ -188,7 +178,6 @@ void __cdecl palette_update()
 }
 // 484364: using guessed type int fullscreen;
 
-//----- (00449107) --------------------------------------------------------
 void __fastcall palette_apply_gamma_correction(PALETTEENTRY *dst, PALETTEENTRY *src, int n)
 {
 	PALETTEENTRY *v3; // edi
@@ -213,7 +202,6 @@ void __fastcall palette_apply_gamma_correction(PALETTEENTRY *dst, PALETTEENTRY *
 	}
 }
 
-//----- (004491D0) --------------------------------------------------------
 void __cdecl palette_dec_gamma()
 {
 	if ( gamma_correction > 30 )
@@ -226,7 +214,6 @@ void __cdecl palette_dec_gamma()
 	}
 }
 
-//----- (00449209) --------------------------------------------------------
 int __fastcall palette_update_gamma(int gamma)
 {
 	if ( gamma )
@@ -238,13 +225,11 @@ int __fastcall palette_update_gamma(int gamma)
 	return 130 - gamma_correction;
 }
 
-//----- (0044923E) --------------------------------------------------------
 void __cdecl BlackPalette()
 {
 	SetFadeLevel(0);
 }
 
-//----- (00449245) --------------------------------------------------------
 void __fastcall SetFadeLevel(int fadeval)
 {
 	int i; // eax
@@ -263,7 +248,6 @@ void __fastcall SetFadeLevel(int fadeval)
 	}
 }
 
-//----- (004492B0) --------------------------------------------------------
 void __fastcall PaletteFadeIn(int fr)
 {
 	int i; // ebp
@@ -278,7 +262,6 @@ void __fastcall PaletteFadeIn(int fr)
 	sgbFadedIn = 1;
 }
 
-//----- (00449306) --------------------------------------------------------
 void __fastcall PaletteFadeOut(int fr)
 {
 	int i; // esi
@@ -293,7 +276,6 @@ void __fastcall PaletteFadeOut(int fr)
 	}
 }
 
-//----- (00449336) --------------------------------------------------------
 void __cdecl palette_update_caves()
 {
 	BYTE v0; // cx
@@ -320,7 +302,6 @@ void __cdecl palette_update_caves()
 	palette_update();
 }
 
-//----- (00449398) --------------------------------------------------------
 void __fastcall palette_update_quest_palette(int n)
 {
 	int i; // eax
@@ -331,13 +312,11 @@ void __fastcall palette_update_quest_palette(int n)
 	palette_update();
 }
 
-//----- (004493C6) --------------------------------------------------------
 bool __cdecl palette_get_colour_cycling()
 {
 	return color_cycling_enabled;
 }
 
-//----- (004493CC) --------------------------------------------------------
 void __fastcall palette_set_color_cycling(bool enabled)
 {
 	color_cycling_enabled = enabled;
diff --git a/Source/palette.h b/Source/palette.h
index 147705a..acf2816 100644
--- a/Source/palette.h
+++ b/Source/palette.h
@@ -1,6 +1,7 @@
 //HEADER_GOES_HERE
+#ifndef __PALETTE_H__
+#define __PALETTE_H__
 
-//palette
 extern PALETTEENTRY logical_palette[256];
 extern int palette_cpp_init_value; // weak
 extern PALETTEENTRY system_palette[256];
@@ -38,3 +39,5 @@ extern int palette_inf; // weak
 extern int gamma_correction; // idb
 extern int color_cycling_enabled; // idb
 extern bool sgbFadedIn;
+
+#endif /* __PALETTE_H__ */
diff --git a/Source/path.cpp b/Source/path.cpp
index 581a7e1..5a22d6a 100644
--- a/Source/path.cpp
+++ b/Source/path.cpp
@@ -15,7 +15,6 @@ char pathydir[8] = { -1, 1, -1, 1, 0, -1, 0, 1 };
 /* rdata */
 char path_directions[9] = { 5, 1, 6, 2, 0, 3, 8, 4, 7 };
 
-//----- (004493D4) --------------------------------------------------------
 int __fastcall FindPath(bool (__fastcall *PosOk)(int, int, int), int PosOkArg, int sx, int sy, int dx, int dy, char *path)
 {
 	PATHNODE *v8; // esi
@@ -91,7 +90,6 @@ int __fastcall FindPath(bool (__fastcall *PosOk)(int, int, int), int PosOkArg, i
 	return result;
 }
 
-//----- (004494D3) --------------------------------------------------------
 int __fastcall path_get_h_cost(int sx, int sy, int dx, int dy)
 {
 	int v4; // esi
@@ -112,7 +110,6 @@ int __fastcall path_get_h_cost(int sx, int sy, int dx, int dy)
 	return 2 * (v7 + v6);
 }
 
-//----- (00449504) --------------------------------------------------------
 int __fastcall path_check_equal(PATHNODE *pPath, int dx, int dy)
 {
 	int v4; // [esp-4h] [ebp-4h]
@@ -124,7 +121,6 @@ int __fastcall path_check_equal(PATHNODE *pPath, int dx, int dy)
 	return v4;
 }
 
-//----- (0044951C) --------------------------------------------------------
 PATHNODE *__cdecl GetNextPath()
 {
 	PATHNODE *result; // eax
@@ -139,7 +135,6 @@ PATHNODE *__cdecl GetNextPath()
 	return result;
 }
 
-//----- (00449546) --------------------------------------------------------
 bool __fastcall path_solid_pieces(PATHNODE *pPath, int dx, int dy)
 {
 	bool result; // eax
@@ -189,7 +184,6 @@ LABEL_13:
 	return result;
 }
 
-//----- (004495ED) --------------------------------------------------------
 int __fastcall path_get_path(bool (__fastcall *PosOk)(int, int, int), int PosOkArg, PATHNODE *pPath, int x, int y)
 {
 	int v5; // eax
@@ -218,7 +212,6 @@ LABEL_8:
 	return 0;
 }
 
-//----- (0044966F) --------------------------------------------------------
 int __fastcall path_parent_path(PATHNODE *pPath, int dx, int dy, int sx, int sy)
 {
 	PATHNODE *v5; // edi
@@ -321,7 +314,6 @@ int __fastcall path_parent_path(PATHNODE *pPath, int dx, int dy, int sx, int sy)
 	return 1;
 }
 
-//----- (0044979A) --------------------------------------------------------
 PATHNODE *__fastcall path_get_node1(int dx, int dy)
 {
 	PATHNODE *result; // eax
@@ -333,7 +325,6 @@ PATHNODE *__fastcall path_get_node1(int dx, int dy)
 	return result;
 }
 
-//----- (004497B3) --------------------------------------------------------
 PATHNODE *__fastcall path_get_node2(int dx, int dy)
 {
 	PATHNODE *result; // eax
@@ -345,7 +336,6 @@ PATHNODE *__fastcall path_get_node2(int dx, int dy)
 	return result;
 }
 
-//----- (004497CC) --------------------------------------------------------
 void __fastcall path_next_node(PATHNODE *pPath)
 {
 	PATHNODE *v1; // edx
@@ -368,7 +358,6 @@ void __fastcall path_next_node(PATHNODE *pPath)
 	v1->NextNode = pPath;
 }
 
-//----- (004497F7) --------------------------------------------------------
 void __fastcall path_set_coords(PATHNODE *pPath)
 {
 	PATHNODE *PathOld; // edi
@@ -404,7 +393,6 @@ void __fastcall path_set_coords(PATHNODE *pPath)
 	}
 }
 
-//----- (00449890) --------------------------------------------------------
 void __fastcall path_push_active_step(PATHNODE *pPath)
 {
 	int v1; // eax
@@ -413,13 +401,11 @@ void __fastcall path_push_active_step(PATHNODE *pPath)
 	pnode_tblptr[v1] = pPath;
 }
 
-//----- (004498A3) --------------------------------------------------------
 PATHNODE *__cdecl path_pop_active_step()
 {
 	return pnode_tblptr[--gdwCurPathStep];
 }
 
-//----- (004498B6) --------------------------------------------------------
 PATHNODE *__cdecl path_new_step()
 {
 	PATHNODE *v1; // esi
diff --git a/Source/path.h b/Source/path.h
index 89884e5..92fb212 100644
--- a/Source/path.h
+++ b/Source/path.h
@@ -1,6 +1,7 @@
 //HEADER_GOES_HERE
+#ifndef __PATH_H__
+#define __PATH_H__
 
-//path
 extern PATHNODE path_nodes[300];
 extern int gdwCurPathStep;
 extern int pnode_vals[26];
@@ -30,3 +31,5 @@ extern char pathydir[8];
 
 /* rdata */
 extern char path_directions[9];
+
+#endif /* __PATH_H__ */
diff --git a/Source/pfile.cpp b/Source/pfile.cpp
index 64d0aa8..08fb683 100644
--- a/Source/pfile.cpp
+++ b/Source/pfile.cpp
@@ -9,7 +9,6 @@ int save_prev_tc; // weak
 
 int pfile_inf = 0x7F800000; // weak
 
-//----- (004498F1) --------------------------------------------------------
 struct pfile_cpp_init
 {
 	pfile_cpp_init()
@@ -19,7 +18,6 @@ struct pfile_cpp_init
 } _pfile_cpp_init;
 // 47F1C0: using guessed type int pfile_inf;
 
-//----- (004498FC) --------------------------------------------------------
 void __cdecl pfile_init_save_directory()
 {
 	char Buffer[260]; // [esp+4h] [ebp-104h]
@@ -35,7 +33,6 @@ void __cdecl pfile_init_save_directory()
 	}
 }
 
-//----- (0044995B) --------------------------------------------------------
 void __fastcall pfile_check_available_space(char *pszDir)
 {
 	char *v1; // edi
@@ -71,7 +68,6 @@ LABEL_12:
 		DiskFreeDlg(v1);
 }
 
-//----- (004499C3) --------------------------------------------------------
 void __cdecl pfile_write_hero()
 {
 	int v0; // eax
@@ -91,7 +87,6 @@ void __cdecl pfile_write_hero()
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (00449A33) --------------------------------------------------------
 int __fastcall pfile_get_save_num_from_name(char *name)
 {
 	char *v1; // ebx
@@ -112,7 +107,6 @@ int __fastcall pfile_get_save_num_from_name(char *name)
 	return v2;
 }
 
-//----- (00449A5B) --------------------------------------------------------
 void __fastcall pfile_encode_hero(PkPlayerStruct *pPack)
 {
 	int v1; // ebx
@@ -136,7 +130,6 @@ void __fastcall pfile_encode_hero(PkPlayerStruct *pPack)
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (00449ADF) --------------------------------------------------------
 bool __fastcall pfile_open_archive(bool a1, int save_num)
 {
 	int v2; // esi
@@ -159,7 +152,6 @@ bool __fastcall pfile_open_archive(bool a1, int save_num)
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (00449B30) --------------------------------------------------------
 void __fastcall pfile_get_save_path(char *pszBuf, int dwBufSize, int save_num)
 {
 	char *v3; // esi
@@ -184,7 +176,6 @@ void __fastcall pfile_get_save_path(char *pszBuf, int dwBufSize, int save_num)
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (00449BB2) --------------------------------------------------------
 void __fastcall pfile_flush(bool is_single_player, int save_num)
 {
 	int v2; // esi
@@ -197,7 +188,6 @@ void __fastcall pfile_flush(bool is_single_player, int save_num)
 	mpqapi_flush_and_close(FileName, v3, v2);
 }
 
-//----- (00449BE4) --------------------------------------------------------
 bool __fastcall pfile_create_player_description(char *dst, int len)
 {
 	int v2; // edi
@@ -224,7 +214,6 @@ LABEL_5:
 	return v4;
 }
 
-//----- (00449C5A) --------------------------------------------------------
 int __fastcall pfile_create_save_file(char *name_1, char *name_2)
 {
 	char *v2; // edi
@@ -260,7 +249,6 @@ int __fastcall pfile_create_save_file(char *name_1, char *name_2)
 	return 1;
 }
 
-//----- (00449D22) --------------------------------------------------------
 void __cdecl pfile_flush_W()
 {
 	int v0; // eax
@@ -269,7 +257,6 @@ void __cdecl pfile_flush_W()
 	pfile_flush(1, v0);
 }
 
-//----- (00449D43) --------------------------------------------------------
 void __fastcall game_2_ui_player(PlayerStruct *p, _uiheroinfo *heroinfo, bool bHasSaveFile)
 {
 	_uiheroinfo *v3; // esi
@@ -294,7 +281,6 @@ void __fastcall game_2_ui_player(PlayerStruct *p, _uiheroinfo *heroinfo, bool bH
 	v3->herorank = v5;
 }
 
-//----- (00449DD0) --------------------------------------------------------
 char __fastcall game_2_ui_class(PlayerStruct *p)
 {
 	char result; // al
@@ -305,7 +291,6 @@ char __fastcall game_2_ui_class(PlayerStruct *p)
 	return result;
 }
 
-//----- (00449DE3) --------------------------------------------------------
 bool __stdcall pfile_ui_set_hero_infos(void (__stdcall *ui_add_hero_info)(_uiheroinfo *))
 {
 	char *v1; // esi
@@ -395,7 +380,6 @@ LABEL_13:
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (00449FAA) --------------------------------------------------------
 char *__fastcall GetSaveDirectory(char *dst, int dst_size, int save_num)
 {
 	char *v3; // esi
@@ -426,7 +410,6 @@ char *__fastcall GetSaveDirectory(char *dst, int dst_size, int save_num)
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (0044A036) --------------------------------------------------------
 bool __fastcall pfile_read_hero(void *archive, PkPlayerStruct *pPack)
 {
 	BOOL v2; // eax
@@ -498,7 +481,6 @@ LABEL_15:
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (0044A158) --------------------------------------------------------
 void *__fastcall pfile_open_save_archive(int *unused, int save_num)
 {
 	//int v2; // eax
@@ -510,13 +492,11 @@ void *__fastcall pfile_open_save_archive(int *unused, int save_num)
 	return SFileOpenArchive(SrcStr, 0x7000, 0, &archive) != 0 ? archive : NULL;
 }
 
-//----- (0044A192) --------------------------------------------------------
 void __fastcall pfile_SFileCloseArchive(void *hsArchive)
 {
 	SFileCloseArchive(hsArchive);
 }
 
-//----- (0044A199) --------------------------------------------------------
 bool __fastcall pfile_archive_contains_game(void *hsArchive)
 {
 	//int v1; // eax
@@ -533,7 +513,6 @@ bool __fastcall pfile_archive_contains_game(void *hsArchive)
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (0044A1CC) --------------------------------------------------------
 bool __stdcall pfile_ui_set_class_stats(int player_class_nr, _uidefaultstats *class_stats)
 {
 	int v2; // eax
@@ -546,7 +525,6 @@ bool __stdcall pfile_ui_set_class_stats(int player_class_nr, _uidefaultstats *cl
 	return 1;
 }
 
-//----- (0044A210) --------------------------------------------------------
 int __fastcall pfile_get_player_class(int player_class_nr)
 {
 	int result; // eax
@@ -558,7 +536,6 @@ int __fastcall pfile_get_player_class(int player_class_nr)
 	return result;
 }
 
-//----- (0044A220) --------------------------------------------------------
 bool __stdcall pfile_ui_save_create(_uiheroinfo *heroinfo)
 {
 	unsigned int v1; // edi
@@ -600,7 +577,6 @@ bool __stdcall pfile_ui_save_create(_uiheroinfo *heroinfo)
 	return 1;
 }
 
-//----- (0044A2FF) --------------------------------------------------------
 bool __stdcall pfile_get_file_name(int lvl, char *dst)
 {
 	int v2; // ecx
@@ -642,7 +618,6 @@ LABEL_10:
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (0044A356) --------------------------------------------------------
 bool __stdcall pfile_delete_save(_uiheroinfo *hero_info)
 {
 	unsigned int v1; // eax
@@ -658,7 +633,6 @@ bool __stdcall pfile_delete_save(_uiheroinfo *hero_info)
 	return 1;
 }
 
-//----- (0044A3A0) --------------------------------------------------------
 void __cdecl pfile_read_player_from_save()
 {
 	int dwChar; // edi
@@ -678,7 +652,6 @@ void __cdecl pfile_read_player_from_save()
 	pfile_SFileCloseArchive(v1);
 }
 
-//----- (0044A419) --------------------------------------------------------
 void __fastcall GetTempLevelNames(char *szTemp)
 {
 	char *v1; // esi
@@ -693,7 +666,6 @@ void __fastcall GetTempLevelNames(char *szTemp)
 // 5CCB10: using guessed type char setlvlnum;
 // 5CF31D: using guessed type char setlevel;
 
-//----- (0044A463) --------------------------------------------------------
 void __fastcall GetPermLevelNames(char *szPerm)
 {
 	char *v1; // esi
@@ -722,7 +694,6 @@ void __fastcall GetPermLevelNames(char *szPerm)
 // 5CCB10: using guessed type char setlvlnum;
 // 5CF31D: using guessed type char setlevel;
 
-//----- (0044A4E9) --------------------------------------------------------
 void __fastcall pfile_get_game_name(char *dst)
 {
 	char *v1; // esi
@@ -732,7 +703,6 @@ void __fastcall pfile_get_game_name(char *dst)
 	strcpy(v1, "game");
 }
 
-//----- (0044A512) --------------------------------------------------------
 void __cdecl pfile_remove_temp_files()
 {
 	int v0; // eax
@@ -752,7 +722,6 @@ void __cdecl pfile_remove_temp_files()
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (0044A563) --------------------------------------------------------
 bool __stdcall GetTempSaveNames(int dwIndex, char *szTemp)
 {
 	int v2; // eax
@@ -775,7 +744,6 @@ LABEL_5:
 	return 0;
 }
 
-//----- (0044A598) --------------------------------------------------------
 void __cdecl pfile_rename_temp_to_perm()
 {
 	int v0; // eax
@@ -813,7 +781,6 @@ void __cdecl pfile_rename_temp_to_perm()
 	pfile_flush(1, v1);
 }
 
-//----- (0044A644) --------------------------------------------------------
 bool __stdcall GetPermSaveNames(int dwIndex, char *szPerm)
 {
 	int v2; // eax
@@ -836,7 +803,6 @@ LABEL_5:
 	return 0;
 }
 
-//----- (0044A679) --------------------------------------------------------
 void __fastcall pfile_write_save_file(char *pszName, void *pbData, int dwLen, int qwLen)
 {
 	void *v4; // ebx
@@ -865,13 +831,11 @@ void __fastcall pfile_write_save_file(char *pszName, void *pbData, int dwLen, in
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (0044A727) --------------------------------------------------------
 void __fastcall pfile_strcpy(char *dst, char *src)
 {
 	strcpy(dst, src);
 }
 
-//----- (0044A731) --------------------------------------------------------
 char *__fastcall pfile_read(char *pszName, int *pdwLen)
 {
 	int *v2; // ebx
@@ -940,7 +904,6 @@ char *__fastcall pfile_read(char *pszName, int *pdwLen)
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (0044A8B3) --------------------------------------------------------
 void __fastcall pfile_update(bool force_save)
 {
 	BOOL v1; // esi
diff --git a/Source/pfile.h b/Source/pfile.h
index c55e0f9..cb0cccf 100644
--- a/Source/pfile.h
+++ b/Source/pfile.h
@@ -1,6 +1,7 @@
 //HEADER_GOES_HERE
+#ifndef __PFILE_H__
+#define __PFILE_H__
 
-//pfile
 extern int pfile_cpp_init_value;
 extern char hero_names[320];
 extern bool gbValidSaveFile; // idb
@@ -47,3 +48,5 @@ void __fastcall pfile_update(bool force_save);
 /* data */
 
 extern int pfile_inf; // weak
+
+#endif /* __PFILE_H__ */
diff --git a/Source/player.cpp b/Source/player.cpp
index 579170b..1e1cfb5 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -101,7 +101,6 @@ int ExpLvlsTbl[51] =
 char *ClassStrTbl[3] = { "Warrior", "Rogue", "Sorceror" };
 unsigned char fix[9] = { 0u, 0u, 3u, 3u, 3u, 6u, 6u, 6u, 8u }; /* PM_ChangeLightOff local type */
 
-//----- (0044A8EB) --------------------------------------------------------
 struct player_cpp_init
 {
 	player_cpp_init()
@@ -112,7 +111,6 @@ struct player_cpp_init
 // 47F204: using guessed type int player_inf;
 // 68643C: using guessed type int player_cpp_init_value;
 
-//----- (0044A8F6) --------------------------------------------------------
 void __fastcall player_init_cl2_hdrs(char *src, char *dst)
 {
 	char *v2; // eax
@@ -131,7 +129,6 @@ void __fastcall player_init_cl2_hdrs(char *src, char *dst)
 	while ( v4 );
 }
 
-//----- (0044A911) --------------------------------------------------------
 void __fastcall LoadPlrGFX(int pnum, int gfxflag)
 {
 	int v2; // esi
@@ -291,7 +288,6 @@ LABEL_38:
 }
 // 5BB1ED: using guessed type char leveltype;
 
-//----- (0044AB70) --------------------------------------------------------
 void __fastcall InitPlayerGFX(int pnum)
 {
 	int v1; // esi
@@ -312,7 +308,6 @@ void __fastcall InitPlayerGFX(int pnum)
 	LoadPlrGFX(v1, v2);
 }
 
-//----- (0044ABB4) --------------------------------------------------------
 void __fastcall InitPlrGFXMem(int pnum)
 {
 	int v1; // esi
@@ -424,7 +419,6 @@ void __fastcall InitPlrGFXMem(int pnum)
 // 686438: using guessed type char plr_gfx_flag;
 // 69B7BC: using guessed type char plr_gfx_bflag;
 
-//----- (0044ADC8) --------------------------------------------------------
 int __fastcall GetPlrGFXSize(char *szCel)
 {
 	unsigned int v1; // ebx
@@ -472,7 +466,6 @@ int __fastcall GetPlrGFXSize(char *szCel)
 	return v11;
 }
 
-//----- (0044AE89) --------------------------------------------------------
 void __fastcall FreePlayerGFX(int pnum)
 {
 	int v1; // esi
@@ -521,7 +514,6 @@ void __fastcall FreePlayerGFX(int pnum)
 	plr[v2]._pGFXLoad = 0;
 }
 
-//----- (0044AF37) --------------------------------------------------------
 void __fastcall NewPlrAnim(int pnum, int Peq, int numFrames, int Delay, int width)
 {
 	int v5; // edi
@@ -542,7 +534,6 @@ void __fastcall NewPlrAnim(int pnum, int Peq, int numFrames, int Delay, int widt
 	plr[v7]._pAnimWidth2 = (width - 64) >> 1;
 }
 
-//----- (0044AF9C) --------------------------------------------------------
 void __fastcall ClearPlrPVars(int pnum)
 {
 	int v1; // esi
@@ -562,7 +553,6 @@ void __fastcall ClearPlrPVars(int pnum)
 	plr[v2]._pVar8 = 0;
 }
 
-//----- (0044AFED) --------------------------------------------------------
 void __fastcall SetPlrAnims(int pnum)
 {
 	int v1; // esi
@@ -673,7 +663,6 @@ LABEL_11:
 }
 // 5BB1ED: using guessed type char leveltype;
 
-//----- (0044B1FD) --------------------------------------------------------
 void __fastcall ClearPlrRVars(PlayerStruct *pPlayer)
 {
 	pPlayer->bReserved[0] = 0;
@@ -696,7 +685,6 @@ void __fastcall ClearPlrRVars(PlayerStruct *pPlayer)
 	pPlayer->dwReserved[6] = 0;
 }
 
-//----- (0044B274) --------------------------------------------------------
 void __fastcall CreatePlayer(int pnum, char c)
 {
 	unsigned int v2; // edi
@@ -862,7 +850,6 @@ LABEL_28:
 	SetRndSeed(0);
 }
 
-//----- (0044B582) --------------------------------------------------------
 int __fastcall CalcStatDiff(int pnum)
 {
 	int v1; // ecx
@@ -880,7 +867,6 @@ int __fastcall CalcStatDiff(int pnum)
 		 - plr[v1]._pBaseStr;
 }
 
-//----- (0044B5C3) --------------------------------------------------------
 void __fastcall NextPlrLevel(int pnum)
 {
 	int v1; // edi
@@ -936,7 +922,6 @@ void __fastcall NextPlrLevel(int pnum)
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (0044B6C8) --------------------------------------------------------
 void __fastcall AddPlrExperience(int pnum, int lvl, int exp)
 {
 	int v3; // eax
@@ -1029,7 +1014,6 @@ void __fastcall AddPlrExperience(int pnum, int lvl, int exp)
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (0044B7F8) --------------------------------------------------------
 void __fastcall AddPlrMonstExper(int lvl, int exp, char pmask)
 {
 	int v3; // ebx
@@ -1053,7 +1037,6 @@ void __fastcall AddPlrMonstExper(int lvl, int exp, char pmask)
 	}
 }
 
-//----- (0044B83C) --------------------------------------------------------
 void __fastcall InitPlayer(int pnum, bool FirstTime)
 {
 	int v2; // ebx
@@ -1216,7 +1199,6 @@ LABEL_33:
 // 52572C: using guessed type int leveldebug;
 // 69B7C4: using guessed type int deathdelay;
 
-//----- (0044BB33) --------------------------------------------------------
 void __cdecl InitMultiView()
 {
 	int v0; // eax
@@ -1228,7 +1210,6 @@ void __cdecl InitMultiView()
 	ViewY = v0;
 }
 
-//----- (0044BB6D) --------------------------------------------------------
 void __fastcall InitPlayerLoc(int pnum, bool flag)
 {
 	int v2; // esi
@@ -1293,7 +1274,6 @@ void __fastcall InitPlayerLoc(int pnum, bool flag)
 	}
 }
 
-//----- (0044BCC2) --------------------------------------------------------
 bool __fastcall SolidLoc(int x, int y)
 {
 	bool result; // eax
@@ -1305,7 +1285,6 @@ bool __fastcall SolidLoc(int x, int y)
 	return result;
 }
 
-//----- (0044BCEB) --------------------------------------------------------
 bool __fastcall PlrDirOK(int pnum, int dir)
 {
 	int v2; // esi
@@ -1351,7 +1330,6 @@ bool __fastcall PlrDirOK(int pnum, int dir)
 	return 0;
 }
 
-//----- (0044BD9A) --------------------------------------------------------
 void __fastcall PlrClrTrans(int x, int y)
 {
 	int v2; // esi
@@ -1389,7 +1367,6 @@ void __fastcall PlrClrTrans(int x, int y)
 	}
 }
 
-//----- (0044BDDD) --------------------------------------------------------
 void __fastcall PlrDoTrans(int x, int y)
 {
 	int v2; // edi
@@ -1440,7 +1417,6 @@ void __fastcall PlrDoTrans(int x, int y)
 }
 // 5BB1ED: using guessed type char leveltype;
 
-//----- (0044BE5E) --------------------------------------------------------
 void __fastcall SetPlayerOld(int pnum)
 {
 	int v1; // esi
@@ -1454,7 +1430,6 @@ void __fastcall SetPlayerOld(int pnum)
 	plr[v2]._poldy = plr[v1].WorldY;
 }
 
-//----- (0044BE95) --------------------------------------------------------
 void __fastcall FixPlayerLocation(int pnum, int dir)
 {
 	int v2; // edi
@@ -1494,7 +1469,6 @@ void __fastcall FixPlayerLocation(int pnum, int dir)
 	}
 }
 
-//----- (0044BF2D) --------------------------------------------------------
 void __fastcall StartStand(int pnum, int dir)
 {
 	int v2; // ebx
@@ -1523,7 +1497,6 @@ void __fastcall StartStand(int pnum, int dir)
 	}
 }
 
-//----- (0044BFE8) --------------------------------------------------------
 void __fastcall StartWalkStand(int pnum)
 {
 	int v1; // edi
@@ -1555,7 +1528,6 @@ void __fastcall StartWalkStand(int pnum)
 	}
 }
 
-//----- (0044C070) --------------------------------------------------------
 void __fastcall PM_ChangeLightOff(int pnum)
 {
 	int v1; // esi
@@ -1607,7 +1579,6 @@ void __fastcall PM_ChangeLightOff(int pnum)
 		ChangeLightOff(plr[v2]._plid, lx, v10);
 }
 
-//----- (0044C13D) --------------------------------------------------------
 void __fastcall PM_ChangeOffset(int pnum)
 {
 	int v1; // esi
@@ -1658,7 +1629,6 @@ void __fastcall PM_ChangeOffset(int pnum)
 	PM_ChangeLightOff(arglist);
 }
 
-//----- (0044C1E2) --------------------------------------------------------
 void __fastcall StartWalk(int pnum, int xvel, int yvel, int xadd, int yadd, int EndDir, int sdir)
 {
 	int v7; // edi
@@ -1755,7 +1725,6 @@ LABEL_20:
 }
 // 52569C: using guessed type int zoomflag;
 
-//----- (0044C3AC) --------------------------------------------------------
 void __fastcall StartWalk2(int pnum, int xvel, int yvel, int xoff, int yoff, int xadd, int yadd, int EndDir, int sdir)
 {
 	int v9; // edi
@@ -1866,7 +1835,6 @@ LABEL_22:
 }
 // 52569C: using guessed type int zoomflag;
 
-//----- (0044C5CF) --------------------------------------------------------
 void __fastcall StartWalk3(int pnum, int xvel, int yvel, int xoff, int yoff, int xadd, int yadd, int mapx, int mapy, int EndDir, int sdir)
 {
 	int v11; // edi
@@ -1983,7 +1951,6 @@ LABEL_22:
 // 52569C: using guessed type int zoomflag;
 // 5BB1ED: using guessed type char leveltype;
 
-//----- (0044C81E) --------------------------------------------------------
 void __fastcall StartAttack(int pnum, int d)
 {
 	int v2; // edi
@@ -2012,7 +1979,6 @@ void __fastcall StartAttack(int pnum, int d)
 	}
 }
 
-//----- (0044C8BB) --------------------------------------------------------
 void __fastcall StartRangeAttack(int pnum, int d, int cx, int cy)
 {
 	int v4; // edi
@@ -2043,7 +2009,6 @@ void __fastcall StartRangeAttack(int pnum, int d, int cx, int cy)
 	}
 }
 
-//----- (0044C973) --------------------------------------------------------
 void __fastcall StartPlrBlock(int pnum, int dir)
 {
 	int v2; // edi
@@ -2073,7 +2038,6 @@ void __fastcall StartPlrBlock(int pnum, int dir)
 	}
 }
 
-//----- (0044CA26) --------------------------------------------------------
 void __fastcall StartSpell(int pnum, int d, int cx, int cy)
 {
 	int v4; // edi
@@ -2129,7 +2093,6 @@ LABEL_20:
 }
 // 5BB1ED: using guessed type char leveltype;
 
-//----- (0044CB95) --------------------------------------------------------
 void __fastcall FixPlrWalkTags(int pnum)
 {
 	int v1; // esi
@@ -2195,7 +2158,6 @@ void __fastcall FixPlrWalkTags(int pnum)
 	}
 }
 
-//----- (0044CC62) --------------------------------------------------------
 void __fastcall RemovePlrFromMap(int pnum)
 {
 	int v1; // esi
@@ -2250,7 +2212,6 @@ void __fastcall RemovePlrFromMap(int pnum)
 	while ( v6 < 112 );
 }
 
-//----- (0044CCD8) --------------------------------------------------------
 void __fastcall StartPlrHit(int pnum, int dam, unsigned char forcehit)
 {
 	int v3; // ebx
@@ -2305,7 +2266,6 @@ LABEL_13:
 	}
 }
 
-//----- (0044CDFD) --------------------------------------------------------
 void __fastcall RespawnDeadItem(ItemStruct *itm, int x, int y)
 {
 	ItemStruct *v3; // ebx
@@ -2337,7 +2297,6 @@ void __fastcall RespawnDeadItem(ItemStruct *itm, int x, int y)
 	}
 }
 
-//----- (0044CEC9) --------------------------------------------------------
 void __fastcall StartPlayerKill(int pnum, int earflag)
 {
 	unsigned int v2; // edi
@@ -2489,7 +2448,6 @@ LABEL_18:
 // 679660: using guessed type char gbMaxPlayers;
 // 69B7C4: using guessed type int deathdelay;
 
-//----- (0044D1F4) --------------------------------------------------------
 void __fastcall PlrDeadItem(int pnum, struct ItemStruct *itm, int xx, int yy)
 {
 	int v4; // edi
@@ -2573,7 +2531,6 @@ LABEL_14:
 	}
 }
 
-//----- (0044D2F3) --------------------------------------------------------
 void __fastcall DropHalfPlayersGold(int pnum)
 {
 	int v1; // ebx
@@ -2772,7 +2729,6 @@ LABEL_28:
 }
 // 52571C: using guessed type int drawpanflag;
 
-//----- (0044D70B) --------------------------------------------------------
 void __fastcall SyncPlrKill(int pnum, int earflag)
 {
 	int v2; // esi
@@ -2811,7 +2767,6 @@ LABEL_9:
 	}
 }
 
-//----- (0044D7A0) --------------------------------------------------------
 void __fastcall RemovePlrMissiles(int pnum)
 {
 	int v1; // ebx
@@ -2857,7 +2812,6 @@ void __fastcall RemovePlrMissiles(int pnum)
 	}
 }
 
-//----- (0044D8D1) --------------------------------------------------------
 void __fastcall InitLevelChange(int pnum)
 {
 	int v1; // esi
@@ -2887,7 +2841,6 @@ void __fastcall InitLevelChange(int pnum)
 }
 // 646D00: using guessed type char qtextflag;
 
-//----- (0044D973) --------------------------------------------------------
 void __fastcall StartNewLvl(int pnum, int fom, int lvl)
 {
 	int v3; // edi
@@ -2941,7 +2894,6 @@ LABEL_11:
 // 5CCB10: using guessed type char setlvlnum;
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (0044DA6F) --------------------------------------------------------
 void __fastcall RestartTownLvl(int pnum)
 {
 	unsigned int v1; // edi
@@ -2970,7 +2922,6 @@ void __fastcall RestartTownLvl(int pnum)
 	}
 }
 
-//----- (0044DAFC) --------------------------------------------------------
 void __fastcall StartWarpLvl(int pnum, int pidx)
 {
 	int v2; // edi
@@ -3002,13 +2953,11 @@ void __fastcall StartWarpLvl(int pnum, int pidx)
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (0044DB74) --------------------------------------------------------
 int __fastcall PM_DoStand(int pnum)
 {
 	return 0;
 }
 
-//----- (0044DB77) --------------------------------------------------------
 int __fastcall PM_DoWalk(int pnum)
 {
 	int v1; // ebx
@@ -3081,7 +3030,6 @@ LABEL_9:
 }
 // 5BB1ED: using guessed type char leveltype;
 
-//----- (0044DCE5) --------------------------------------------------------
 int __fastcall PM_DoWalk2(int pnum)
 {
 	int v1; // ebx
@@ -3141,7 +3089,6 @@ LABEL_9:
 }
 // 5BB1ED: using guessed type char leveltype;
 
-//----- (0044DE30) --------------------------------------------------------
 int __fastcall PM_DoWalk3(int pnum)
 {
 	int v1; // ebx
@@ -3213,7 +3160,6 @@ LABEL_9:
 }
 // 5BB1ED: using guessed type char leveltype;
 
-//----- (0044DFB1) --------------------------------------------------------
 bool __fastcall WeaponDur(int pnum, int durrnd)
 {
 	unsigned int v2; // edi
@@ -3294,7 +3240,6 @@ LABEL_23:
 	return 0;
 }
 
-//----- (0044E0BC) --------------------------------------------------------
 bool __fastcall PlrHitMonst(int pnum, int m)
 {
 	int v2; // ebx
@@ -3532,7 +3477,6 @@ LABEL_85:
 	return v42;
 }
 
-//----- (0044E442) --------------------------------------------------------
 bool __fastcall PlrHitPlr(int pnum, char p)
 {
 	char v2; // bl
@@ -3660,7 +3604,6 @@ bool __fastcall PlrHitPlr(int pnum, char p)
 	return v30;
 }
 
-//----- (0044E669) --------------------------------------------------------
 bool __fastcall PlrHitObj(int pnum, int mx, int my)
 {
 	int oi; // edx
@@ -3677,7 +3620,6 @@ bool __fastcall PlrHitObj(int pnum, int mx, int my)
 	return 1;
 }
 
-//----- (0044E6A6) --------------------------------------------------------
 int __fastcall PM_DoAttack(int pnum)
 {
 	int v1; // esi
@@ -3793,7 +3735,6 @@ LABEL_48:
 }
 // 484368: using guessed type int FriendlyMode;
 
-//----- (0044E8B8) --------------------------------------------------------
 int __fastcall PM_DoRangeAttack(int pnum)
 {
 	int v1; // edi
@@ -3834,7 +3775,6 @@ LABEL_21:
 	return 1;
 }
 
-//----- (0044E9AC) --------------------------------------------------------
 void __fastcall ShieldDur(int pnum)
 {
 	int v1; // edi
@@ -3882,7 +3822,6 @@ void __fastcall ShieldDur(int pnum)
 	}
 }
 
-//----- (0044EA4D) --------------------------------------------------------
 int __fastcall PM_DoBlock(int pnum)
 {
 	int v1; // esi
@@ -3905,7 +3844,6 @@ int __fastcall PM_DoBlock(int pnum)
 	return 1;
 }
 
-//----- (0044EAC6) --------------------------------------------------------
 int __fastcall PM_DoSpell(int pnum)
 {
 	int v1; // edi
@@ -3965,7 +3903,6 @@ LABEL_16:
 // 52571C: using guessed type int drawpanflag;
 // 5BB1ED: using guessed type char leveltype;
 
-//----- (0044EC06) --------------------------------------------------------
 int __fastcall PM_DoGotHit(int pnum)
 {
 	int v1; // esi
@@ -3996,7 +3933,6 @@ int __fastcall PM_DoGotHit(int pnum)
 	return 1;
 }
 
-//----- (0044ECBC) --------------------------------------------------------
 void __fastcall ArmorDur(int pnum)
 {
 	int v1; // ebp
@@ -4057,7 +3993,6 @@ LABEL_23:
 	}
 }
 
-//----- (0044ED7B) --------------------------------------------------------
 int __fastcall PM_DoDeath(int pnum)
 {
 	int v1; // edi
@@ -4092,7 +4027,6 @@ int __fastcall PM_DoDeath(int pnum)
 // 679660: using guessed type char gbMaxPlayers;
 // 69B7C4: using guessed type int deathdelay;
 
-//----- (0044EE22) --------------------------------------------------------
 void __fastcall CheckNewPath(int pnum)
 {
 	int v1; // edi
@@ -4613,7 +4547,6 @@ LABEL_143:
 	}
 }
 
-//----- (0044F9BA) --------------------------------------------------------
 bool __fastcall PlrDeathModeOK(int pnum)
 {
 	int v1; // esi
@@ -4634,7 +4567,6 @@ LABEL_10:
 	return result;
 }
 
-//----- (0044F9FC) --------------------------------------------------------
 void __cdecl ValidatePlayer()
 {
 	int v0; // edi
@@ -4714,7 +4646,6 @@ void __cdecl ValidatePlayer()
 	*(_QWORD *)plr[v1]._pMemSpells &= v14;
 }
 
-//----- (0044FB32) --------------------------------------------------------
 void __cdecl ProcessPlayers()
 {
 	int v0; // eax
@@ -4845,7 +4776,6 @@ LABEL_38:
 }
 // 52A554: using guessed type int sfxdelay;
 
-//----- (0044FD31) --------------------------------------------------------
 void __fastcall CheckCheatStats(int pnum)
 {
 	int v1; // ecx
@@ -4867,7 +4797,6 @@ void __fastcall CheckCheatStats(int pnum)
 		*v2 = 128000;
 }
 
-//----- (0044FD8A) --------------------------------------------------------
 void __fastcall ClrPlrPath(int pnum)
 {
 	int v1; // esi
@@ -4878,7 +4807,6 @@ void __fastcall ClrPlrPath(int pnum)
 	memset(plr[v1].walkpath, -1, 0x19u);
 }
 
-//----- (0044FDBA) --------------------------------------------------------
 bool __fastcall PosOkPlayer(int pnum, int px, int py)
 {
 	char v8; // cl
@@ -4909,7 +4837,6 @@ bool __fastcall PosOkPlayer(int pnum, int px, int py)
 	return result;
 }
 
-//----- (0044FE9E) --------------------------------------------------------
 void __fastcall MakePlrPath(int pnum, int xx, int yy, unsigned char endspace)
 {
 	int v4; // esi
@@ -4978,7 +4905,6 @@ LABEL_15:
 	}
 }
 
-//----- (0044FF6F) --------------------------------------------------------
 void __fastcall CheckPlrSpell()
 {
 	int v0; // ecx
@@ -5129,7 +5055,6 @@ LABEL_53:
 // 4B8CC2: using guessed type char pcursplr;
 // 5BB1ED: using guessed type char leveltype;
 
-//----- (00450217) --------------------------------------------------------
 void __fastcall SyncPlrAnim(int pnum)
 {
 	int v1; // esi
@@ -5190,7 +5115,6 @@ LABEL_19:
 	}
 }
 
-//----- (0045036D) --------------------------------------------------------
 void __fastcall SyncInitPlrPos(int pnum)
 {
 	int v1; // esi
@@ -5274,7 +5198,6 @@ void __fastcall SyncInitPlrPos(int pnum)
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (004504E4) --------------------------------------------------------
 void __fastcall SyncInitPlr(int pnum)
 {
 	int v1; // esi
@@ -5286,7 +5209,6 @@ void __fastcall SyncInitPlr(int pnum)
 	SyncInitPlrPos(v1);
 }
 
-//----- (00450508) --------------------------------------------------------
 void __fastcall CheckStats(int pnum)
 {
 	int v1; // esi
@@ -5395,7 +5317,6 @@ void __fastcall CheckStats(int pnum)
 	while ( v5 < 4 );
 }
 
-//----- (00450621) --------------------------------------------------------
 void __fastcall ModifyPlrStr(int pnum, int l)
 {
 	int v2; // esi
@@ -5439,7 +5360,6 @@ void __fastcall ModifyPlrStr(int pnum, int l)
 		NetSendCmdParam1(0, CMD_SETSTR, plr[v4]._pBaseStr);
 }
 
-//----- (004506DB) --------------------------------------------------------
 void __fastcall ModifyPlrMag(int pnum, int l)
 {
 	int v2; // esi
@@ -5481,7 +5401,6 @@ void __fastcall ModifyPlrMag(int pnum, int l)
 		NetSendCmdParam1(0, CMD_SETMAG, plr[v4]._pBaseMag);
 }
 
-//----- (00450788) --------------------------------------------------------
 void __fastcall ModifyPlrDex(int pnum, int l)
 {
 	int v2; // ebx
@@ -5508,7 +5427,6 @@ void __fastcall ModifyPlrDex(int pnum, int l)
 		NetSendCmdParam1(0, CMD_SETDEX, plr[v4]._pBaseDex);
 }
 
-//----- (0045082C) --------------------------------------------------------
 void __fastcall ModifyPlrVit(int pnum, int l)
 {
 	int v2; // esi
@@ -5547,7 +5465,6 @@ void __fastcall ModifyPlrVit(int pnum, int l)
 		NetSendCmdParam1(0, CMD_SETVIT, plr[v4]._pBaseVit);
 }
 
-//----- (004508CF) --------------------------------------------------------
 void __fastcall SetPlayerHitPoints(int pnum, int newhp)
 {
 	int v2; // esi
@@ -5569,7 +5486,6 @@ void __fastcall SetPlayerHitPoints(int pnum, int newhp)
 		drawhpflag = 1;
 }
 
-//----- (0045091E) --------------------------------------------------------
 void __fastcall SetPlrStr(int pnum, int v)
 {
 	int v2; // edi
@@ -5598,7 +5514,6 @@ void __fastcall SetPlrStr(int pnum, int v)
 	plr[v4]._pDamageMod = v5 / v6;
 }
 
-//----- (00450993) --------------------------------------------------------
 void __fastcall SetPlrMag(int pnum, int v)
 {
 	int v2; // edi
@@ -5620,7 +5535,6 @@ void __fastcall SetPlrMag(int pnum, int v)
 	CalcPlrInv(v2, 1u);
 }
 
-//----- (004509DF) --------------------------------------------------------
 void __fastcall SetPlrDex(int pnum, int v)
 {
 	int v2; // edi
@@ -5649,7 +5563,6 @@ void __fastcall SetPlrDex(int pnum, int v)
 	plr[v4]._pDamageMod = v5 / v6;
 }
 
-//----- (00450A54) --------------------------------------------------------
 void __fastcall SetPlrVit(int pnum, int v)
 {
 	int v2; // edi
@@ -5671,7 +5584,6 @@ void __fastcall SetPlrVit(int pnum, int v)
 	CalcPlrInv(v2, 1u);
 }
 
-//----- (00450AA0) --------------------------------------------------------
 void __fastcall InitDungMsgs(int pnum)
 {
 	int v1; // esi
@@ -5682,7 +5594,6 @@ void __fastcall InitDungMsgs(int pnum)
 	plr[v1].pDungMsgs = 0;
 }
 
-//----- (00450AC4) --------------------------------------------------------
 void __cdecl PlayDungMsgs()
 {
 	int v0; // eax
diff --git a/Source/player.h b/Source/player.h
index be8ae06..ce5d0db 100644
--- a/Source/player.h
+++ b/Source/player.h
@@ -1,6 +1,7 @@
 //HEADER_GOES_HERE
+#ifndef __PLAYER_H__
+#define __PLAYER_H__
 
-//player
 extern int plr_lframe_size; // idb
 extern int plr_wframe_size; // idb
 extern char plr_gfx_flag; // weak
@@ -134,3 +135,5 @@ extern int MaxStats[3][4];
 extern int ExpLvlsTbl[51];
 extern char *ClassStrTbl[3];
 extern unsigned char fix[9];
+
+#endif /* __PLAYER_H__ */
diff --git a/Source/plrmsg.cpp b/Source/plrmsg.cpp
index 95352bb..53dec87 100644
--- a/Source/plrmsg.cpp
+++ b/Source/plrmsg.cpp
@@ -8,7 +8,6 @@ _plrmsg plr_msgs[8];
 
 text_color text_color_from_player_num[2] = { COL_WHITE, COL_GOLD };
 
-//----- (00450D33) --------------------------------------------------------
 void __fastcall plrmsg_delay(int a1)
 {
 	_plrmsg *pMsg; // eax
@@ -34,7 +33,6 @@ void __fastcall plrmsg_delay(int a1)
 }
 // 69B7D0: using guessed type int plrmsg_ticks;
 
-//----- (00450D6A) --------------------------------------------------------
 char *__fastcall ErrorPlrMsg(char *pszMsg)
 {
 	_plrmsg *pMsg; // esi
@@ -52,7 +50,6 @@ char *__fastcall ErrorPlrMsg(char *pszMsg)
 }
 // 69B7D4: using guessed type char plr_msg_slot;
 
-//----- (00450DB3) --------------------------------------------------------
 size_t EventPlrMsg(char *pszFmt, ...)
 {
 	char *v1; // esi
@@ -69,7 +66,6 @@ size_t EventPlrMsg(char *pszFmt, ...)
 }
 // 69B7D4: using guessed type char plr_msg_slot;
 
-//----- (00450DFA) --------------------------------------------------------
 void __fastcall SendPlrMsg(int pnum, const char *pszStr)
 {
 	_plrmsg *pMsg; // esi
@@ -92,7 +88,6 @@ void __fastcall SendPlrMsg(int pnum, const char *pszStr)
 }
 // 69B7D4: using guessed type char plr_msg_slot;
 
-//----- (00450E64) --------------------------------------------------------
 void __cdecl ClearPlrMsg()
 {
 	_plrmsg *pMsg; // esi
@@ -112,7 +107,6 @@ void __cdecl ClearPlrMsg()
 	while ( v2 );
 }
 
-//----- (00450E8E) --------------------------------------------------------
 void __cdecl InitPlrMsg()
 {
 	memset(plr_msgs, 0, 0x4C0u);
@@ -120,7 +114,6 @@ void __cdecl InitPlrMsg()
 }
 // 69B7D4: using guessed type char plr_msg_slot;
 
-//----- (00450EAA) --------------------------------------------------------
 void __cdecl DrawPlrMsg()
 {
 	int v0; // ebx
@@ -157,7 +150,6 @@ LABEL_9:
 // 4B8968: using guessed type int sbookflag;
 // 69BD04: using guessed type int questlog;
 
-//----- (00450F37) --------------------------------------------------------
 void __fastcall PrintPlrMsg(int no, int x, int y, char *str, int just)
 {
 	char *v5; // edi
diff --git a/Source/plrmsg.h b/Source/plrmsg.h
index 58e81d0..8170daa 100644
--- a/Source/plrmsg.h
+++ b/Source/plrmsg.h
@@ -1,6 +1,7 @@
 //HEADER_GOES_HERE
+#ifndef __PLRMSG_H__
+#define __PLRMSG_H__
 
-//plrmsg
 extern int plrmsg_ticks; // weak
 extern char plr_msg_slot; // weak
 extern _plrmsg plr_msgs[8];
@@ -17,3 +18,5 @@ void __fastcall PrintPlrMsg(int no, int x, int y, char *str, int just);
 /* data */
 
 extern text_color text_color_from_player_num[2];
+
+#endif /* __PLRMSG_H__ */
diff --git a/Source/portal.cpp b/Source/portal.cpp
index 159ae0f..accdfbe 100644
--- a/Source/portal.cpp
+++ b/Source/portal.cpp
@@ -8,7 +8,6 @@ int portalindex;
 int WarpDropX[4] = { 57, 59, 61, 63 };
 int WarpDropY[4] = { 40, 40, 40, 40 };
 
-//----- (00450FFE) --------------------------------------------------------
 void __cdecl InitPortals()
 {
 	int i; // edi
@@ -20,7 +19,6 @@ void __cdecl InitPortals()
 	}
 }
 
-//----- (00451024) --------------------------------------------------------
 void __fastcall SetPortalStats(int i, int o, int x, int y, int lvl, int lvltype)
 {
 	portal[i].x = x;
@@ -31,7 +29,6 @@ void __fastcall SetPortalStats(int i, int o, int x, int y, int lvl, int lvltype)
 	portal[i].ltype = lvltype;
 }
 
-//----- (00451062) --------------------------------------------------------
 void __fastcall AddWarpMissile(int i, int x, int y)
 {
 	int mi; // eax
@@ -51,7 +48,6 @@ void __fastcall AddWarpMissile(int i, int x, int y)
 	}
 }
 
-//----- (004510D6) --------------------------------------------------------
 void __cdecl SyncPortals()
 {
 	int v0; // edi
@@ -86,13 +82,11 @@ void __cdecl SyncPortals()
 // 5CF31D: using guessed type char setlevel;
 // 69BD04: using guessed type int questlog;
 
-//----- (00451131) --------------------------------------------------------
 void __fastcall AddInTownPortal(int i)
 {
 	AddWarpMissile(i, WarpDropX[i], WarpDropY[i]);
 }
 
-//----- (00451145) --------------------------------------------------------
 void __fastcall ActivatePortal(int i, int x, int y, int lvl, int lvltype, int sp)
 {
 	portal[i].open = 1;
@@ -107,13 +101,11 @@ void __fastcall ActivatePortal(int i, int x, int y, int lvl, int lvltype, int sp
 	}
 }
 
-//----- (0045118A) --------------------------------------------------------
 void __fastcall DeactivatePortal(int i)
 {
 	portal[i].open = 0;
 }
 
-//----- (00451196) --------------------------------------------------------
 bool __fastcall PortalOnLevel(int i)
 {
 	if ( portal[i].level == currlevel )
@@ -122,7 +114,6 @@ bool __fastcall PortalOnLevel(int i)
 		return currlevel == 0;
 }
 
-//----- (004511B8) --------------------------------------------------------
 void __fastcall RemovePortalMissile(int id)
 {
 	int i; // esi
@@ -144,13 +135,11 @@ void __fastcall RemovePortalMissile(int id)
 	}
 }
 
-//----- (00451234) --------------------------------------------------------
 void __fastcall SetCurrentPortal(int p)
 {
 	portalindex = p;
 }
 
-//----- (0045123B) --------------------------------------------------------
 void __cdecl GetPortalLevel()
 {
 	if ( currlevel )
@@ -187,7 +176,6 @@ void __cdecl GetPortalLevel()
 // 5CCB10: using guessed type char setlvlnum;
 // 5CF31D: using guessed type char setlevel;
 
-//----- (004512E3) --------------------------------------------------------
 void __cdecl GetPortalLvlPos()
 {
 	if ( currlevel )
@@ -208,7 +196,6 @@ void __cdecl GetPortalLvlPos()
 	}
 }
 
-//----- (00451346) --------------------------------------------------------
 bool __fastcall PosOkPortal(int level, int x, int y)
 {
 	int *v3; // eax
diff --git a/Source/portal.h b/Source/portal.h
index 8078de3..eb14e5d 100644
--- a/Source/portal.h
+++ b/Source/portal.h
@@ -1,6 +1,7 @@
 //HEADER_GOES_HERE
+#ifndef __PORTAL_H__
+#define __PORTAL_H__
 
-//portal
 extern PortalStruct portal[4];
 extern int portalindex;
 // int END_portalstruct; // weak
@@ -22,3 +23,5 @@ bool __fastcall PosOkPortal(int level, int x, int y);
 /* rdata */
 extern int WarpDropX[4];
 extern int WarpDropY[4];
+
+#endif /* __PORTAL_H__ */
diff --git a/Source/quests.cpp b/Source/quests.cpp
index 85e132d..85eaf9f 100644
--- a/Source/quests.cpp
+++ b/Source/quests.cpp
@@ -50,7 +50,6 @@ int QuestGroup2[3] = { QTYPE_BLIND, QTYPE_INFRA, QTYPE_BLOOD };
 int QuestGroup3[3] = { QTYPE_BLKM, QTYPE_ZHAR, QTYPE_ANVIL };
 int QuestGroup4[2] = { QTYPE_VEIL, QTYPE_WARLRD };
 
-//----- (0045138E) --------------------------------------------------------
 void __cdecl InitQuests()
 {
 	char v0; // dl
@@ -185,7 +184,6 @@ void __cdecl InitQuests()
 // 69BD04: using guessed type int questlog;
 // 69BE90: using guessed type int qline;
 
-//----- (0045155C) --------------------------------------------------------
 void __cdecl CheckQuests()
 {
 	//int v0; // eax
@@ -282,7 +280,6 @@ LABEL_29:
 // 679660: using guessed type char gbMaxPlayers;
 // 69BE90: using guessed type int qline;
 
-//----- (0045178F) --------------------------------------------------------
 bool __cdecl ForceQuests()
 {
 	QuestStruct *v0; // eax
@@ -315,7 +312,6 @@ LABEL_10:
 }
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (00451831) --------------------------------------------------------
 bool __fastcall QuestStatus(int i)
 {
 	bool result; // al
@@ -332,7 +328,6 @@ bool __fastcall QuestStatus(int i)
 // 5CF31D: using guessed type char setlevel;
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (00451871) --------------------------------------------------------
 void __fastcall CheckQuestKill(int m, unsigned char sendmsg)
 {
 	int v2; // ecx
@@ -567,13 +562,11 @@ LABEL_10:
 // 52A554: using guessed type int sfxdelay;
 // 679660: using guessed type char gbMaxPlayers;
 
-//----- (00451BEA) --------------------------------------------------------
 void __cdecl DrawButcher()
 {
 	DRLG_RectTrans(2 * setpc_x + 19, 2 * setpc_y + 19, 2 * setpc_x + 26, 2 * setpc_y + 26);
 }
 
-//----- (00451C11) --------------------------------------------------------
 void __fastcall DrawSkelKing(int quest_id, int xx, int yy)
 {
 	int v3; // eax
@@ -583,7 +576,6 @@ void __fastcall DrawSkelKing(int quest_id, int xx, int yy)
 	quests[v3]._qty = 2 * yy + 23;
 }
 
-//----- (00451C32) --------------------------------------------------------
 void __fastcall DrawWarLord(int xx, int yy)
 {
 	int v2; // esi
@@ -644,7 +636,6 @@ void __fastcall DrawWarLord(int xx, int yy)
 // 5CF330: using guessed type int setpc_h;
 // 5CF334: using guessed type int setpc_w;
 
-//----- (00451CC2) --------------------------------------------------------
 void __fastcall DrawSChamber(int quest_id, int xx, int yy)
 {
 	int v3; // esi
@@ -708,7 +699,6 @@ void __fastcall DrawSChamber(int quest_id, int xx, int yy)
 // 5CF330: using guessed type int setpc_h;
 // 5CF334: using guessed type int setpc_w;
 
-//----- (00451D7C) --------------------------------------------------------
 void __fastcall DrawLTBanner(int xx, int yy)
 {
 	int v2; // ebx
@@ -768,7 +758,6 @@ void __fastcall DrawLTBanner(int xx, int yy)
 // 5CF330: using guessed type int setpc_h;
 // 5CF334: using guessed type int setpc_w;
 
-//----- (00451E08) --------------------------------------------------------
 void __fastcall DrawBlind(int xx, int yy)
 {
 	int v2; // ebx
@@ -828,7 +817,6 @@ void __fastcall DrawBlind(int xx, int yy)
 // 5CF330: using guessed type int setpc_h;
 // 5CF334: using guessed type int setpc_w;
 
-//----- (00451E94) --------------------------------------------------------
 void __fastcall DrawBlood(int xx, int yy)
 {
 	int v2; // ebx
@@ -888,7 +876,6 @@ void __fastcall DrawBlood(int xx, int yy)
 // 5CF330: using guessed type int setpc_h;
 // 5CF334: using guessed type int setpc_w;
 
-//----- (00451F20) --------------------------------------------------------
 void __fastcall DRLG_CheckQuests(int xx, int yy)
 {
 	int v2; // esi
@@ -938,7 +925,6 @@ void __fastcall DRLG_CheckQuests(int xx, int yy)
 }
 // 69BE90: using guessed type int qline;
 
-//----- (00451FB1) --------------------------------------------------------
 void __cdecl SetReturnLvlPos()
 {
 	int v0; // eax
@@ -975,7 +961,6 @@ LABEL_10:
 }
 // 5CCB10: using guessed type char setlvlnum;
 
-//----- (00452064) --------------------------------------------------------
 void __cdecl GetReturnLvlPos()
 {
 	if ( quests[15]._qactive == 3 )
@@ -987,7 +972,6 @@ void __cdecl GetReturnLvlPos()
 }
 // 5BB1ED: using guessed type char leveltype;
 
-//----- (0045209D) --------------------------------------------------------
 void __cdecl ResyncMPQuests()
 {
 	if ( quests[12]._qactive == 1
@@ -1013,7 +997,6 @@ void __cdecl ResyncMPQuests()
 		AddObject(OBJ_ALTBOY, 2 * setpc_x + 20, 2 * setpc_y + 22);
 }
 
-//----- (00452159) --------------------------------------------------------
 void __cdecl ResyncQuests()
 {
 	char *v0; // ecx
@@ -1126,7 +1109,6 @@ void __cdecl ResyncQuests()
 // 5CF330: using guessed type int setpc_h;
 // 5CF334: using guessed type int setpc_w;
 
-//----- (0045247F) --------------------------------------------------------
 void __fastcall PrintQLString(int x, int y, unsigned char cjustflag, char *str, int col)
 {
 	int v5; // ebx
@@ -1210,7 +1192,6 @@ LABEL_24:
 }
 // 69BE90: using guessed type int qline;
 
-//----- (004525CD) --------------------------------------------------------
 void __cdecl DrawQuestLog()
 {
 	int v0; // edi
@@ -1229,7 +1210,6 @@ void __cdecl DrawQuestLog()
 }
 // 69BED4: using guessed type int numqlines;
 
-//----- (00452659) --------------------------------------------------------
 void __cdecl StartQuestlog()
 {
 	signed int v0; // eax
@@ -1265,7 +1245,6 @@ void __cdecl StartQuestlog()
 // 69BE90: using guessed type int qline;
 // 69BED4: using guessed type int numqlines;
 
-//----- (004526C9) --------------------------------------------------------
 void __cdecl QuestlogUp()
 {
 	if ( numqlines )
@@ -1288,7 +1267,6 @@ void __cdecl QuestlogUp()
 // 69BE90: using guessed type int qline;
 // 69BED4: using guessed type int numqlines;
 
-//----- (00452710) --------------------------------------------------------
 void __cdecl QuestlogDown()
 {
 	if ( numqlines )
@@ -1311,7 +1289,6 @@ void __cdecl QuestlogDown()
 // 69BE90: using guessed type int qline;
 // 69BED4: using guessed type int numqlines;
 
-//----- (0045275A) --------------------------------------------------------
 void __cdecl QuestlogEnter()
 {
 	PlaySFX(IS_TITLSLCT);
@@ -1323,7 +1300,6 @@ void __cdecl QuestlogEnter()
 // 69BE90: using guessed type int qline;
 // 69BED4: using guessed type int numqlines;
 
-//----- (0045279C) --------------------------------------------------------
 void __cdecl QuestlogESC()
 {
 	int v0; // esi
@@ -1350,7 +1326,6 @@ void __cdecl QuestlogESC()
 // 69BE90: using guessed type int qline;
 // 69BED4: using guessed type int numqlines;
 
-//----- (004527F1) --------------------------------------------------------
 void __fastcall SetMultiQuest(int q, int s, unsigned char l, int v1)
 {
 	int v4; // eax
diff --git a/Source/quests.h b/Source/quests.h
index 01d43ab..51b26d2 100644
--- a/Source/quests.h
+++ b/Source/quests.h
@@ -1,6 +1,7 @@
 //HEADER_GOES_HERE
+#ifndef __QUESTS_H__
+#define __QUESTS_H__
 
-//quests
 extern int qtopline; // idb
 extern int questlog; // weak
 extern void *pQLogCel;
@@ -50,3 +51,5 @@ extern int QuestGroup1[3];
 extern int QuestGroup2[3];
 extern int QuestGroup3[3];
 extern int QuestGroup4[2];
+
+#endif /* __QUESTS_H__ */
diff --git a/Source/restrict.cpp b/Source/restrict.cpp
index e5d1fa4..914f438 100644
--- a/Source/restrict.cpp
+++ b/Source/restrict.cpp
@@ -2,7 +2,6 @@
 
 #include "../types.h"
 
-//----- (00452831) --------------------------------------------------------
 bool __cdecl SystemSupported()
 {
 	bool v0; // di
@@ -20,7 +19,6 @@ bool __cdecl SystemSupported()
 	return v0;
 }
 
-//----- (00452885) --------------------------------------------------------
 bool __cdecl RestrictedTest()
 {
 	bool v0; // si
@@ -45,7 +43,6 @@ bool __cdecl RestrictedTest()
 	return v0;
 }
 
-//----- (004528F7) --------------------------------------------------------
 bool __cdecl ReadOnlyTest()
 {
 	bool v0; // si
diff --git a/Source/restrict.h b/Source/restrict.h
index e56aa01..fa69dcc 100644
--- a/Source/restrict.h
+++ b/Source/restrict.h
@@ -1,5 +1,9 @@
 //HEADER_GOES_HERE
+#ifndef __RESTRICT_H__
+#define __RESTRICT_H__
 
 bool __cdecl SystemSupported();
 bool __cdecl RestrictedTest();
-bool __cdecl ReadOnlyTest();
\ No newline at end of file
+bool __cdecl ReadOnlyTest();
+
+#endif /* __RESTRICT_H__ */
diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp
index 1500016..73f8371 100644
--- a/Source/scrollrt.cpp
+++ b/Source/scrollrt.cpp
@@ -66,7 +66,6 @@ char *szPlrModeAssert[12] =
 	"quitting"
 };
 
-//----- (0045297A) --------------------------------------------------------
 struct scrollrt_cpp_init
 {
 	scrollrt_cpp_init()
@@ -77,14 +76,12 @@ struct scrollrt_cpp_init
 // 47F238: using guessed type int scrollrt_inf;
 // 69CEFC: using guessed type int scrollrt_cpp_init_value;
 
-//----- (00452985) --------------------------------------------------------
 void __cdecl ClearCursor() // CODE_FIX: this was supposed to be in cursor.cpp
 {
 	sgdwCursWdt = 0;
 	sgdwCursWdtOld = 0;
 }
 
-//----- (00452994) --------------------------------------------------------
 void __fastcall DrawMissile(int x, int y, int sx, int sy, int a5, int a6, int del_flag)
 {
 	int v7; // ebx
@@ -184,7 +181,6 @@ void __fastcall DrawMissile(int x, int y, int sx, int sy, int a5, int a6, int de
 	}
 }
 
-//----- (00452B2A) --------------------------------------------------------
 void __fastcall DrawClippedMissile(int x, int y, int sx, int sy, int a5, int a6, int a7)
 {
 	int v7; // ebx
@@ -284,7 +280,6 @@ void __fastcall DrawClippedMissile(int x, int y, int sx, int sy, int a5, int a6,
 	}
 }
 
-//----- (00452CC0) --------------------------------------------------------
 void __fastcall DrawDeadPlayer(int x, int y, int sx, int sy, int a5, int a6, bool clipped)
 {
 	int v7; // ebx
@@ -323,7 +318,6 @@ LABEL_14:
 	while ( (signed int)v8 < (signed int)&plr[4]._pHitPoints );
 }
 
-//----- (00452DA0) --------------------------------------------------------
 void __fastcall DrawPlayer(int pnum, int x, int y, int px, int py, int animdata, int animframe, int animwidth, int a9, int a10)
 {
 	char *v10; // edx
@@ -405,7 +399,6 @@ void __fastcall DrawPlayer(int pnum, int x, int y, int px, int py, int animdata,
 // 5CF31D: using guessed type char setlevel;
 // 69BEF8: using guessed type int light_table_index;
 
-//----- (00452F8B) --------------------------------------------------------
 void __fastcall DrawClippedPlayer(int pnum, int x, int y, int px, int py, int animdata, int animframe, int animwidth, int a9, int a10)
 {
 	char *v10; // edx
@@ -486,7 +479,6 @@ void __fastcall DrawClippedPlayer(int pnum, int x, int y, int px, int py, int an
 // 4B8CC2: using guessed type char pcursplr;
 // 69BEF8: using guessed type int light_table_index;
 
-//----- (00453160) --------------------------------------------------------
 void __fastcall DrawView(int StartX, int StartY)
 {
 	if ( zoomflag )
@@ -545,7 +537,6 @@ void __fastcall DrawView(int StartX, int StartY)
 // 646D00: using guessed type char qtextflag;
 // 69BD04: using guessed type int questlog;
 
-//----- (00453272) --------------------------------------------------------
 void __fastcall DrawGame(int x, int y)
 {
 	int v2; // esi
@@ -678,7 +669,6 @@ LABEL_15:
 // 69CF0C: using guessed type int screen_buf_end;
 // 69CF20: using guessed type char arch_draw_type;
 
-//----- (00453477) --------------------------------------------------------
 void __fastcall scrollrt_draw_lower(int x, int y, int sx, int sy, int a5, int some_flag)
 {
 	unsigned int v6; // edi
@@ -915,7 +905,6 @@ LABEL_23:
 // 69CF94: using guessed type int cel_transparency_active;
 // 69CF98: using guessed type int level_piece_id;
 
-//----- (004538E2) --------------------------------------------------------
 void __fastcall scrollrt_draw_clipped_dungeon(char *a1, int sx, int sy, int a4, int a5, int a6)
 {
 	int v6; // eax
@@ -1185,7 +1174,6 @@ void __fastcall scrollrt_draw_clipped_dungeon(char *a1, int sx, int sy, int a4,
 // 69CF94: using guessed type int cel_transparency_active;
 // 69EFA4: using guessed type int draw_monster_num;
 
-//----- (00453ED9) --------------------------------------------------------
 void __fastcall DrawClippedMonster(int x, int y, int a3, int a4, int mon_id, int a6, int a7)
 {
 	int v7; // eax
@@ -1239,7 +1227,6 @@ void __fastcall DrawClippedMonster(int x, int y, int a3, int a4, int mon_id, int
 }
 // 69BEF8: using guessed type int light_table_index;
 
-//----- (00453FCC) --------------------------------------------------------
 void __fastcall DrawClippedObject(int x, int y, int a3, int a4, int pre_flag, int a6, int dir)
 {
 	int v7; // edi
@@ -1306,7 +1293,6 @@ void __fastcall DrawClippedObject(int x, int y, int a3, int a4, int pre_flag, in
 }
 // 4B8CC1: using guessed type char pcursobj;
 
-//----- (004540E5) --------------------------------------------------------
 void __fastcall scrollrt_draw_clipped_e_flag(char *buffer, int x, int y, int a4, int a5)
 {
 	int v5; // eax
@@ -1379,7 +1365,6 @@ void __fastcall scrollrt_draw_clipped_e_flag(char *buffer, int x, int y, int a4,
 // 69CF94: using guessed type int cel_transparency_active;
 // 69CF98: using guessed type int level_piece_id;
 
-//----- (00454229) --------------------------------------------------------
 void __fastcall scrollrt_draw_lower_2(int x, int y, int sx, int sy, int a5, int a6, int some_flag)
 {
 	signed int v7; // ebx
@@ -1585,7 +1570,6 @@ void __fastcall scrollrt_draw_lower_2(int x, int y, int sx, int sy, int a5, int
 // 69CF94: using guessed type int cel_transparency_active;
 // 69CF98: using guessed type int level_piece_id;
 
-//----- (004545D2) --------------------------------------------------------
 void __fastcall scrollrt_draw_clipped_dungeon_2(char *buffer, int x, int y, int a4, int a5, int sx, int sy, int me_flag)
 {
 	int v8; // eax
@@ -1865,7 +1849,6 @@ void __fastcall scrollrt_draw_clipped_dungeon_2(char *buffer, int x, int y, int
 // 69CF94: using guessed type int cel_transparency_active;
 // 69EFA4: using guessed type int draw_monster_num;
 
-//----- (00454C09) --------------------------------------------------------
 void __fastcall scrollrt_draw_clipped_e_flag_2(char *buffer, int x, int y, int a4, signed int a5, int sx, int sy)
 {
 	int v7; // eax
@@ -1963,7 +1946,6 @@ LABEL_22:
 // 69CF94: using guessed type int cel_transparency_active;
 // 69CF98: using guessed type int level_piece_id;
 
-//----- (00454D9D) --------------------------------------------------------
 void __fastcall scrollrt_draw_upper(int x, int y, int sx, int sy, int a5, int a6, int some_flag)
 {
 	int v7; // edi
@@ -2198,7 +2180,6 @@ void __fastcall scrollrt_draw_upper(int x, int y, int sx, int sy, int a5, int a6
 // 69CF94: using guessed type int cel_transparency_active;
 // 69CF98: using guessed type int level_piece_id;
 
-//----- (00455217) --------------------------------------------------------
 void __fastcall scrollrt_draw_dungeon(char *buffer, int x, int y, int a4, int a5, int sx, int sy, int me_flag)
 {
 	int v8; // eax
@@ -2468,7 +2449,6 @@ void __fastcall scrollrt_draw_dungeon(char *buffer, int x, int y, int a4, int a5
 // 69CF94: using guessed type int cel_transparency_active;
 // 69EFA4: using guessed type int draw_monster_num;
 
-//----- (00455844) --------------------------------------------------------
 void __fastcall DrawMonster(int x, int y, int a3, int a4, int mon_id, int a6, int a7)
 {
 	int v7; // eax
@@ -2522,7 +2502,6 @@ void __fastcall DrawMonster(int x, int y, int a3, int a4, int mon_id, int a6, in
 }
 // 69BEF8: using guessed type int light_table_index;
 
-//----- (00455937) --------------------------------------------------------
 void __fastcall DrawObject(int x, int y, int a3, int a4, int pre_flag, int a6, int dir)
 {
 	int v7; // edi
@@ -2597,7 +2576,6 @@ void __fastcall DrawObject(int x, int y, int a3, int a4, int pre_flag, int a6, i
 }
 // 4B8CC1: using guessed type char pcursobj;
 
-//----- (00455A7D) --------------------------------------------------------
 void __fastcall scrollrt_draw_e_flag(char *buffer, int x, int y, int a4, int a5, int sx, int sy)
 {
 	int v7; // eax
@@ -2676,7 +2654,6 @@ void __fastcall scrollrt_draw_e_flag(char *buffer, int x, int y, int a4, int a5,
 // 69CF94: using guessed type int cel_transparency_active;
 // 69CF98: using guessed type int level_piece_id;
 
-//----- (00455BD4) --------------------------------------------------------
 void __fastcall DrawZoom(int x, int y)
 {
 	int v2; // edi
@@ -2847,7 +2824,6 @@ LABEL_24:
 // 69CF0C: using guessed type int screen_buf_end;
 // 69CF20: using guessed type char arch_draw_type;
 
-//----- (00455E32) --------------------------------------------------------
 void __cdecl ClearScreenBuffer()
 {
 	int i; // edx
@@ -2982,7 +2958,6 @@ void __cdecl EnableFrameCount()
 }
 #endif
 
-//----- (00455E65) --------------------------------------------------------
 void __fastcall scrollrt_draw_game_screen(bool draw_cursor)
 {
 	int dwHgt; // edi
@@ -3012,7 +2987,6 @@ void __fastcall scrollrt_draw_game_screen(bool draw_cursor)
 }
 // 52571C: using guessed type int drawpanflag;
 
-//----- (00455EC7) --------------------------------------------------------
 void __cdecl scrollrt_draw_cursor_back_buffer()
 {
 	int v0; // edx
@@ -3052,7 +3026,6 @@ void __cdecl scrollrt_draw_cursor_back_buffer()
 	}
 }
 
-//----- (00455F56) --------------------------------------------------------
 void __cdecl scrollrt_draw_cursor_item()
 {
 	int v0; // ebp
@@ -3156,7 +3129,6 @@ void __cdecl scrollrt_draw_cursor_item()
 // 4B8C9C: using guessed type int cursH;
 // 69CF0C: using guessed type int screen_buf_end;
 
-//----- (00456124) --------------------------------------------------------
 void __fastcall DrawMain(int dwHgt, int draw_desc, int draw_hp, int draw_mana, int draw_sbar, int draw_btn)
 {
 	signed int v6; // ebp
@@ -3288,7 +3260,6 @@ void __cdecl DrawFPS()
 }
 #endif
 
-//----- (004563B3) --------------------------------------------------------
 void __fastcall DoBlitScreen(int dwX, int dwY, int dwWdt, int dwHgt)
 {
 	int v4; // esi
@@ -3357,7 +3328,6 @@ void __fastcall DoBlitScreen(int dwX, int dwY, int dwWdt, int dwHgt)
 	}
 }
 
-//----- (004564F9) --------------------------------------------------------
 void __cdecl DrawAndBlit()
 {
 	bool ddsdesc; // ebp
diff --git a/Source/scrollrt.h b/Source/scrollrt.h
index abf95d0..3d89bf7 100644
--- a/Source/scrollrt.h
+++ b/Source/scrollrt.h
@@ -1,6 +1,7 @@
 //HEADER_GOES_HERE
+#ifndef __SCROLLRT_H__
+#define __SCROLLRT_H__
 
-//scrollrt
 extern int light_table_index; // weak
 extern int screen_y_times_768[1024];
 extern int scrollrt_cpp_init_value; // weak
@@ -69,3 +70,5 @@ extern int scrollrt_inf; // weak
 /* used in 1.00 debug */
 extern char *szMonModeAssert[18];
 extern char *szPlrModeAssert[12];
+
+#endif /* __SCROLLRT_H__ */
diff --git a/Source/setmaps.cpp b/Source/setmaps.cpp
index fb8bae2..88870c1 100644
--- a/Source/setmaps.cpp
+++ b/Source/setmaps.cpp
@@ -47,7 +47,6 @@ char *quest_level_names[] =
   "Archbishop Lazarus' Lair"
 };
 
-//----- (00456625) --------------------------------------------------------
 int __fastcall ObjIndex(int x, int y)
 {
 	int i; // edi
@@ -70,7 +69,6 @@ int __fastcall ObjIndex(int x, int y)
 	return -1;
 }
 
-//----- (0045666B) --------------------------------------------------------
 void __cdecl AddSKingObjs()
 {
 	SetObjMapRange(ObjIndex(64, 34), 20, 7, 23, 10, 1);
@@ -81,14 +79,12 @@ void __cdecl AddSKingObjs()
 	SetObjMapRange(ObjIndex(27, 53), 8, 1, 15, 11, 3);
 }
 
-//----- (0045671A) --------------------------------------------------------
 void __cdecl AddSChamObjs()
 {
 	SetObjMapRange(ObjIndex(37, 30), 17, 0, 21, 5, 1);
 	SetObjMapRange(ObjIndex(37, 46), 13, 0, 16, 5, 2);
 }
 
-//----- (00456755) --------------------------------------------------------
 void __cdecl AddVileObjs()
 {
 	SetObjMapRange(ObjIndex(26, 45), 1, 1, 9, 10, 1);
@@ -96,7 +92,6 @@ void __cdecl AddVileObjs()
 	SetObjMapRange(ObjIndex(35, 36), 7, 11, 13, 18, 3);
 }
 
-//----- (004567AD) --------------------------------------------------------
 void __fastcall DRLG_SetMapTrans(char *sFileName)
 {
 	unsigned char *pLevelMap; // ecx
@@ -144,7 +139,6 @@ void __fastcall DRLG_SetMapTrans(char *sFileName)
 	mem_free_dbg(pLevelMap);
 }
 
-//----- (00456819) --------------------------------------------------------
 void __cdecl LoadSetMap()
 {
 	switch ( setlvlnum )
diff --git a/Source/setmaps.h b/Source/setmaps.h
index 84c51c9..1de8b87 100644
--- a/Source/setmaps.h
+++ b/Source/setmaps.h
@@ -1,4 +1,6 @@
 //HEADER_GOES_HERE
+#ifndef __SETMAPS_H__
+#define __SETMAPS_H__
 
 int __fastcall ObjIndex(int x, int y);
 void __cdecl AddSKingObjs();
@@ -9,4 +11,6 @@ void __cdecl LoadSetMap();
 
 /* rdata */
 extern RECT8 QSRects[32];
-extern char *quest_level_names[];
\ No newline at end of file
+extern char *quest_level_names[];
+
+#endif /* __SETMAPS_H__ */
diff --git a/Source/sha.cpp b/Source/sha.cpp
index f360d67..c852e9b 100644
--- a/Source/sha.cpp
+++ b/Source/sha.cpp
@@ -4,13 +4,11 @@
 
 SHA1Context sgSHA1[3];
 
-//----- (00456A16) --------------------------------------------------------
 void __cdecl SHA1Clear()
 {
 	memset(sgSHA1, 0, 0x114u);
 }
 
-//----- (00456A2B) --------------------------------------------------------
 void __fastcall SHA1Result(int n, char Message_Digest[SHA1HashSize])
 {
 	char *v2; // eax
@@ -35,7 +33,6 @@ void __fastcall SHA1Result(int n, char Message_Digest[SHA1HashSize])
 	}
 }
 
-//----- (00456A4D) --------------------------------------------------------
 void __fastcall SHA1Calculate(int n, const char *data, char Message_Digest[SHA1HashSize])
 {
 	int v3; // esi
@@ -46,7 +43,6 @@ void __fastcall SHA1Calculate(int n, const char *data, char Message_Digest[SHA1H
 		SHA1Result(v3, (char *)Message_Digest);
 }
 
-//----- (00456A73) --------------------------------------------------------
 void __fastcall SHA1Input(SHA1Context *context, const char *message_array, int len)
 {
 	SHA1Context *v3; // esi
@@ -77,7 +73,6 @@ void __fastcall SHA1Input(SHA1Context *context, const char *message_array, int l
 	}
 }
 
-//----- (00456AC4) --------------------------------------------------------
 void __fastcall SHA1ProcessMessageBlock(SHA1Context *context)
 {
 	int i; // [esp+158h] [ebp-4h]
@@ -145,7 +140,6 @@ void __fastcall SHA1ProcessMessageBlock(SHA1Context *context)
 	context->state[4] += E;
 }
 
-//----- (00456C82) --------------------------------------------------------
 void __fastcall SHA1Reset(int n)
 {
 	sgSHA1[n].count[0] = 0;
diff --git a/Source/sha.h b/Source/sha.h
index bfa96ea..06c2375 100644
--- a/Source/sha.h
+++ b/Source/sha.h
@@ -1,4 +1,6 @@
 //HEADER_GOES_HERE
+#ifndef __SHA_H__
+#define __SHA_H__
 
 /*
  *  Define the SHA1 circular left shift macro
@@ -16,3 +18,5 @@ void __fastcall SHA1Calculate(int n, const char *data, char Message_Digest[SHA1H
 void __fastcall SHA1Input(SHA1Context *context, const char *message_array, int len);
 void __fastcall SHA1ProcessMessageBlock(SHA1Context *context);
 void __fastcall SHA1Reset(int n);
+
+#endif /* __SHA_H__ */
diff --git a/Source/sound.cpp b/Source/sound.cpp
index 9283d35..814f38a 100644
--- a/Source/sound.cpp
+++ b/Source/sound.cpp
@@ -31,7 +31,6 @@ char *sgszMusicTracks[6] =
 };
 RECT8 QSRect[2] = { { { 15, -16 }, { 15, -16 } }, { { 30, -31 }, { 30, -31 } } }; /* psx version? */
 
-//----- (00456CC0) --------------------------------------------------------
 struct sound_cpp_init
 {
 	sound_cpp_init()
@@ -41,7 +40,6 @@ struct sound_cpp_init
 } _sound_cpp_init;
 // 47F24C: using guessed type int sound_inf;
 
-//----- (00456CCB) --------------------------------------------------------
 void __fastcall snd_update(bool bStopAll)
 {
 	BOOL v1; // edi
@@ -65,7 +63,6 @@ void __fastcall snd_update(bool bStopAll)
 	while ( v2 < 8 );
 }
 
-//----- (00456D22) --------------------------------------------------------
 void __fastcall snd_stop_snd(TSnd *pSnd)
 {
 	IDirectSoundBuffer *v1; // eax
@@ -78,7 +75,6 @@ void __fastcall snd_stop_snd(TSnd *pSnd)
 	}
 }
 
-//----- (00456D34) --------------------------------------------------------
 bool __fastcall snd_playing(TSnd *pSnd)
 {
 	IDirectSoundBuffer *v1; // eax
@@ -99,7 +95,6 @@ bool __fastcall snd_playing(TSnd *pSnd)
 	return result;
 }
 
-//----- (00456D60) --------------------------------------------------------
 void __fastcall snd_play_snd(TSnd *pSnd, int lVolume, int lPan)
 {
 	TSnd *v3; // edi
@@ -162,7 +157,6 @@ void __fastcall snd_play_snd(TSnd *pSnd, int lVolume, int lPan)
 }
 // 4A22D5: using guessed type char gbSoundOn;
 
-//----- (00456E39) --------------------------------------------------------
 IDirectSoundBuffer *__fastcall sound_dup_channel(IDirectSoundBuffer *DSB)
 {
 	IDirectSoundBuffer *result; // eax
@@ -188,7 +182,6 @@ IDirectSoundBuffer *__fastcall sound_dup_channel(IDirectSoundBuffer *DSB)
 }
 // 4A22D6: using guessed type char gbDupSounds;
 
-//----- (00456E74) --------------------------------------------------------
 bool __fastcall sound_file_reload(TSnd *sound_file, IDirectSoundBuffer *DSB)
 {
 	IDirectSoundBuffer *v2; // edi
@@ -219,7 +212,6 @@ bool __fastcall sound_file_reload(TSnd *sound_file, IDirectSoundBuffer *DSB)
 	return v8;
 }
 
-//----- (00456F07) --------------------------------------------------------
 TSnd *__fastcall sound_file_load(char *path)
 {
 //	int v1; // esi
@@ -261,7 +253,6 @@ TSnd *__fastcall sound_file_load(char *path)
 }
 // 456F07: could not find valid save-restore pair for esi
 
-//----- (00457003) --------------------------------------------------------
 void __fastcall sound_CreateSoundBuffer(TSnd *sound_file)
 {
 	TSnd *v1; // esi
@@ -279,7 +270,6 @@ void __fastcall sound_CreateSoundBuffer(TSnd *sound_file)
 		DSErrDlg(v2, 282, "C:\\Src\\Diablo\\Source\\SOUND.CPP");
 }
 
-//----- (00457060) --------------------------------------------------------
 void __fastcall sound_file_cleanup(TSnd *sound_file)
 {
 	TSnd *v1; // esi
@@ -299,7 +289,6 @@ void __fastcall sound_file_cleanup(TSnd *sound_file)
 	}
 }
 
-//----- (0045708B) --------------------------------------------------------
 void __fastcall snd_init(HWND hWnd)
 {
 	sound_load_volume("Sound Volume", &sglSoundVolume);
@@ -317,7 +306,6 @@ void __fastcall snd_init(HWND hWnd)
 // 4A22D4: using guessed type char gbMusicOn;
 // 4A22D5: using guessed type char gbSoundOn;
 
-//----- (0045712B) --------------------------------------------------------
 void __fastcall sound_load_volume(char *value_name, int *value)
 {
 	int *v2; // esi
@@ -345,7 +333,6 @@ void __fastcall sound_load_volume(char *value_name, int *value)
 	*v2 -= *v2 % 100;
 }
 
-//----- (0045717C) --------------------------------------------------------
 void __fastcall sound_create_primary_buffer(int music_track)
 {
 	int v1; // eax
@@ -387,7 +374,6 @@ void __fastcall sound_create_primary_buffer(int music_track)
 }
 // 69F100: using guessed type int sglpDSB;
 
-//----- (0045727E) --------------------------------------------------------
 int __fastcall sound_DirectSoundCreate(GUID *guid, IDirectSound **DS, int always_null)
 {
 	IDirectSound **v3; // ebp
@@ -416,7 +402,6 @@ int __fastcall sound_DirectSoundCreate(GUID *guid, IDirectSound **DS, int always
 	return ((int (__stdcall *)(GUID *, IDirectSound **, int))v5)(v8, v3, always_null);
 }
 
-//----- (004572FF) --------------------------------------------------------
 void __cdecl sound_cleanup()
 {
 	snd_update(1);
@@ -435,13 +420,11 @@ void __cdecl sound_cleanup()
 	}
 }
 
-//----- (00457358) --------------------------------------------------------
 void __fastcall sound_store_volume(char *key, int value)
 {
 	SRegSaveValue("Diablo", key, 0, value);
 }
 
-//----- (00457367) --------------------------------------------------------
 void __cdecl music_stop()
 {
 	if ( sgpMusicTrack )
@@ -453,7 +436,6 @@ void __cdecl music_stop()
 	}
 }
 
-//----- (00457393) --------------------------------------------------------
 void __fastcall music_start(int nTrack)
 {
 	//int v1; // esi
@@ -480,7 +462,6 @@ void __fastcall music_start(int nTrack)
 }
 // 4A22D4: using guessed type char gbMusicOn;
 
-//----- (004573FE) --------------------------------------------------------
 void __fastcall sound_disable_music(bool disable)
 {
 	if ( disable )
@@ -493,7 +474,6 @@ void __fastcall sound_disable_music(bool disable)
 	}
 }
 
-//----- (00457418) --------------------------------------------------------
 int __fastcall sound_get_or_set_music_volume(int volume)
 {
 	if ( volume != 1 )
@@ -505,7 +485,6 @@ int __fastcall sound_get_or_set_music_volume(int volume)
 	return sglMusicVolume;
 }
 
-//----- (0045743B) --------------------------------------------------------
 int __fastcall sound_get_or_set_sound_volume(int volume)
 {
 	int result; // eax
diff --git a/Source/sound.h b/Source/sound.h
index 27df9e2..7d43205 100644
--- a/Source/sound.h
+++ b/Source/sound.h
@@ -1,6 +1,7 @@
 //HEADER_GOES_HERE
+#ifndef __SOUND_H__
+#define __SOUND_H__
 
-//sound
 extern float sound_cpp_init_value;
 extern IDirectSoundBuffer *DSBs[8];
 extern IDirectSound *sglpDS;
@@ -44,4 +45,6 @@ extern char gbSoundOn; // weak
 extern char gbDupSounds; // weak
 extern int sgnMusicTrack;
 extern char *sgszMusicTracks[6];
-extern RECT8 QSRect[2]; /* psx version? */
\ No newline at end of file
+extern RECT8 QSRect[2]; /* psx version? */
+
+#endif /* __SOUND_H__ */
diff --git a/Source/spells.cpp b/Source/spells.cpp
index d7982ec..a9423f6 100644
--- a/Source/spells.cpp
+++ b/Source/spells.cpp
@@ -43,7 +43,6 @@ SpellData spelldata[37] =
 	{ SPL_BONESPIRIT,  24,  STYPE_MAGIC,	 "Bone Spirit",	 NULL,			 9,  7,  0, 0, 34,  IS_CAST2, { MIS_BONESPIRIT,  0,		  0 }, 1, 12,  20, 60, 11500, 800 }
 };
 
-//----- (0045744E) --------------------------------------------------------
 int __fastcall GetManaAmount(int id, int sn)
 {
 	int v2; // eax
@@ -90,7 +89,6 @@ int __fastcall GetManaAmount(int id, int sn)
 	return v8 * (100 - plr[v2]._pISplCost) / 100;
 }
 
-//----- (0045753A) --------------------------------------------------------
 void __fastcall UseMana(int id, int sn)
 {
 	int v2; // esi
@@ -124,7 +122,6 @@ void __fastcall UseMana(int id, int sn)
 	}
 }
 
-//----- (00457584) --------------------------------------------------------
 bool __fastcall CheckSpell(int id, int sn, char st, bool manaonly)
 {
 	bool result; // al
@@ -149,7 +146,6 @@ bool __fastcall CheckSpell(int id, int sn, char st, bool manaonly)
 	return result;
 }
 
-//----- (004575D5) --------------------------------------------------------
 void __fastcall CastSpell(int id, int spl, int sx, int sy, int dx, int dy, int caster, int spllvl)
 {
 	int v8; // eax
@@ -206,7 +202,6 @@ LABEL_7:
 	}
 }
 
-//----- (004576B1) --------------------------------------------------------
 void __fastcall DoResurrect(int pnum, int rid)
 {
 	int v2; // ebx
@@ -254,7 +249,6 @@ void __fastcall DoResurrect(int pnum, int rid)
 	}
 }
 
-//----- (004577CB) --------------------------------------------------------
 void __fastcall PlacePlayer(int pnum)
 {
 	int v1; // ebx
@@ -330,7 +324,6 @@ void __fastcall PlacePlayer(int pnum)
 	}
 }
 
-//----- (004578EE) --------------------------------------------------------
 void __fastcall DoHealOther(int pnum, int rid)
 {
 	int v2; // ebx
diff --git a/Source/spells.h b/Source/spells.h
index 65b0596..ba912f8 100644
--- a/Source/spells.h
+++ b/Source/spells.h
@@ -1,4 +1,6 @@
 //HEADER_GOES_HERE
+#ifndef __SPELLS_H__
+#define __SPELLS_H__
 
 int __fastcall GetManaAmount(int id, int sn);
 void __fastcall UseMana(int id, int sn);
@@ -11,3 +13,5 @@ void __fastcall DoHealOther(int pnum, int rid);
 /* rdata */
 
 extern SpellData spelldata[37];
+
+#endif /* __SPELLS_H__ */