7 files changed, 15 insertions, 12 deletions
diff --git a/engines/lastexpress/game/inventory.cpp b/engines/lastexpress/game/inventory.cpp
index 70536b7a6d..a36553c768 100644
--- a/engines/lastexpress/game/inventory.cpp
+++ b/engines/lastexpress/game/inventory.cpp
@@ -26,6 +26,7 @@
 #include "lastexpress/data/scene.h"
 #include "lastexpress/data/snd.h"
 
+#include "lastexpress/game/entities.h"
 #include "lastexpress/game/logic.h"
 #include "lastexpress/game/scenes.h"
 #include "lastexpress/game/state.h"
@@ -33,8 +34,10 @@
 #include "lastexpress/menu/menu.h"
 
 #include "lastexpress/sound/queue.h"
+#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/graphics.h"
+#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
diff --git a/engines/lastexpress/game/logic.cpp b/engines/lastexpress/game/logic.cpp
index c8e4c22ec5..795f165766 100644
--- a/engines/lastexpress/game/logic.cpp
+++ b/engines/lastexpress/game/logic.cpp
@@ -36,6 +36,7 @@
 // Game
 #include "lastexpress/game/action.h"
 #include "lastexpress/game/beetle.h"
+#include "lastexpress/game/entities.h"
 #include "lastexpress/game/inventory.h"
 #include "lastexpress/game/object.h"
 #include "lastexpress/game/savegame.h"
diff --git a/engines/lastexpress/game/logic.h b/engines/lastexpress/game/logic.h
index 8b7dcef942..84b64a998b 100644
--- a/engines/lastexpress/game/logic.h
+++ b/engines/lastexpress/game/logic.h
@@ -25,8 +25,6 @@
 
 #include "lastexpress/shared.h"
 
-#include "lastexpress/game/entities.h"
-
 #include "lastexpress/eventhandler.h"
 
 #include "common/events.h"
diff --git a/engines/lastexpress/game/object.cpp b/engines/lastexpress/game/object.cpp
index 91dcfcfb4a..48df91ea6d 100644
--- a/engines/lastexpress/game/object.cpp
+++ b/engines/lastexpress/game/object.cpp
@@ -22,6 +22,7 @@
 
 #include "lastexpress/game/object.h"
 
+#include "lastexpress/game/entities.h"
 #include "lastexpress/game/logic.h"
 #include "lastexpress/game/scenes.h"
 #include "lastexpress/game/state.h"
diff --git a/engines/lastexpress/game/savegame.cpp b/engines/lastexpress/game/savegame.cpp
index 76cfe9525f..4c268d84c6 100644
--- a/engines/lastexpress/game/savegame.cpp
+++ b/engines/lastexpress/game/savegame.cpp
@@ -22,6 +22,7 @@
 
 #include "lastexpress/game/savegame.h"
 
+#include "lastexpress/game/entities.h"
 #include "lastexpress/game/inventory.h"
 #include "lastexpress/game/logic.h"
 #include "lastexpress/game/object.h"
