diff --git a/.travis/osx..install.sh b/.travis/osx..install.sh
index 0fb8560eb..e1bdcac28 100644
--- a/.travis/osx..install.sh
+++ b/.travis/osx..install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PACKAGES="cmake pkgconfig fftw libogg libvorbis libsndfile libsamplerate jack sdl stk portaudio node fltk"
+PACKAGES="cmake pkgconfig fftw libogg libvorbis libsndfile libsamplerate jack sdl libgig libsoundio stk portaudio node fltk"
 
 if [ $QT5 ]; then
 	PACKAGES="$PACKAGES homebrew/versions/qt55"
diff --git a/plugins/GigPlayer/CMakeLists.txt b/plugins/GigPlayer/CMakeLists.txt
index 24db813bd..88e15f87b 100644
--- a/plugins/GigPlayer/CMakeLists.txt
+++ b/plugins/GigPlayer/CMakeLists.txt
@@ -2,6 +2,11 @@ if(LMMS_HAVE_GIG)
 	INCLUDE(BuildPlugin)
 	INCLUDE_DIRECTORIES(${GIG_INCLUDE_DIRS})
 
+	# Disable C++11 on Clang until gig.h is patched
+	IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+		REMOVE_DEFINITIONS(-std=c++0x)
+	ENDIF()
+
 	# Required for not crashing loading files with libgig
 	SET(GCC_COVERAGE_COMPILE_FLAGS "-fexceptions")
 	add_definitions(${GCC_COVERAGE_COMPILE_FLAGS})
diff --git a/plugins/GigPlayer/PatchesDialog.h b/plugins/GigPlayer/PatchesDialog.h
index c8bcce157..0836631ac 100644
--- a/plugins/GigPlayer/PatchesDialog.h
+++ b/plugins/GigPlayer/PatchesDialog.h
@@ -30,7 +30,6 @@
 #include "LcdSpinBox.h"
 #include "GigPlayer.h"
 
-#include <fluidsynth.h>
 #include <QWidget>
 #include <QLabel>