--- a/Party.h	Wed Apr 02 22:05:35 2014 +0600
+++ b/Party.h	Wed Apr 02 23:21:34 2014 +0200
@@ -1,15 +1,13 @@
 #pragma once
 #include "Player.h"
 #include "NPC.h"
-#include "mm7_data.h"
-#include "mm7_unsorted_subs.h"
 #include <array>
 
 
 
 #define PARTY_AUTONOTES_BIT__EMERALD_FIRE_FOUNTAIN 2
 
-enum PARTY_QUEST_BITS: uint16
+enum PARTY_QUEST_BITS: uint16_t
 {
   PARTY_QUEST_EMERALD_RED_POTION_ACTIVE = 1,
   PARTY_QUEST_EMERALD_SEASHELL_ACTIVE = 2,
@@ -324,7 +322,4 @@
 
 extern struct ActionQueue *pPartyActionQueue;
 
-inline bool TestPartyQuestBit(PARTY_QUEST_BITS bit)
-{
-  return _449B57_test_bit(pParty->_quest_bits, bit);
-}
+bool TestPartyQuestBit(PARTY_QUEST_BITS bit);