diff --git a/.travis.yml b/.travis.yml
index fb0a8e1..4c18243 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+sudo: required
+
 language: cpp
 
 addons:
@@ -8,10 +10,6 @@ addons:
     packages:
     - g++-4.9
     - build-essential
-    - libsdl2-dev
-    - libsdl2-image-dev
-    - libsdl2-mixer-dev
-    - libsdl2-ttf-dev
     - libenet-dev
     - libphysfs-dev
     - libboost1.55-dev
@@ -20,6 +18,10 @@ addons:
 cache:
   apt: true
 
+before_install:
+  - sudo apt-add-repository --yes ppa:zoogie/sdl2-snapshots
+  - sudo apt-get update -qq
+  - sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
 
 install:
   - export CXX="g++-4.9"
diff --git a/source/code/main.cpp b/source/code/main.cpp
index 78a1425..41d08b6 100644
--- a/source/code/main.cpp
+++ b/source/code/main.cpp
@@ -54,8 +54,6 @@ http://blockattack.sf.net
 //#include "ttfont.h"        //To use True Type Fonts in SDL
 //#include "config.h"
 #include <vector>
-#include <SDL/SDL_timer.h>
-#include <SDL/SDL_video.h>
 #include "MenuSystem.h"
 #include "puzzlehandler.hpp"
 #include <memory>
diff --git a/travis_build.script b/travis_build.script
index a49a44a..20a2fd1 100755
--- a/travis_build.script
+++ b/travis_build.script
@@ -1,4 +1,5 @@
 #! /bin/bash
+set -e
 # Travis runs Ubuntu 12.04 and misses libutfcpp-dev.
 cp source/misc/travis_help/utf8_v2_3_4/source/utf8.h source/code/
 cp -r source/misc/travis_help/utf8_v2_3_4/source/utf8 source/code/