diff --git a/Source/control.cpp b/Source/control.cpp
index 74a42e1fe..dfd17db13 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -1761,6 +1761,57 @@ BOOL control_WriteStringToBuffer(BYTE *str)
 	return TRUE;
 }
 
+static void CPrintString(int y, const char *str, BOOL center, int lines)
+{
+	BYTE c;
+	const char *tmp;
+	int strWidth, lineOffset, lineStart;
+
+	lineOffset = 0;
+	lineStart = lineOffsets[lines][y] + PANEL_LEFT;
+	if (center == TRUE) {
+		strWidth = 0;
+		tmp = str;
+		while (*tmp) {
+			c = gbFontTransTbl[(BYTE)*tmp++];
+			strWidth += fontkern[fontframe[c]] + 2;
+		}
+		if (strWidth < 288)
+			lineOffset = (288 - strWidth) >> 1;
+		lineStart += lineOffset;
+	}
+	while (*str) {
+		c = gbFontTransTbl[(BYTE)*str++];
+		c = fontframe[c];
+		lineOffset += fontkern[c] + 2;
+		if (c) {
+			if (lineOffset < 288) {
+				PrintChar(lineStart, c, infoclr);
+			}
+		}
+		lineStart += fontkern[c] + 2;
+	}
+}
+
+static void PrintInfo()
+{
+	int yo, lo, i;
+
+	if (!talkflag) {
+		yo = 0;
+		lo = 1;
+		if (infostr[0] != '\0') {
+			CPrintString(0, infostr, TRUE, pnumlines);
+			yo = 1;
+			lo = 0;
+		}
+
+		for (i = 0; i < pnumlines; i++) {
+			CPrintString(i + yo, panelstr[i], pstrjust[i], pnumlines - lo);
+		}
+	}
+}
+
 /**
  * Sets a string to be drawn in the info box and then draws it.
  */
@@ -1832,54 +1883,36 @@ void DrawInfoBox()
 		PrintInfo();
 }
 
-void PrintInfo()
-{
-	int yo, lo, i;
-
-	if (!talkflag) {
-		yo = 0;
-		lo = 1;
-		if (infostr[0] != '\0') {
-			CPrintString(0, infostr, TRUE, pnumlines);
-			yo = 1;
-			lo = 0;
-		}
-
-		for (i = 0; i < pnumlines; i++) {
-			CPrintString(i + yo, panelstr[i], pstrjust[i], pnumlines - lo);
-		}
-	}
-}
-
-void CPrintString(int y, const char *str, BOOL center, int lines)
+/**
+ * @brief Identical to MY_PlrStringXY(x, y, width, pszStr, col, 1)
+ */
+static void ADD_PlrStringXY(int x, int y, int width, const char *pszStr, char col)
 {
 	BYTE c;
 	const char *tmp;
-	int strWidth, lineOffset, lineStart;
+	int nOffset, screen_x, line, widthOffset;
 
-	lineOffset = 0;
-	lineStart = lineOffsets[lines][y] + PANEL_LEFT;
-	if (center == TRUE) {
-		strWidth = 0;
-		tmp = str;
-		while (*tmp) {
-			c = gbFontTransTbl[(BYTE)*tmp++];
-			strWidth += fontkern[fontframe[c]] + 2;
-		}
-		if (strWidth < 288)
-			lineOffset = (288 - strWidth) >> 1;
-		lineStart += lineOffset;
+	nOffset = x + PitchTbl[y + SCREEN_Y] + SCREEN_X;
+	widthOffset = width - x + 1;
+	line = 0;
+	screen_x = 0;
+	tmp = pszStr;
+	while (*tmp) {
+		c = gbFontTransTbl[(BYTE)*tmp++];
+		screen_x += fontkern[fontframe[c]] + 1;
 	}
-	while (*str) {
-		c = gbFontTransTbl[(BYTE)*str++];
+	if (screen_x < widthOffset)
+		line = (widthOffset - screen_x) >> 1;
+	nOffset += line;
+	while (*pszStr) {
+		c = gbFontTransTbl[(BYTE)*pszStr++];
 		c = fontframe[c];
-		lineOffset += fontkern[c] + 2;
+		line += fontkern[c] + 1;
 		if (c) {
-			if (lineOffset < 288) {
-				PrintChar(lineStart, c, infoclr);
-			}
+			if (line < widthOffset)
+				PrintChar(nOffset, c, col);
 		}
-		lineStart += fontkern[c] + 2;
+		nOffset += fontkern[c] + 1;
 	}
 }
 
@@ -1897,6 +1930,45 @@ void PrintGameStr(int x, int y, const char *str, int color)
 	}
 }
 
