diff --git a/include/AudioJack.h b/include/AudioJack.h
index 86217d1ae..33673fab5 100644
--- a/include/AudioJack.h
+++ b/include/AudioJack.h
@@ -109,6 +109,7 @@ private:
 	f_cnt_t m_framesToDoInCurBuf;
 
 
+#ifdef AUDIO_PORT_SUPPORT
 	struct StereoPort
 	{
 		jack_port_t * ports[2];
@@ -117,6 +118,7 @@ private:
 	typedef QMap<AudioPort *, StereoPort> JackPortMap;
 	JackPortMap m_portMap;
 #endif
+#endif
 
 signals:
 	void zombified();
diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp
index 9eb0856f5..91a32fe05 100644
--- a/src/core/audio/AudioJack.cpp
+++ b/src/core/audio/AudioJack.cpp
@@ -75,10 +75,12 @@ AudioJack::~AudioJack()
 {
 	m_stopSemaphore.release();
 
+#ifdef AUDIO_PORT_SUPPORT
 	while( m_portMap.size() )
 	{
 		unregisterPort( m_portMap.begin().key() );
 	}
+#endif
 
 	if( m_client != NULL )
 	{
@@ -342,7 +344,7 @@ int AudioJack::processCallback( jack_nframes_t _nframes, void * _udata )
 #ifdef AUDIO_PORT_SUPPORT
 	const Uint32 frames = qMin<Uint32>( _nframes,
 						mixer()->framesPerPeriod() );
-	for( jackPortMap::iterator it = m_portMap.begin();
+	for( JackPortMap::Iterator it = m_portMap.begin();
 						it != m_portMap.end(); ++it )
 	{
 		for( ch_cnt_t ch = 0; ch < channels(); ++ch )