diff --git a/client/makefile b/client/makefile
index f049556..2c055e4 100644
--- a/client/makefile
+++ b/client/makefile
@@ -1,7 +1,7 @@
 #config
 INCLUDES+=. scenes ../common/gameplay ../common/graphics ../common/map ../common/network ../common/ui ../common/utilities
 LIBS+=libclient.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) -DGRAPHICS
 
 #source
 CXXSRC=$(wildcard *.cpp)
diff --git a/client/scenes/in_world.hpp b/client/scenes/in_world.hpp
index 48b34bb..8b3c149 100644
--- a/client/scenes/in_world.hpp
+++ b/client/scenes/in_world.hpp
@@ -42,6 +42,9 @@
 #include "config_utility.hpp"
 #include "frame_rate.hpp"
 
+#include "character_data.hpp"
+#include "combat_data.hpp"
+
 //client
 #include "base_scene.hpp"
 
diff --git a/client/scenes/lobby_menu.cpp b/client/scenes/lobby_menu.cpp
index 161e329..8bd5671 100644
--- a/client/scenes/lobby_menu.cpp
+++ b/client/scenes/lobby_menu.cpp
@@ -210,6 +210,10 @@ void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
 	//
 }
 
+//-------------------------
+//Network handlers
+//-------------------------
+
 void LobbyMenu::HandlePacket(SerialPacket packet) {
 		switch(packet.meta.type) {
 		case SerialPacket::Type::BROADCAST_RESPONSE: {
diff --git a/client/scenes/lobby_menu.hpp b/client/scenes/lobby_menu.hpp
index d386b21..9c858cb 100644
--- a/client/scenes/lobby_menu.hpp
+++ b/client/scenes/lobby_menu.hpp
@@ -65,6 +65,7 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
+	//Network handlers
 	void HandlePacket(SerialPacket);
 
 	//shared parameters
diff --git a/client/scenes/makefile b/client/scenes/makefile
index d09de2e..81d7685 100644
--- a/client/scenes/makefile
+++ b/client/scenes/makefile
@@ -1,7 +1,7 @@
 #config
 INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/ui ../../common/utilities
 LIBS+=libclient.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) -DGRAPHICS
 
 #source
 CXXSRC=$(wildcard *.cpp)
diff --git a/common/gameplay/character_data.hpp b/common/gameplay/character_data.hpp
index 8d75293..9c8602a 100644
--- a/common/gameplay/character_data.hpp
+++ b/common/gameplay/character_data.hpp
@@ -27,6 +27,12 @@
 #include "vector2.hpp"
 #include "statistics.hpp"
 
+//graphics
+#ifdef GRAPHICS
+ #include "sprite_sheet.hpp"
+#endif
+
+//std namespace
 #include <string>
 #include <cmath>
 
@@ -55,6 +61,9 @@ struct CharacterData {
 
 	//active gameplay members
 	//NOTE: these are lost when unloaded
+#ifdef GRAPHICS
+	SpriteSheet sprite;
+#endif
 	BBox bbox = {0,0,0,0};
 	bool inCombat = false;
 	int atbGauge = 0;
diff --git a/common/gameplay/combat_data.hpp b/common/gameplay/combat_data.hpp
index c76520b..a013577 100644
--- a/common/gameplay/combat_data.hpp
+++ b/common/gameplay/combat_data.hpp
@@ -22,12 +22,20 @@
 #ifndef COMBATDATA_HPP_
 #define COMBATDATA_HPP_
 
+//POD members
 #include "vector2.hpp"
 #include "bbox.hpp"
 
+//gameplay members
 #include "character_data.hpp"
 #include "enemy_data.hpp"
 
+//graphics
+#ifdef GRAPHICS
+ #include "sprite_sheet.hpp"
+#endif
+
+//std namespace
 #include <chrono>
 #include <list>
 #include <utility>
@@ -46,6 +54,11 @@ struct CombatData {
 
 	//time interval
 	Clock::time_point lastTick = Clock::now();
+
+	//graphics
+#ifdef GRAPHICS
+	SpriteSheet sprite;
+#endif
 };
 
 #endif
diff --git a/common/gameplay/enemy_data.hpp b/common/gameplay/enemy_data.hpp
index 48a5fa4..d0edd0a 100644
--- a/common/gameplay/enemy_data.hpp
+++ b/common/gameplay/enemy_data.hpp
@@ -22,8 +22,15 @@
 #ifndef ENEMYDATA_HPP_
 #define ENEMYDATA_HPP_
 
+//gameplay
 #include "statistics.hpp"
 
+//graphics
+#ifdef GRAPHICS
+ #include "sprite_sheet.hpp"
+#endif
+
+//std namespace
 #include <string>
 
 struct EnemyData {
@@ -41,6 +48,9 @@ struct EnemyData {
 
 	//active gameplay members
 	//NOTE: these are lost when unloaded
+#ifdef GRAPHICS
+	SpriteSheet sprite;
+#endif
 	int tableIndex;
 	int atbGauge = 0;
 };