diff --git a/engines/lastexpress/game/savepoint.cpp b/engines/lastexpress/game/savepoint.cpp
index 0b5ff42679..557468e222 100644
--- a/engines/lastexpress/game/savepoint.cpp
+++ b/engines/lastexpress/game/savepoint.cpp
@@ -94,7 +94,7 @@ void SavePoints::process() {
 		if (!updateEntityFromData(savepoint)) {
 
 			// Call requested callback
-			Entity::Callback *callback = getCallback(savepoint.entity1);
+			Callback *callback = getCallback(savepoint.entity1);
 			if (callback && callback->isValid()) {
 				debugC(8, kLastExpressDebugLogic, "Savepoint: entity1=%s, action=%s, entity2=%s", ENTITY_NAME(savepoint.entity1), ACTION_NAME(savepoint.action), ENTITY_NAME(savepoint.entity2));
 				(*callback)(savepoint);
@@ -125,7 +125,7 @@ void SavePoints::addData(EntityIndex entity, ActionIndex action, uint32 param) {
 //////////////////////////////////////////////////////////////////////////
 // Callbacks
 //////////////////////////////////////////////////////////////////////////
-void SavePoints::setCallback(EntityIndex index, Entity::Callback *callback) {
+void SavePoints::setCallback(EntityIndex index, Callback *callback) {
 	if (index >= 40)
 		error("[SavePoints::setCallback] Attempting to use an invalid entity index. Valid values 0-39, was %d", index);
 
@@ -135,7 +135,7 @@ void SavePoints::setCallback(EntityIndex index, Entity::Callback *callback) {
 	_callbacks[index] = callback;
 }
 
-Entity::Callback *SavePoints::getCallback(EntityIndex index) const {
+Callback *SavePoints::getCallback(EntityIndex index) const {
 	if (index >= 40)
 		error("[SavePoints::getCallback] Attempting to use an invalid entity index. Valid values 0-39, was %d", index);
 
@@ -149,7 +149,7 @@ void SavePoints::call(EntityIndex entity2, EntityIndex entity1, ActionIndex acti
 	point.entity2 = entity2;
 	point.param.intValue = param;
 
-	Entity::Callback *callback = getCallback(entity1);
+	Callback *callback = getCallback(entity1);
 	if (callback != NULL && callback->isValid()) {
 		debugC(8, kLastExpressDebugLogic, "Savepoint: entity1=%s, action=%s, entity2=%s, param=%d", ENTITY_NAME(entity1), ACTION_NAME(action), ENTITY_NAME(entity2), param);
 		(*callback)(point);
@@ -163,7 +163,7 @@ void SavePoints::call(EntityIndex entity2, EntityIndex entity1, ActionIndex acti
 	point.entity2 = entity2;
 	strcpy((char *)&point.param.charValue, param);
 
-	Entity::Callback *callback = getCallback(entity1);
+	Callback *callback = getCallback(entity1);
 	if (callback != NULL && callback->isValid()) {
 		debugC(8, kLastExpressDebugLogic, "Savepoint: entity1=%s, action=%s, entity2=%s, param=%s", ENTITY_NAME(entity1), ACTION_NAME(action), ENTITY_NAME(entity2), param);
 		(*callback)(point);
@@ -180,7 +180,7 @@ void SavePoints::callAndProcess() {
 	bool isRunning = getFlags()->isGameRunning;
 	while (isRunning) {
 
-		Entity::Callback *callback = getCallback(index);
+		Callback *callback = getCallback(index);
 		if (callback != NULL && callback->isValid()) {
 			(*callback)(savepoint);
 			isRunning = getFlags()->isGameRunning;
diff --git a/engines/lastexpress/game/savepoint.h b/engines/lastexpress/game/savepoint.h
index a3303b4b8a..181676cc1f 100644
--- a/engines/lastexpress/game/savepoint.h
+++ b/engines/lastexpress/game/savepoint.h
@@ -74,10 +74,9 @@ struct SavePoint {
 	}
 };
 
-class SavePoints : Common::Serializable {
-private:
-	typedef Common::Functor1<const SavePoint&, void> Callback;
+typedef Common::Functor1<const SavePoint&, void> Callback;
 
+class SavePoints : Common::Serializable {
 public:
 
 	struct SavePointData {
@@ -112,7 +111,7 @@ public:
 	void addData(EntityIndex entity, ActionIndex action, uint32 param);
 
 	// Callbacks
-	void setCallback(EntityIndex index, Entity::Callback *callback);
+	void setCallback(EntityIndex index, Callback *callback);
 	Callback *getCallback(EntityIndex entity) const;
 	void call(EntityIndex entity2, EntityIndex entity1, ActionIndex action, uint32 param = 0) const;
 	void call(EntityIndex entity2, EntityIndex entity1, ActionIndex action, const char *param) const;