diff --git a/plugins/include/amxmodx.inc b/plugins/include/amxmodx.inc
index 33e2d581..940af59d 100755
--- a/plugins/include/amxmodx.inc
+++ b/plugins/include/amxmodx.inc
@@ -1055,3 +1055,6 @@ native arrayset(array[], value, size);
  * The weapon name is case sensitive, and has the weapon_* form.
  */
 native get_weaponid(const name[]);
+
+// Keep this always at the bottom of this file
+#include <message_stocks>
diff --git a/plugins/include/messages.inc b/plugins/include/messages.inc
index 521e066e..0999520c 100644
--- a/plugins/include/messages.inc
+++ b/plugins/include/messages.inc
@@ -11,7 +11,6 @@
 #define _coremsg_included
 
 #include <message_const>
-#include <message_stocks>
 
 /* These functinos are used to generate client messages.
  * You may generate menu, smoke, shockwaves, thunderlights,