diff --git a/stepmania/src/RoomWheel.cpp b/stepmania/src/RoomWheel.cpp
index f31fe9cdbb..55fa61d175 100644
--- a/stepmania/src/RoomWheel.cpp
+++ b/stepmania/src/RoomWheel.cpp
@@ -35,12 +35,6 @@ void RoomWheel::Load( RString sType )
 	RebuildWheelItems();
 }
 
-RoomWheelData::RoomWheelData( WheelItemType wit, RString sTitle, RString sDesc, RageColor color ):
-	WheelItemBaseData( wit, sTitle, color )
-{
-	m_sDesc = sDesc;
-}
-
 RoomWheelItem::RoomWheelItem( RString sType ):
 	WheelItemBase(sType)
 {
@@ -107,11 +101,6 @@ void RoomWheelItem::LoadFromWheelItemBaseData( WheelItemBaseData* pWID )
 	m_text.SetDiffuseColor( pWID->m_color );
 }
 
-void RoomWheel::Update( float fDeltaTime )
-{
-	WheelBase::Update(fDeltaTime);
-}
-
 void RoomWheel::Move(int n)
 {
 	if ((n == 0) && (m_iSelection >= m_offset))
diff --git a/stepmania/src/RoomWheel.h b/stepmania/src/RoomWheel.h
index bd85f7288b..8ca427fa1f 100644
--- a/stepmania/src/RoomWheel.h
+++ b/stepmania/src/RoomWheel.h
@@ -3,18 +3,19 @@
 #ifndef ROOMWHEEL_H
 #define ROOMWHEEL_H
 
-#include "Quad.h"
 #include "WheelBase.h"
 #include "WheelItemBase.h"
 #include "ThemeMetric.h"
 
 struct RoomWheelData : public WheelItemBaseData
 {
-	RoomWheelData() { WheelItemBaseData::WheelItemBaseData(); }
-	RoomWheelData( WheelItemType wit, RString title, RString SubTitle, RageColor color );
+	RoomWheelData() : m_iFlags(0) { WheelItemBaseData::WheelItemBaseData(); }
+	RoomWheelData( WheelItemType wit, const RString& sTitle, const RString& sDesc, RageColor color )
+	 : m_iFlags(0), m_sDesc(sDesc), WheelItemBaseData( wit, sTitle, color )
+	{};
 
 	RString			m_sDesc;
-	WheelNotifyIcon::Flags  m_Flags;
+	unsigned int	m_iFlags;
 };
 
 class RoomWheelItem : public WheelItemBase
@@ -95,7 +96,6 @@ public:
 	virtual unsigned int GetNumItems() const;
 	virtual void RemoveItem( int index );
 	virtual bool Select();
-	virtual void Update( float fDeltaTime );
 	virtual void Move(int n);
 
 	inline RoomWheelData* GetItem(unsigned int i) { return (RoomWheelData*)WheelBase::GetItem(i + m_offset); }