diff --git a/include/note.h b/include/note.h
index f8000e310..e157eb81e 100644
--- a/include/note.h
+++ b/include/note.h
@@ -91,17 +91,17 @@ public:
 		int key = DefaultKey,
 		volume _volume = DefaultVolume,
 		panning _panning = DefaultPanning,
-		detuningHelper * _detuning = NULL ) FASTCALL;
+		detuningHelper * _detuning = NULL );
 	note( const note & _note );
 	virtual ~note();
 
-	void FASTCALL setLength( const midiTime & _length );
-	void FASTCALL setPos( const midiTime & _pos );
-	void FASTCALL setKey( const int _key );
-	void FASTCALL setVolume( const volume _volume = DefaultVolume );
-	void FASTCALL setPanning( const panning _panning = DefaultPanning );
-	void FASTCALL quantizeLength( const int _q_grid );
-	void FASTCALL quantizePos( const int _q_grid );
+	void setLength( const midiTime & _length );
+	void setPos( const midiTime & _pos );
+	void setKey( const int _key );
+	void setVolume( const volume _volume = DefaultVolume );
+	void setPanning( const panning _panning = DefaultPanning );
+	void quantizeLength( const int _q_grid );
+	void quantizePos( const int _q_grid );
 
 	inline midiTime endPos( void ) const
 	{
@@ -148,8 +148,7 @@ public:
 		return( classNodeName() );
 	}
 
-	static midiTime FASTCALL quantized( const midiTime & _m,
-							const int _q_grid );
+	static midiTime quantized( const midiTime & _m, const int _q_grid );
 
 	detuningHelper * detuning( void ) const
 	{
@@ -162,9 +161,9 @@ public:
 
 
 protected:
-	virtual void FASTCALL saveSettings( QDomDocument & _doc,
+	virtual void saveSettings( QDomDocument & _doc,
 							QDomElement & _parent );
-	virtual void FASTCALL loadSettings( const QDomElement & _this );
+	virtual void loadSettings( const QDomElement & _this );
 
 	virtual void undoStep( journalEntry & _je );
 	virtual void redoStep( journalEntry & _je );
diff --git a/include/note_play_handle.h b/include/note_play_handle.h
index f5cbe0411..62c864d97 100644
--- a/include/note_play_handle.h
+++ b/include/note_play_handle.h
@@ -132,7 +132,7 @@ public:
 	virtual bool isFromTrack( const track * _track ) const;
 
 
-	void FASTCALL noteOff( const f_cnt_t _s = 0 );
+	void noteOff( const f_cnt_t _s = 0 );
 
 	inline f_cnt_t framesBeforeRelease( void ) const
 	{
@@ -168,7 +168,7 @@ public:
 	}
 
 	// returns volume-level at frame _frame (envelope/LFO)
-	float FASTCALL volumeLevel( const f_cnt_t _frame );
+	float volumeLevel( const f_cnt_t _frame );
 
 	// returns instrument-track this note-play-handle plays
 	inline instrumentTrack * getInstrumentTrack( void )