+/**
+ * @brief Render text string to back buffer
+ * @param x Screen coordinate
+ * @param y Screen coordinate
+ * @param endX End of line in screen coordinate
+ * @param pszStr String to print, in Windows-1252 encoding
+ * @param col text_color color value
+ * @param base Letter spacing
+ */
+static void MY_PlrStringXY(int x, int y, int endX, const char *pszStr, char col, int base)
+{
+	BYTE c;
+	const char *tmp;
+	int nOffset, screen_x, line, widthOffset;
+
+	nOffset = x + PitchTbl[y + SCREEN_Y] + SCREEN_X;
+	widthOffset = endX - x + 1;
+	line = 0;
+	screen_x = 0;
+	tmp = pszStr;
+	while (*tmp) {
+		c = gbFontTransTbl[(BYTE)*tmp++];
+		screen_x += fontkern[fontframe[c]] + base;
+	}
+	if (screen_x < widthOffset)
+		line = (widthOffset - screen_x) >> 1;
+	nOffset += line;
+	while (*pszStr) {
+		c = gbFontTransTbl[(BYTE)*pszStr++];
+		c = fontframe[c];
+		line += fontkern[c] + base;
+		if (c) {
+			if (line < widthOffset)
+				PrintChar(nOffset, c, col);
+		}
+		nOffset += fontkern[c] + base;
+	}
+}
+
 void DrawChr()
 {
 	char col;
@@ -2121,78 +2193,6 @@ void DrawChr()
 	ADD_PlrStringXY(143, 332, 174, chrstr, col);
 }
 
-/**
- * @brief Identical to MY_PlrStringXY(x, y, width, pszStr, col, 1)
- */
-void ADD_PlrStringXY(int x, int y, int width, const char *pszStr, char col)
-{
-	BYTE c;
-	const char *tmp;
-	int nOffset, screen_x, line, widthOffset;
-
-	nOffset = x + PitchTbl[y + SCREEN_Y] + SCREEN_X;
-	widthOffset = width - x + 1;
-	line = 0;
-	screen_x = 0;
-	tmp = pszStr;
-	while (*tmp) {
-		c = gbFontTransTbl[(BYTE)*tmp++];
-		screen_x += fontkern[fontframe[c]] + 1;
-	}
-	if (screen_x < widthOffset)
-		line = (widthOffset - screen_x) >> 1;
-	nOffset += line;
-	while (*pszStr) {
-		c = gbFontTransTbl[(BYTE)*pszStr++];
-		c = fontframe[c];
-		line += fontkern[c] + 1;
-		if (c) {
-			if (line < widthOffset)
-				PrintChar(nOffset, c, col);
-		}
-		nOffset += fontkern[c] + 1;
-	}
-}
-
-/**
- * @brief Render text string to back buffer
- * @param x Screen coordinate
- * @param y Screen coordinate
- * @param endX End of line in screen coordinate
- * @param pszStr String to print, in Windows-1252 encoding
- * @param col text_color color value
- * @param base Letter spacing
- */
-void MY_PlrStringXY(int x, int y, int endX, const char *pszStr, char col, int base)
-{
-	BYTE c;
-	const char *tmp;
-	int nOffset, screen_x, line, widthOffset;
-
-	nOffset = x + PitchTbl[y + SCREEN_Y] + SCREEN_X;
-	widthOffset = endX - x + 1;
-	line = 0;
-	screen_x = 0;
-	tmp = pszStr;
-	while (*tmp) {
-		c = gbFontTransTbl[(BYTE)*tmp++];
-		screen_x += fontkern[fontframe[c]] + base;
-	}
-	if (screen_x < widthOffset)
-		line = (widthOffset - screen_x) >> 1;
-	nOffset += line;
-	while (*pszStr) {
-		c = gbFontTransTbl[(BYTE)*pszStr++];
-		c = fontframe[c];
-		line += fontkern[c] + base;
-		if (c) {
-			if (line < widthOffset)
-				PrintChar(nOffset, c, col);
-		}
-		nOffset += fontkern[c] + base;
-	}
-}
-
 void CheckLvlBtn()
 {
 	if (!lvlbtndown && MouseX >= 40 + PANEL_LEFT && MouseX <= 81 + PANEL_LEFT && MouseY >= -39 + PANEL_TOP && MouseY <= -17 + PANEL_TOP)
@@ -2292,26 +2292,7 @@ void ReleaseChrBtns()
 	}
 }
 
