diff --git a/Laptop/BobbyR.h b/Laptop/BobbyR.h
index 6d0119604..486a9a80a 100644
--- a/Laptop/BobbyR.h
+++ b/Laptop/BobbyR.h
@@ -25,7 +25,6 @@ void RenderBobbyR();
 #define		BOBBYR_GRIDLOC_X		LAPTOP_SCREEN_UL_X + 4
 #define		BOBBYR_GRIDLOC_Y		LAPTOP_SCREEN_WEB_UL_Y + 5	//LAPTOP_SCREEN_WEB_UL_Y + 45
 
-#define		BOBBYR_ORDER_NUM_WIDTH						15
 
 /*
 extern	UINT16	gusFirstGunIndex;
diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp
index 156130047..c8ae1e61e 100644
--- a/Laptop/BobbyRGuns.cpp
+++ b/Laptop/BobbyRGuns.cpp
@@ -87,6 +87,7 @@
 #define		BOBBYR_ITEM_NAME_X								BOBBYR_GRIDLOC_X + 6
 #define		BOBBYR_ITEM_NAME_Y_OFFSET					54
 
+#define		BOBBYR_ORDER_NUM_WIDTH						15
 #define		BOBBYR_ORDER_NUM_X								BOBBYR_GRIDLOC_X + 120 - BOBBYR_ORDER_NUM_WIDTH	//BOBBYR_ITEM_STOCK_TEXT_X
 #define		BOBBYR_ORDER_NUM_Y_OFFSET					1
 
@@ -115,6 +116,8 @@
 #define		BOBBYR_ITEM_QTY_NUM_X							BOBBYR_GRIDLOC_X + 105//BOBBYR_ITEM_COST_TEXT_X + 1
 #define		BOBBYR_ITEM_QTY_NUM_Y							BOBBYR_ITEM_QTY_TEXT_Y//BOBBYR_ITEM_COST_TEXT_Y + 40
 
+#define		BOBBYR_ITEMS_BOUGHT_X							BOBBYR_GRIDLOC_X + 105 - BOBBYR_ORDER_NUM_WIDTH//BOBBYR_ITEM_QTY_NUM_X
+
 #define		BOBBY_RAY_NOT_PURCHASED						255
 #define		BOBBY_RAY_MAX_AMOUNT_OF_ITEMS_TO_PURCHASE		200
 
@@ -2500,7 +2503,11 @@ void DisplayItemNameAndInfo(UINT16 usPosY, UINT16 usIndex, UINT16 usBobbyIndex,
 		if( ubPurchaseNumber != BOBBY_RAY_NOT_PURCHASED)
 		{
 			swprintf(sTemp, L"% 4d", BobbyRayPurchases[ ubPurchaseNumber ].ubNumberPurchased);
-			DrawTextToScreen(sTemp, BOBBYR_ITEMS_BOUGHT_X, (UINT16)usPosY, 0, FONT14ARIAL, BOBBYR_ITEM_DESC_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
+			auto bobbyRItemsBoughtX{ BOBBYR_ITEMS_BOUGHT_X };
+			if (g_lang == i18n::Lang::zh) {
+				bobbyRItemsBoughtX -= 10;
+			}
+			DrawTextToScreen(sTemp, bobbyRItemsBoughtX, (UINT16)usPosY, 0, FONT14ARIAL, BOBBYR_ITEM_DESC_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
 		}
 	}
 
diff --git a/i18n/include/language.hpp b/i18n/include/language.hpp
index e88fbe5a3..bd895bccd 100644
--- a/i18n/include/language.hpp
+++ b/i18n/include/language.hpp
@@ -20,6 +20,4 @@ extern const i18n::Lang g_lang;
 
 extern const int MAX_MESSAGES_ON_MAP_BOTTOM;
 
-extern const int BOBBYR_ITEMS_BOUGHT_X;
-
 auto GetLanguagePrefix() -> const STR;
diff --git a/i18n/language.cpp b/i18n/language.cpp
index 25b0c816e..555b33c2f 100644
--- a/i18n/language.cpp
+++ b/i18n/language.cpp
@@ -1,8 +1,5 @@
 #include <language.hpp>
 
-#include <BobbyR.h>
-#include <laptop.h>
-
 /* FIXME: The ugliest of ugly hacks. Getting rid of this and letting language
  * (ideally text and voice separately) be set in the options menu would be
  * ideal. */
@@ -34,12 +31,6 @@ const int MAX_MESSAGES_ON_MAP_BOTTOM{
 #endif
 };
 
-const int BOBBYR_ITEMS_BOUGHT_X{BOBBYR_GRIDLOC_X + 105 - BOBBYR_ORDER_NUM_WIDTH
-#ifdef CHINESE
-  - 10
-#endif
-};
-
 auto GetLanguagePrefix() -> const STR {
   return
 #if defined(ENGLISH)