diff --git a/src/entities/entity.c b/src/entities/entity.c
index 4879ced..34c98c1 100644
--- a/src/entities/entity.c
+++ b/src/entities/entity.c
@@ -30,6 +30,7 @@ static void die(void);
 static void activate(int active);
 static void touch(Entity *other);
 static void animate(void);
+static void changeEnvironment(void);
 static void load(cJSON *root);
 static void save(cJSON *root);
 static SDL_Rect *getCurrentSprite(void);
@@ -68,6 +69,7 @@ void initEntity(Entity *e)
 	e->bounce = bounce;
 	e->getCurrentSprite = getCurrentSprite;
 	e->die = die;
+	e->changeEnvironment = changeEnvironment;
 	
 	e->load = load;
 	e->save = save;
@@ -153,6 +155,10 @@ static void die(void)
 	self->alive = ALIVE_DEAD;
 }
 
+static void changeEnvironment(void)
+{
+}
+
 static SDL_Rect *getCurrentSprite(void)
 {
 	return &self->sprite[self->facing]->frames[self->spriteFrame]->rect;
diff --git a/src/entities/items/item.h b/src/entities/items/item.h
index 8abc4d5..50744d0 100644
--- a/src/entities/items/item.h
+++ b/src/entities/items/item.h
@@ -27,7 +27,6 @@ extern void addTeleportStars(Entity *e);
 extern void initEntity(Entity *e);
 extern Sprite *getSprite(char *name);
 extern int addItem(Item *i);
-extern int numCarriedItems(void);
 extern void updateObjective(char *targetName);
 
 extern Entity *self;
diff --git a/src/world/entities.c b/src/world/entities.c
index e17c3d6..0d7b857 100644
--- a/src/world/entities.c
+++ b/src/world/entities.c
@@ -534,9 +534,7 @@ static void moveToOthers(float dx, float dy, PointF *position)
 				{
 					hit = 1;
 
-					/*
-						* Infinite loop! Kill it!
-						*/
+					/* Infinite loop! Kill it! */
 					if (dx == 0 && dy == 0 && solidLoopHits++ > 1)
 					{
 						self->alive = ALIVE_DEAD;