-void DrawDurIcon()
-{
-	PlayerStruct *p;
-	int x;
-
-	if ((chrflag || questlog) && (invflag || sbookflag))
-		return;
-
-	x = PANEL_X + PANEL_WIDTH - 32 - 16;
-	if (invflag || sbookflag)
-		x -= SPANEL_WIDTH;
-
-	p = &plr[myplr];
-	x = DrawDurIcon4Item(&p->InvBody[INVLOC_HEAD], x, 4);
-	x = DrawDurIcon4Item(&p->InvBody[INVLOC_CHEST], x, 3);
-	x = DrawDurIcon4Item(&p->InvBody[INVLOC_HAND_LEFT], x, 0);
-	DrawDurIcon4Item(&p->InvBody[INVLOC_HAND_RIGHT], x, 0);
-}
-
-int DrawDurIcon4Item(ItemStruct *pItem, int x, int c)
+static int DrawDurIcon4Item(ItemStruct *pItem, int x, int c)
 {
 	if (pItem->_itype == ITYPE_NONE)
 		return x;
@@ -2346,6 +2327,25 @@ int DrawDurIcon4Item(ItemStruct *pItem, int x, int c)
 	return x - 32 - 8;
 }
 
+void DrawDurIcon()
+{
+	PlayerStruct *p;
+	int x;
+
+	if ((chrflag || questlog) && (invflag || sbookflag))
+		return;
+
+	x = PANEL_X + PANEL_WIDTH - 32 - 16;
+	if (invflag || sbookflag)
+		x -= SPANEL_WIDTH;
+
+	p = &plr[myplr];
+	x = DrawDurIcon4Item(&p->InvBody[INVLOC_HEAD], x, 4);
+	x = DrawDurIcon4Item(&p->InvBody[INVLOC_CHEST], x, 3);
+	x = DrawDurIcon4Item(&p->InvBody[INVLOC_HAND_LEFT], x, 0);
+	DrawDurIcon4Item(&p->InvBody[INVLOC_HAND_RIGHT], x, 0);
+}
+
 void RedBack()
 {
 	int idx;
@@ -2422,6 +2422,37 @@ void RedBack()
 #endif
 }
 
+static void PrintSBookStr(int x, int y, BOOL cjustflag, const char *pszStr, char col)
+{
+	BYTE c;
+	const char *tmp;
+	int screen_x, line, width;
+
+	width = PitchTbl[y] + x + RIGHT_PANEL_X + SPLICONLENGTH;
+	line = 0;
+	if (cjustflag) {
+		screen_x = 0;
+		tmp = pszStr;
+		while (*tmp) {
+			c = gbFontTransTbl[(BYTE)*tmp++];
+			screen_x += fontkern[fontframe[c]] + 1;
+		}
+		if (screen_x < 222)
+			line = (222 - screen_x) >> 1;
+		width += line;
+	}
+	while (*pszStr) {
+		c = gbFontTransTbl[(BYTE)*pszStr++];
+		c = fontframe[c];
+		line += fontkern[c] + 1;
+		if (c) {
+			if (line <= 222)
+				PrintChar(width, c, col);
+		}
+		width += fontkern[c] + 1;
+	}
+}
+
 char GetSBookTrans(int ii, BOOL townok)
 {
 	char st;
@@ -2520,37 +2551,6 @@ void DrawSpellBook()
 	}
 }
 
