diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp
index 0c24ca1bc..cb602fe13 100644
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp
@@ -13,7 +13,7 @@
 #include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h"
 #include "FullTutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
-#include "Minecraft.Client/Common/Potion_Macros.h"
+#include "Minecraft.World/include/Potion_Macros.h"
 
 FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
     : Tutorial(iPad, true) {
diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp
index c892d31aa..f20421d40 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp	
@@ -14,7 +14,7 @@
 #include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h"
 #include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "Minecraft.Client/Common/Potion_Macros.h"
+#include "Minecraft.World/include/Potion_Macros.h"
 #include "java/JavaMath.h"
 #include "4J.Common/4J_InputActions.h"
 
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp
index 080c95a67..b9ac789ee 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp
@@ -85,7 +85,7 @@
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/ConsoleGameMode.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.Client/Common/Potion_Macros.h"
+#include "Minecraft.World/include/Potion_Macros.h"
 #include "Minecraft.Client/Common/Minecraft_Macros.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "4J_Input.h"
diff --git a/minecraft/Minecraft.Client/Common/Potion_Macros.h b/minecraft/Minecraft.World/include/Potion_Macros.h
similarity index 100%
rename from minecraft/Minecraft.Client/Common/Potion_Macros.h
rename to minecraft/Minecraft.World/include/Potion_Macros.h
diff --git a/minecraft/Minecraft.World/include/stdafx.h b/minecraft/Minecraft.World/include/stdafx.h
index 637b23bb7..8f5499d51 100644
--- a/minecraft/Minecraft.World/include/stdafx.h
+++ b/minecraft/Minecraft.World/include/stdafx.h
@@ -7,7 +7,5 @@
 #ifdef _WINDOWS64
 #include "Minecraft.Client/Windows64/Windows64_App.h"
 #else
-// Use the Linux runtime path with supported metadata/config headers only.
 #include "Minecraft.Client/Linux/Linux_App.h"
-// #include "Minecraft.Client/Linux/Stubs/LinuxStubs.h"
 #endif
diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp
index ea8f8e241..3322a8239 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp
@@ -12,7 +12,7 @@
 #include "Minecraft.World/net/minecraft/util/HtmlString.h"
 #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.Client/Common/Potion_Macros.h"
+#include "Minecraft.World/include/Potion_Macros.h"
 #include "nbt/CompoundTag.h"
 #include "nbt/IntTag.h"
 #include "nbt/ListTag.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp
index 0d6e20b37..bce53a6f6 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp
@@ -13,7 +13,7 @@
 #include "Minecraft.World/net/minecraft/SharedConstants.h"
 #include "PotionItem.h"
 #include "Minecraft.World/include/SoundTypes.h"
-#include "Minecraft.Client/Common/Potion_Macros.h"
+#include "Minecraft.World/include/Potion_Macros.h"
 
 const std::wstring PotionItem::DEFAULT_ICON = L"potion";
 const std::wstring PotionItem::THROWABLE_ICON = L"potion_splash";
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp
index 58c190b31..08701a20b 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp
@@ -7,7 +7,7 @@
 #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
 #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
 #include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h"
-#include "Minecraft.Client/Common/Potion_Macros.h"
+#include "Minecraft.World/include/Potion_Macros.h"
 
 int slotsForUp[] = {BrewingStandTileEntity::INGREDIENT_SLOT};
 int slotsForOtherFaces[] = {0, 1, 2};