42 files changed, 90 insertions, 89 deletions

diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp
index c77bd2bfc3..1e359837a3 100644
--- a/engines/titanic/core/saveable_object.cpp
+++ b/engines/titanic/core/saveable_object.cpp
@@ -309,16 +309,6 @@
 #include "titanic/gfx/music_switch_inversion.h"
 #include "titanic/gfx/music_switch_reverse.h"
 #include "titanic/gfx/music_voice_mute.h"
-#include "titanic/gfx/pet_drag_chev.h"
-#include "titanic/gfx/pet_graphic.h"
-#include "titanic/gfx/pet_graphic2.h"
-#include "titanic/gfx/pet_leaf.h"
-#include "titanic/gfx/pet_mode_off.h"
-#include "titanic/gfx/pet_mode_on.h"
-#include "titanic/gfx/pet_mode_panel.h"
-#include "titanic/gfx/pet_pannel1.h"
-#include "titanic/gfx/pet_pannel2.h"
-#include "titanic/gfx/pet_pannel3.h"
 #include "titanic/gfx/send_to_succ.h"
 #include "titanic/gfx/sgt_selector.h"
 #include "titanic/gfx/slider_button.h"
@@ -382,6 +372,16 @@
 #include "titanic/npcs/true_talk_npc.h"
 
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/pet_control/pet_drag_chev.h"
+#include "titanic/pet_control/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic2.h"
+#include "titanic/pet_control/pet_leaf.h"
+#include "titanic/pet_control/pet_mode_off.h"
+#include "titanic/pet_control/pet_mode_on.h"
+#include "titanic/pet_control/pet_mode_panel.h"
+#include "titanic/pet_control/pet_pannel1.h"
+#include "titanic/pet_control/pet_pannel2.h"
+#include "titanic/pet_control/pet_pannel3.h"
 
 #include "titanic/sound/auto_music_player.h"
 #include "titanic/sound/auto_music_player_base.h"
diff --git a/engines/titanic/gfx/icon_nav_butt.h b/engines/titanic/gfx/icon_nav_butt.h
index 36d3eb0890..b2db4c7794 100644
--- a/engines/titanic/gfx/icon_nav_butt.h
+++ b/engines/titanic/gfx/icon_nav_butt.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_ICON_NAV_BUTT_H
 #define TITANIC_ICON_NAV_BUTT_H
 
-#include "titanic/gfx/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/icon_nav_image.h b/engines/titanic/gfx/icon_nav_image.h
index 61febfd2a4..295ffe7d3b 100644
--- a/engines/titanic/gfx/icon_nav_image.h
+++ b/engines/titanic/gfx/icon_nav_image.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_ICON_NAV_IMAGE_H
 #define TITANIC_ICON_NAV_IMAGE_H
 
-#include "titanic/gfx/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/icon_nav_receive.h b/engines/titanic/gfx/icon_nav_receive.h
index cce1df2279..36eed5376b 100644
--- a/engines/titanic/gfx/icon_nav_receive.h
+++ b/engines/titanic/gfx/icon_nav_receive.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_ICON_NAV_RECEIVE_H
 #define TITANIC_ICON_NAV_RECEIVE_H
 
-#include "titanic/gfx/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/icon_nav_send.h b/engines/titanic/gfx/icon_nav_send.h
index 1ffb8e9e15..d25d0b9149 100644
--- a/engines/titanic/gfx/icon_nav_send.h
+++ b/engines/titanic/gfx/icon_nav_send.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_ICON_NAV_SEND_H
 #define TITANIC_ICON_NAV_SEND_H
 
-#include "titanic/gfx/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/sgt_selector.h b/engines/titanic/gfx/sgt_selector.h
index 678ee77b06..8ebd7ae255 100644
--- a/engines/titanic/gfx/sgt_selector.h
+++ b/engines/titanic/gfx/sgt_selector.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_SGT_SELECTOR_H
 #define TITANIC_SGT_SELECTOR_H
 
-#include "titanic/gfx/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/text_down.h b/engines/titanic/gfx/text_down.h
index 6fc55bb647..189f795650 100644
--- a/engines/titanic/gfx/text_down.h
+++ b/engines/titanic/gfx/text_down.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_TEXT_DOWN_H
 #define TITANIC_TEXT_DOWN_H
 
-#include "titanic/gfx/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/text_skrew.h b/engines/titanic/gfx/text_skrew.h
index 6d7e714963..aa6c375098 100644
--- a/engines/titanic/gfx/text_skrew.h
+++ b/engines/titanic/gfx/text_skrew.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_TEXT_SKREW_H
 #define TITANIC_TEXT_SKREW_H
 