-void PrintSBookStr(int x, int y, BOOL cjustflag, const char *pszStr, char col)
-{
-	BYTE c;
-	const char *tmp;
-	int screen_x, line, width;
-
-	width = PitchTbl[y] + x + RIGHT_PANEL_X + SPLICONLENGTH;
-	line = 0;
-	if (cjustflag) {
-		screen_x = 0;
-		tmp = pszStr;
-		while (*tmp) {
-			c = gbFontTransTbl[(BYTE)*tmp++];
-			screen_x += fontkern[fontframe[c]] + 1;
-		}
-		if (screen_x < 222)
-			line = (222 - screen_x) >> 1;
-		width += line;
-	}
-	while (*pszStr) {
-		c = gbFontTransTbl[(BYTE)*pszStr++];
-		c = fontframe[c];
-		line += fontkern[c] + 1;
-		if (c) {
-			if (line <= 222)
-				PrintChar(width, c, col);
-		}
-		width += fontkern[c] + 1;
-	}
-}
-
 void CheckSBook()
 {
 	int sn;
@@ -2698,6 +2698,31 @@ void control_set_gold_curs(int pnum)
 	NewCursor(plr[pnum].HoldItem._iCurs + CURSOR_FIRSTITEM);
 }
 
+static char *control_print_talk_msg(char *msg, int x, int y, int *nOffset, int color)
+{
+	BYTE c;
+	int width;
+
+	x += 200 + SCREEN_X;
+	y += 22 + PANEL_Y;
+	width = x;
+	*nOffset = PitchTbl[y] + x;
+	while (*msg) {
+
+		c = gbFontTransTbl[(BYTE)*msg];
+		c = fontframe[c];
+		width += fontkern[c] + 1;
+		if (width > 450 + PANEL_X)
+			return msg;
+		msg++;
+		if (c != 0) {
+			PrintChar(*nOffset, c, color);
+		}
+		*nOffset += fontkern[c] + 1;
+	}
+	return NULL;
+}
+
 void DrawTalkPan()
 {
 	int i, off, talk_btn, color, nCel, x;
@@ -2758,31 +2783,6 @@ void DrawTalkPan()
 	}
 }
 
-char *control_print_talk_msg(char *msg, int x, int y, int *nOffset, int color)
-{
-	BYTE c;
-	int width;
-
-	x += 200 + SCREEN_X;
-	y += 22 + PANEL_Y;
-	width = x;
-	*nOffset = PitchTbl[y] + x;
-	while (*msg) {
-
-		c = gbFontTransTbl[(BYTE)*msg];
-		c = fontframe[c];
-		width += fontkern[c] + 1;
-		if (width > 450 + PANEL_X)
-			return msg;
-		msg++;
-		if (c != 0) {
-			PrintChar(*nOffset, c, color);
-		}
-		*nOffset += fontkern[c] + 1;
-	}
-	return NULL;
-}
-
 BOOL control_check_talk_btn()
 {
 	int i;
@@ -2870,6 +2870,46 @@ void control_reset_talk()
 	force_redraw = 255;
 }
 
+static void control_press_enter()
+{
+	int i;
+	BYTE talk_save;
+
+	if (sgszTalkMsg[0] != 0) {
+#ifdef HELLFIRE
+		int pmask;
+		pmask = 0;
+
+		for (i = 0; i < MAX_PLRS; i++) {
+			if (whisper[i])
+				pmask |= 1 << i;
+		}
+		NetSendCmdString(pmask, sgszTalkMsg);
+#else
+		control_reset_talk_msg(sgszTalkMsg);
+#endif
+		for (i = 0; i < 8; i++) {
+			if (!strcmp(sgszTalkSave[i], sgszTalkMsg))
+				break;
+		}
+		if (i >= 8) {
+			strcpy(sgszTalkSave[sgbNextTalkSave], sgszTalkMsg);
+			sgbNextTalkSave++;
+			sgbNextTalkSave &= 7;
+		} else {
+			talk_save = sgbNextTalkSave - 1;
+			talk_save &= 7;
+			if (i != talk_save) {
+				strcpy(sgszTalkSave[i], sgszTalkSave[talk_save]);
+				strcpy(sgszTalkSave[talk_save], sgszTalkMsg);
+			}
+		}
+		sgszTalkMsg[0] = '\0';
+		sgbTalkSavePos = sgbNextTalkSave;
+	}
+	control_reset_talk();
+}
+
 BOOL control_talk_last_key(int vkey)
 {
 	int result;
@@ -2891,6 +2931,19 @@ BOOL control_talk_last_key(int vkey)
 	return TRUE;
 }
 
