diff --git a/code/game/bg_list.h b/code/game/bg_list.h
index 55d12c5..2de1c8f 100644
--- a/code/game/bg_list.h
+++ b/code/game/bg_list.h
@@ -34,8 +34,8 @@ Can be used as a LIFO stack of FIFO queue. */
 	#include <stdint.h>
 #endif
 
-#define LIST_FRONT 0
-#define LIST_BACK 1
+static const char LIST_FRONT = 0;
+static const char LIST_BACK = 1;
 
 /**
  * Possible type the data in a container may have.
diff --git a/code/game/bg_misc.c b/code/game/bg_misc.c
index ff6b1c0..fec51f7 100644
--- a/code/game/bg_misc.c
+++ b/code/game/bg_misc.c
@@ -13,15 +13,17 @@ void	trap_FS_FCloseFile( fileHandle_t f );
 void	trap_FS_Read( void *buffer, int len, fileHandle_t f );
 
 /* If you change these:  PLEASE CHANGE THE COMMENTS ON THE AMMO PICKUPS, WHICH DETAIL THE QUANTITY IN THE CLIP*/
-#define AMMO_PHASER_CLIP		50
-#define AMMO_COMPRESSION_CLIP	32
-#define AMMO_IMOD_CLIP			15
-#define AMMO_SCAVENGER_CLIP		30
-#define AMMO_STASIS_CLIP		15
-#define AMMO_GRENADE_CLIP		10
-#define AMMO_TETRION_CLIP		40
-#define AMMO_QUANTUM_CLIP		6
-#define AMMO_DREADNOUGHT_CLIP	40
+enum ammoCount_e {
+	AMMO_PHASER_CLIP = 50,
+	AMMO_COMPRESSION_CLIP = 32,
+	AMMO_IMOD_CLIP = 15,
+	AMMO_SCAVENGER_CLIP = 30,
+	AMMO_STASIS_CLIP = 15,
+	AMMO_GRENADE_CLIP = 10,
+	AMMO_TETRION_CLIP = 40,
+	AMMO_QUANTUM_CLIP = 6,
+	AMMO_DREADNOUGHT_CLIP = 40
+};
 
 char	races[256];