-#include "titanic/gfx/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/text_up.h b/engines/titanic/gfx/text_up.h
index 328aeee0ee..103f62159c 100644
--- a/engines/titanic/gfx/text_up.h
+++ b/engines/titanic/gfx/text_up.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_TEXT_UP_H
 #define TITANIC_TEXT_UP_H
 
-#include "titanic/gfx/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index 9f9257db75..4ab5caf3cd 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -311,16 +311,6 @@ MODULE_OBJS := \
 	gfx/keybrd_butt.o \
 	gfx/move_object_button.o \
 	gfx/music_control.o \
-	gfx/pet_drag_chev.o \
-	gfx/pet_graphic2.o \
-	gfx/pet_graphic.o \
-	gfx/pet_leaf.o \
-	gfx/pet_mode_off.o \
-	gfx/pet_mode_on.o \
-	gfx/pet_mode_panel.o \
-	gfx/pet_pannel1.o \
-	gfx/pet_pannel2.o \
-	gfx/pet_pannel3.o \
 	gfx/send_to_succ.o \
 	gfx/sgt_selector.o \
 	gfx/slider_button.o \
@@ -382,20 +372,30 @@ MODULE_OBJS := \
 	pet_control/pet_control.o \
 	pet_control/pet_control_list_item.o \
 	pet_control/pet_control_list_item2.o \
-	pet_control/pet_conversation_section.o \
+	pet_control/pet_conversations.o \
 	pet_control/pet_element.o \
 	pet_control/pet_frame.o \
 	pet_control/pet_gfx_element.o \
-	pet_control/pet_inventory_section.o \
-	pet_control/pet_rooms_section.o \
-	pet_control/pet_remote_section.o \
-	pet_control/pet_save_section.o \
+	pet_control/pet_inventory.o \
+	pet_control/pet_rooms.o \
+	pet_control/pet_remote.o \
+	pet_control/pet_saves.o \
 	pet_control/pet_section.o \
 	pet_control/pet_control_sub5.o \
 	pet_control/pet_control_sub7.o \
 	pet_control/pet_control_sub10.o \
 	pet_control/pet_control_sub11.o \
 	pet_control/pet_control_sub12.o \
+	pet_control/pet_drag_chev.o \
+	pet_control/pet_graphic2.o \
+	pet_control/pet_graphic.o \
+	pet_control/pet_leaf.o \
+	pet_control/pet_mode_off.o \
+	pet_control/pet_mode_on.o \
+	pet_control/pet_mode_panel.o \
+	pet_control/pet_pannel1.o \
+	pet_control/pet_pannel2.o \
+	pet_control/pet_pannel3.o \
 	sound/auto_music_player.o \
 	sound/auto_music_player_base.o \
 	sound/auto_sound_player.o \
diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h
index d966960ff0..40c6b31044 100644
--- a/engines/titanic/pet_control/pet_control.h
+++ b/engines/titanic/pet_control/pet_control.h
@@ -28,12 +28,12 @@
 #include "titanic/core/room_item.h"
 #include "titanic/messages/messages.h"
 #include "titanic/messages/mouse_messages.h"
-#include "titanic/pet_control/pet_conversation_section.h"
+#include "titanic/pet_control/pet_conversations.h"
 #include "titanic/pet_control/pet_frame.h"
-#include "titanic/pet_control/pet_inventory_section.h"
-#include "titanic/pet_control/pet_remote_section.h"
-#include "titanic/pet_control/pet_rooms_section.h"
-#include "titanic/pet_control/pet_save_section.h"
+#include "titanic/pet_control/pet_inventory.h"
+#include "titanic/pet_control/pet_remote.h"
+#include "titanic/pet_control/pet_rooms.h"
+#include "titanic/pet_control/pet_saves.h"
 #include "titanic/pet_control/pet_control_sub5.h"
 #include "titanic/pet_control/pet_control_sub7.h"
 
@@ -54,11 +54,11 @@ private:
 	int _locked;
 	int _fieldC8;
 	CPetSection *_sections[7];
-	CPetConversationSection _conversations;
-	CPetInventorySection _inventory;
-	CPetRemoteSection _remote;
+	CPetConversations _conversations;
+	CPetInventory _inventory;
+	CPetRemote _remote;
 	CPetRoomsSection _rooms;