+static void control_up_down(int v)
+{
+	int i;
+
+	for (i = 0; i < 8; i++) {
+		sgbTalkSavePos = (v + sgbTalkSavePos) & 7;
+		if (sgszTalkSave[sgbTalkSavePos][0]) {
+			strcpy(sgszTalkMsg, sgszTalkSave[sgbTalkSavePos]);
+			return;
+		}
+	}
+}
+
 BOOL control_presskeys(int vkey)
 {
 	int len;
@@ -2923,56 +2976,3 @@ BOOL control_presskeys(int vkey)
 	}
 	return ret;
 }
-
-void control_press_enter()
-{
-	int i;
-	BYTE talk_save;
-
-	if (sgszTalkMsg[0] != 0) {
-#ifdef HELLFIRE
-		int pmask;
-		pmask = 0;
-
-		for (i = 0; i < MAX_PLRS; i++) {
-			if (whisper[i])
-				pmask |= 1 << i;
-		}
-		NetSendCmdString(pmask, sgszTalkMsg);
-#else
-		control_reset_talk_msg(sgszTalkMsg);
-#endif
-		for (i = 0; i < 8; i++) {
-			if (!strcmp(sgszTalkSave[i], sgszTalkMsg))
-				break;
-		}
-		if (i >= 8) {
-			strcpy(sgszTalkSave[sgbNextTalkSave], sgszTalkMsg);
-			sgbNextTalkSave++;
-			sgbNextTalkSave &= 7;
-		} else {
-			talk_save = sgbNextTalkSave - 1;
-			talk_save &= 7;
-			if (i != talk_save) {
-				strcpy(sgszTalkSave[i], sgszTalkSave[talk_save]);
-				strcpy(sgszTalkSave[talk_save], sgszTalkMsg);
-			}
-		}
-		sgszTalkMsg[0] = '\0';
-		sgbTalkSavePos = sgbNextTalkSave;
-	}
-	control_reset_talk();
-}
-
-void control_up_down(int v)
-{
-	int i;
-
-	for (i = 0; i < 8; i++) {
-		sgbTalkSavePos = (v + sgbTalkSavePos) & 7;
-		if (sgszTalkSave[sgbTalkSavePos][0]) {
-			strcpy(sgszTalkMsg, sgszTalkSave[sgbTalkSavePos]);
-			return;
-		}
-	}
-}
diff --git a/Source/control.h b/Source/control.h
index c313d6887..795fa6e2c 100644
--- a/Source/control.h
+++ b/Source/control.h
@@ -6,60 +6,33 @@
 #ifndef __CONTROL_H__
 #define __CONTROL_H__
 
-extern BYTE *pDurIcons;
-extern BYTE *pChrButtons;
 extern BOOL drawhpflag;
 extern BOOL dropGoldFlag;
 extern BOOL panbtn[8];
 extern BOOL chrbtn[4];
-extern BYTE *pMultiBtns;
-extern BYTE *pPanelButtons;
-extern BYTE *pChrPanel;
 extern BOOL lvlbtndown;
 extern int dropGoldValue;
 extern BOOL drawmanaflag;
 extern BOOL chrbtnactive;
-extern BYTE *pPanelText;
-extern int nGoldFrame;
-extern BYTE *pLifeBuff;
-extern BYTE *pBtmBuff;
-extern BYTE *pTalkBtns;
-extern int pstrjust[4];
-extern int pnumlines;
 extern BOOL pinfoflag;
-extern BOOL talkbtndown[3];
 extern int pSpell;
-extern BYTE *pManaBuff;
 extern char infoclr;
-extern BYTE *pGBoxBuff;
-extern BYTE *pSBkBtnCel;
 extern char tempstr[256];
 extern BOOLEAN whisper[MAX_PLRS];
-extern int sbooktab;
 extern int pSplType;
 extern int frame;
 extern int initialDropGoldIndex;
 extern BOOL talkflag;
-extern BYTE *pSBkIconCels;
 extern BOOL sbookflag;
 extern BOOL chrflag;
 extern BOOL drawbtnflag;
-extern BYTE *pSpellBkCel;
 extern char infostr[256];
-extern int numpanbtns;
-extern BYTE *pStatusPanel;
 extern char panelstr[4][64];
 extern BOOL panelflag;
-extern BYTE SplTransTbl[256];
 extern int initialDropGoldValue;
-extern BYTE *pSpellCels;
 extern BOOL panbtndown;
-extern BYTE *pTalkPanel;
 extern BOOL spselflag;
 
-void DrawSpellCel(int xp, int yp, BYTE *Trans, int nCel, int w);
-void SetSpellTrans(char t);
-void DrawSpell();
 void DrawSpellList();
 void SetSpell();
 void SetSpeedSpell(int slot);
@@ -68,9 +41,6 @@ void PrintChar(int nOffset, int nCel, char col);
 void AddPanelString(const char *str, BOOL just);
 void ClearPanel();
 void DrawPanelBox(int x, int y, int w, int h, int sx, int sy);
-void InitPanelStr();
-void SetFlaskHeight(BYTE *pCelBuff, int min, int max, int sx, int sy);
-void DrawFlask(BYTE *pCelBuff, int w, int nSrcOff, BYTE *pBuff, int nDstOff, int h);
 void DrawLifeFlask();
 void UpdateLifeFlask();
 void DrawManaFlask();
@@ -81,7 +51,6 @@ void DrawCtrlPan();
 void DrawCtrlBtns();
 void DoSpeedBook();
 void DoPanBtn();
-void control_set_button_down(int btn_id);
 void control_check_btn_press();
 void DoAutoMap();
 void CheckPanelInfo();
@@ -89,23 +58,16 @@ void CheckBtnUp();
 void FreeControlPan();
 BOOL control_WriteStringToBuffer(BYTE *str);
 void DrawInfoBox();
-void PrintInfo();
-void CPrintString(int y, const char *str, BOOL center, int lines);
 void PrintGameStr(int x, int y, const char *str, int color);
 void DrawChr();
-void ADD_PlrStringXY(int x, int y, int width, const char *pszStr, char col);
-void MY_PlrStringXY(int x, int y, int width, const char *pszStr, char col, int base);
 void CheckLvlBtn();
 void ReleaseLvlBtn();
 void DrawLevelUpIcon();
 void CheckChrBtns();
 void ReleaseChrBtns();
 void DrawDurIcon();
-int DrawDurIcon4Item(ItemStruct *pItem, int x, int c);
 void RedBack();
-char GetSBookTrans(int ii, BOOL townok);
 void DrawSpellBook();
-void PrintSBookStr(int x, int y, BOOL cjustflag, const char *pszStr, char col);
 void CheckSBook();
 const char *get_pieces_str(int nGold);
 void DrawGoldSplit(int amount);
@@ -113,30 +75,16 @@ void control_drop_gold(char vkey);
 void control_remove_gold(int pnum, int gold_index);
 void control_set_gold_curs(int pnum);
 void DrawTalkPan();
-char *control_print_talk_msg(char *msg, int x, int y, int *nOffset, int just);
 BOOL control_check_talk_btn();
 void control_release_talk_btn();
-void control_reset_talk_msg();
 void control_type_message();
 void control_reset_talk();
 BOOL control_talk_last_key(int vkey);
 BOOL control_presskeys(int vkey);
-void control_press_enter();
-void control_up_down(int v);
 
 /* rdata */
 extern const BYTE fontframe[128];
 extern const BYTE fontkern[68];
-extern const int lineOffsets[5][5];
 extern const BYTE gbFontTransTbl[256];
 
-/* data */
-
-extern char SpellITbl[MAX_SPELLS];
-extern int PanBtnPos[8][5];
-extern const char *const PanBtnHotKey[8];
-extern const char *const PanBtnStr[8];
-extern RECT32 ChrBtnsRect[4];
-extern int SpellPages[6][7];
-
 #endif /* __CONTROL_H__ */