-	CPetSaveSection _saves;
+	CPetSaves _saves;
 	CPetControlSub5 _sub5;
 	CPetControlSub7 _sub7;
 	CPetFrame _frame;
diff --git a/engines/titanic/pet_control/pet_conversation_section.cpp b/engines/titanic/pet_control/pet_conversations.cpp
index 166c8ecc47..a4936e5703 100644
--- a/engines/titanic/pet_control/pet_conversation_section.cpp
+++ b/engines/titanic/pet_control/pet_conversations.cpp
@@ -20,19 +20,19 @@
  *
  */
 
-#include "titanic/pet_control/pet_conversation_section.h"
+#include "titanic/pet_control/pet_conversations.h"
 
 namespace Titanic {
 
-CPetConversationSection::CPetConversationSection() : CPetSection(),
+CPetConversations::CPetConversations() : CPetSection(),
 		_field414(0), _field418(0) {
 }
 
-void CPetConversationSection::save(SimpleFile *file, int indent) const {
+void CPetConversations::save(SimpleFile *file, int indent) const {
 
 }
 
-void CPetConversationSection::load(SimpleFile *file, int param) {
+void CPetConversations::load(SimpleFile *file, int param) {
 	_sub2.load(file, param);
 	_sub1.load(file, param);
 
@@ -40,7 +40,7 @@ void CPetConversationSection::load(SimpleFile *file, int param) {
 		_valArray3[idx] = file->readNumber();
 }
 
-bool CPetConversationSection::isValid(CPetControl *petControl) {
+bool CPetConversations::isValid(CPetControl *petControl) {
 	// TODO
 	return true;
 }
diff --git a/engines/titanic/pet_control/pet_conversation_section.h b/engines/titanic/pet_control/pet_conversations.h
index 55492ceb1a..a511c3d991 100644
--- a/engines/titanic/pet_control/pet_conversation_section.h
+++ b/engines/titanic/pet_control/pet_conversations.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef TITANIC_PET_CONVERSATION_SECTION_H
-#define TITANIC_PET_CONVERSATION_SECTION_H
+#ifndef TITANIC_PET_CONVERSATIONS_H
+#define TITANIC_PET_CONVERSATIONS_H
 
 #include "titanic/pet_control/pet_section.h"
 #include "titanic/pet_control/pet_control_sub12.h"
@@ -29,7 +29,7 @@
 
 namespace Titanic {
 
-class CPetConversationSection : public CPetSection {
+class CPetConversations : public CPetSection {
 private:
 	CPetGfxElement _val1;
 	CPetGfxElement _val2;
@@ -51,7 +51,7 @@ private:
 	int _field418;
 	CString _string1;
 public:
-	CPetConversationSection();
+	CPetConversations();
 
 	/**
 	 * Save the data for the class to file
@@ -71,4 +71,4 @@ public:
 
 } // End of namespace Titanic
 
-#endif /* TITANIC_PET_CONVERSATION_SECTION_H */
+#endif /* TITANIC_PET_CONVERSATIONS_H */
diff --git a/engines/titanic/gfx/pet_drag_chev.cpp b/engines/titanic/pet_control/pet_drag_chev.cpp
index 24b4666b3a..3c1569856e 100644
--- a/engines/titanic/gfx/pet_drag_chev.cpp
+++ b/engines/titanic/pet_control/pet_drag_chev.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/gfx/pet_drag_chev.h"
+#include "titanic/pet_control/pet_drag_chev.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/pet_drag_chev.h b/engines/titanic/pet_control/pet_drag_chev.h
index e82afd0a1b..92f3883711 100644
--- a/engines/titanic/gfx/pet_drag_chev.h
+++ b/engines/titanic/pet_control/pet_drag_chev.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_PET_DRAG_CHEV_H
 #define TITANIC_PET_DRAG_CHEV_H
 
-#include "titanic/gfx/pet_graphic2.h"
+#include "titanic/pet_control/pet_graphic2.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/pet_control/pet_frame.h b/engines/titanic/pet_control/pet_frame.h
index 5b90fd2aa3..f14e6eaddf 100644
--- a/engines/titanic/pet_control/pet_frame.h
+++ b/engines/titanic/pet_control/pet_frame.h
@@ -63,6 +63,7 @@ public:
 	 * Handles mouse down messages
 	 */
 	virtual bool handleMessage(CMouseButtonDownMsg &msg);
+	virtual bool handleMessage(CMouseButtonUpMsg &msg) { return false; }
 
 	/**
 	 * Returns true if the object is in a valid state
diff --git a/engines/titanic/gfx/pet_graphic.cpp b/engines/titanic/pet_control/pet_graphic.cpp
index b625c1dfdb..3586c4de67 100644
--- a/engines/titanic/gfx/pet_graphic.cpp
+++ b/engines/titanic/pet_control/pet_graphic.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/gfx/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/pet_graphic.h b/engines/titanic/pet_control/pet_graphic.h
index 112d75a870..112d75a870 100644
--- a/engines/titanic/gfx/pet_graphic.h
+++ b/engines/titanic/pet_control/pet_graphic.h
diff --git a/engines/titanic/gfx/pet_graphic2.cpp b/engines/titanic/pet_control/pet_graphic2.cpp
index 5588c72fba..d4871e8c78 100644
--- a/engines/titanic/gfx/pet_graphic2.cpp
+++ b/engines/titanic/pet_control/pet_graphic2.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/gfx/pet_graphic2.h"
+#include "titanic/pet_control/pet_graphic2.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/pet_graphic2.h b/engines/titanic/pet_control/pet_graphic2.h
index d9bb514915..d9bb514915 100644
--- a/engines/titanic/gfx/pet_graphic2.h
+++ b/engines/titanic/pet_control/pet_graphic2.h
diff --git a/engines/titanic/pet_control/pet_inventory_section.cpp b/engines/titanic/pet_control/pet_inventory.cpp
index 675d6033c9..c0a93fa23b 100644
--- a/engines/titanic/pet_control/pet_inventory_section.cpp
+++ b/engines/titanic/pet_control/pet_inventory.cpp
@@ -20,26 +20,26 @@
  *
  */
 
-#include "titanic/pet_control/pet_inventory_section.h"
+#include "titanic/pet_control/pet_inventory.h"
 
 namespace Titanic {
 
-CPetInventorySection::CPetInventorySection() : CPetSection(),
+CPetInventory::CPetInventory() : CPetSection(),
 		_field28C(0), _field290(0), _field294(0), _field298(0) {
 	for (int idx = 0; idx < 46; ++idx) {
 		_valArray1[idx] = _valArray2[idx] = 0;
 	}
 }
 
-void CPetInventorySection::save(SimpleFile *file, int indent) const {
+void CPetInventory::save(SimpleFile *file, int indent) const {
 	file->writeNumberLine(_field298, indent);
 }
 
-void CPetInventorySection::load(SimpleFile *file, int param) {
+void CPetInventory::load(SimpleFile *file, int param) {
 	_field298 = file->readNumber();
 }
 
-bool CPetInventorySection::isValid(CPetControl *petControl) {
+bool CPetInventory::isValid(CPetControl *petControl) {
 	// TODO
 	return true;
 }
diff --git a/engines/titanic/pet_control/pet_inventory_section.h b/engines/titanic/pet_control/pet_inventory.h
index 4d36e2fba9..ef295f1507 100644
--- a/engines/titanic/pet_control/pet_inventory_section.h
+++ b/engines/titanic/pet_control/pet_inventory.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef TITANIC_PET_INVENTORY_SECTION_H
-#define TITANIC_PET_INVENTORY_SECTION_H
+#ifndef TITANIC_PET_INVENTORY_H
+#define TITANIC_PET_INVENTORY_H
 
 #include "titanic/simple_file.h"
 #include "titanic/pet_control/pet_section.h"
@@ -30,7 +30,7 @@
 
 namespace Titanic {
 
-class CPetInventorySection : public CPetSection {
+class CPetInventory : public CPetSection {
 private:
 	CPetControlSub12 _sub12;
 	CPetControlSub10 _sub10;
@@ -41,7 +41,7 @@ private:
 	int _field294;
 	int _field298;
 public:
-	CPetInventorySection();
+	CPetInventory();
 
 	/**
 	 * Save the data for the class to file
@@ -61,4 +61,4 @@ public:
 
 } // End of namespace Titanic
 
-#endif /* TITANIC_PET_INVENTORY_SECTION_H */
+#endif /* TITANIC_PET_INVENTORY_H */
diff --git a/engines/titanic/gfx/pet_leaf.cpp b/engines/titanic/pet_control/pet_leaf.cpp
index adb6ccd144..77b0d426a5 100644
--- a/engines/titanic/gfx/pet_leaf.cpp
+++ b/engines/titanic/pet_control/pet_leaf.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/gfx/pet_leaf.h"
+#include "titanic/pet_control/pet_leaf.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/pet_leaf.h b/engines/titanic/pet_control/pet_leaf.h
index 073374970c..073374970c 100644
--- a/engines/titanic/gfx/pet_leaf.h
+++ b/engines/titanic/pet_control/pet_leaf.h
diff --git a/engines/titanic/gfx/pet_mode_off.cpp b/engines/titanic/pet_control/pet_mode_off.cpp
index d94ced085e..f4eac74837 100644
--- a/engines/titanic/gfx/pet_mode_off.cpp
+++ b/engines/titanic/pet_control/pet_mode_off.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/gfx/pet_mode_off.h"
+#include "titanic/pet_control/pet_mode_off.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/pet_mode_off.h b/engines/titanic/pet_control/pet_mode_off.h
index ea88255b93..ea88255b93 100644
--- a/engines/titanic/gfx/pet_mode_off.h
+++ b/engines/titanic/pet_control/pet_mode_off.h
diff --git a/engines/titanic/gfx/pet_mode_on.cpp b/engines/titanic/pet_control/pet_mode_on.cpp
index 2de07455fa..8eb839f241 100644
--- a/engines/titanic/gfx/pet_mode_on.cpp
+++ b/engines/titanic/pet_control/pet_mode_on.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/gfx/pet_mode_on.h"
+#include "titanic/pet_control/pet_mode_on.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/pet_mode_on.h b/engines/titanic/pet_control/pet_mode_on.h
index 1434fb20db..1434fb20db 100644
--- a/engines/titanic/gfx/pet_mode_on.h
+++ b/engines/titanic/pet_control/pet_mode_on.h
diff --git a/engines/titanic/gfx/pet_mode_panel.cpp b/engines/titanic/pet_control/pet_mode_panel.cpp
index 050cb768df..1919d88fac 100644
--- a/engines/titanic/gfx/pet_mode_panel.cpp
+++ b/engines/titanic/pet_control/pet_mode_panel.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/gfx/pet_mode_panel.h"
+#include "titanic/pet_control/pet_mode_panel.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/pet_mode_panel.h b/engines/titanic/pet_control/pet_mode_panel.h
index ef68ca8b06..ef68ca8b06 100644
--- a/engines/titanic/gfx/pet_mode_panel.h
+++ b/engines/titanic/pet_control/pet_mode_panel.h
diff --git a/engines/titanic/gfx/pet_pannel1.cpp b/engines/titanic/pet_control/pet_pannel1.cpp
index baa7558ea0..8245d7e90a 100644
--- a/engines/titanic/gfx/pet_pannel1.cpp
+++ b/engines/titanic/pet_control/pet_pannel1.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/gfx/pet_pannel1.h"
+#include "titanic/pet_control/pet_pannel1.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/pet_pannel1.h b/engines/titanic/pet_control/pet_pannel1.h
index 9261af9077..7a16d8c842 100644
--- a/engines/titanic/gfx/pet_pannel1.h
+++ b/engines/titanic/pet_control/pet_pannel1.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_PET_PANNEL1_H
 #define TITANIC_PET_PANNEL1_H
 
-#include "titanic/gfx/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/pet_pannel2.cpp b/engines/titanic/pet_control/pet_pannel2.cpp
index 7376fcc4c5..a04f63fee8 100644
--- a/engines/titanic/gfx/pet_pannel2.cpp
+++ b/engines/titanic/pet_control/pet_pannel2.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/gfx/pet_pannel2.h"
+#include "titanic/pet_control/pet_pannel2.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/pet_pannel2.h b/engines/titanic/pet_control/pet_pannel2.h
index 561c0d74a2..7296eab507 100644
--- a/engines/titanic/gfx/pet_pannel2.h
+++ b/engines/titanic/pet_control/pet_pannel2.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_PET_PANNEL2_H
 #define TITANIC_PET_PANNEL2_H
 
-#include "titanic/gfx/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/pet_pannel3.cpp b/engines/titanic/pet_control/pet_pannel3.cpp
index f4bd1fb0cc..5d0fd93d7b 100644
--- a/engines/titanic/gfx/pet_pannel3.cpp
+++ b/engines/titanic/pet_control/pet_pannel3.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/gfx/pet_pannel3.h"
+#include "titanic/pet_control/pet_pannel3.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/gfx/pet_pannel3.h b/engines/titanic/pet_control/pet_pannel3.h
index 590818406a..2bdbf1fb31 100644
--- a/engines/titanic/gfx/pet_pannel3.h
+++ b/engines/titanic/pet_control/pet_pannel3.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_PET_PANNEL3_H
 #define TITANIC_PET_PANNEL3_H
 
-#include "titanic/gfx/pet_graphic.h"
+#include "titanic/pet_control/pet_graphic.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/pet_control/pet_save_section.cpp b/engines/titanic/pet_control/pet_remote.cpp
index 8d24fed42c..4463c31bee 100644
--- a/engines/titanic/pet_control/pet_save_section.cpp
+++ b/engines/titanic/pet_control/pet_remote.cpp
@@ -20,11 +20,11 @@
  *
  */
 
-#include "titanic/pet_control/pet_save_section.h"
+#include "titanic/pet_control/pet_remote.h"
 
 namespace Titanic {
 
-bool CPetSaveSection::isValid(CPetControl *petControl) {
+bool CPetRemote::isValid(CPetControl *petControl) {
 	// TODO
 	return true;
 }
diff --git a/engines/titanic/pet_control/pet_remote_section.h b/engines/titanic/pet_control/pet_remote.h
index f3063bdd16..410a5ff961 100644
--- a/engines/titanic/pet_control/pet_remote_section.h
+++ b/engines/titanic/pet_control/pet_remote.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef TITANIC_PET_REMOTE_SECTION_H
-#define TITANIC_PET_REMOTE_SECTION_H
+#ifndef TITANIC_PET_REMOTE_H
+#define TITANIC_PET_REMOTE_H
 
 #include "titanic/pet_control/pet_section.h"
 #include "titanic/pet_control/pet_control_sub10.h"
@@ -30,7 +30,7 @@
 
 namespace Titanic {
 
-class CPetRemoteSection : public CPetSection {
+class CPetRemote : public CPetSection {
 private:
 	CPetControlSub10 _sub10;
 	CPetGfxElement _val1;
@@ -54,4 +54,4 @@ public:
 
 } // End of namespace Titanic
 
-#endif /* TITANIC_PET_REMOTE_SECTION_H */
+#endif /* TITANIC_PET_REMOTE_H */
diff --git a/engines/titanic/pet_control/pet_rooms_section.cpp b/engines/titanic/pet_control/pet_rooms.cpp
index d0d098580a..ea81dd8270 100644
--- a/engines/titanic/pet_control/pet_rooms_section.cpp
+++ b/engines/titanic/pet_control/pet_rooms.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/pet_control/pet_rooms_section.h"
+#include "titanic/pet_control/pet_rooms.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/pet_control/pet_rooms_section.h b/engines/titanic/pet_control/pet_rooms.h
index a4bcefe09c..a4bcefe09c 100644
--- a/engines/titanic/pet_control/pet_rooms_section.h
+++ b/engines/titanic/pet_control/pet_rooms.h
diff --git a/engines/titanic/pet_control/pet_remote_section.cpp b/engines/titanic/pet_control/pet_saves.cpp
index 37720848cc..0a90cc257d 100644
--- a/engines/titanic/pet_control/pet_remote_section.cpp
+++ b/engines/titanic/pet_control/pet_saves.cpp
@@ -20,11 +20,11 @@
  *
  */
 
-#include "titanic/pet_control/pet_remote_section.h"
+#include "titanic/pet_control/pet_saves.h"
 
 namespace Titanic {
 
-bool CPetRemoteSection::isValid(CPetControl *petControl) {
+bool CPetSaves::isValid(CPetControl *petControl) {
 	// TODO
 	return true;
 }
diff --git a/engines/titanic/pet_control/pet_save_section.h b/engines/titanic/pet_control/pet_saves.h
index 502338263f..f11eef693d 100644
--- a/engines/titanic/pet_control/pet_save_section.h
+++ b/engines/titanic/pet_control/pet_saves.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef TITANIC_PET_SAVE_SECTION_H
-#define TITANIC_PET_SAVE_SECTION_H
+#ifndef TITANIC_PET_SAVES_H
+#define TITANIC_PET_SAVES_H
 
 #include "titanic/pet_control/pet_section.h"
 #include "titanic/pet_control/pet_control_sub10.h"
@@ -29,7 +29,7 @@
 
 namespace Titanic {
 
-class CPetSaveSection : public CPetSection {
+class CPetSaves : public CPetSection {
 private:
 	CPetControlSub10 _sub10;
 	CPetControlSub10 _sub12;
@@ -42,4 +42,4 @@ public:
 
 } // End of namespace Titanic
 
-#endif /* TITANIC_PET_SAVE_SECTION_H */
+#endif /* TITANIC_PET_SAVES_H */