diff --git a/.travis.yml b/.travis.yml
index 4866b49c1d..f34b33dfcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,13 +19,12 @@ before_install:
   - sudo apt-get install libwxgtk3.0-dev libopenal-dev freeglut3-dev libglew-dev
   - sudo apt-get install aria2 -qq
   - download_extract() { aria2c -x 16 $1 -o $2 && tar -xf $2; }
+  - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; export CXX="g++-4.8" CC="gcc-4.8"; else sudo apt-get install libstdc++-4.8-dev; fi
 # Travis uses CMake 2.8.7. We require 2.8.8. Grab latest
-  - sudo apt-get install -qq g++-4.8
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
   - sudo apt-get install lib32stdc++6 -qq &&
-    aria2c -x 16 http://www.cmake.org/files/v2.8/cmake-2.8.12.1-Linux-i386.sh &&
-    chmod a+x cmake-2.8.12.1-Linux-i386.sh &&
-    sudo ./cmake-2.8.12.1-Linux-i386.sh --skip-license --prefix=/usr;
+    aria2c -x 16 http://www.cmake.org/files/v3.0/cmake-3.0.0-Linux-i386.sh &&
+    chmod a+x cmake-3.0.0-Linux-i386.sh &&
+    sudo ./cmake-3.0.0-Linux-i386.sh --skip-license --prefix=/usr;
 
 before_script:
  - git submodule update --init asmjit ffmpeg
diff --git a/rpcs3/Emu/GS/GL/GLGSRender.h b/rpcs3/Emu/GS/GL/GLGSRender.h
index b3bca78d01..c2ad1a82b0 100644
--- a/rpcs3/Emu/GS/GL/GLGSRender.h
+++ b/rpcs3/Emu/GS/GL/GLGSRender.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "Emu/GS/GSRender.h"
 #include "Emu/GS/RSXThread.h"
+#include "Utilities/rPlatform.h"
 #include "GLBuffers.h"
 #include "GLProgramBuffer.h"
 
diff --git a/rpcs3/Emu/Io/Keyboard.cpp b/rpcs3/Emu/Io/Keyboard.cpp
index b6c1f2e963..03b0a72a50 100644
--- a/rpcs3/Emu/Io/Keyboard.cpp
+++ b/rpcs3/Emu/Io/Keyboard.cpp
@@ -38,4 +38,4 @@ void KeyboardManager::Close()
 	m_keyboard_handler = nullptr;
 
 	m_inited = false;
-}
\ No newline at end of file
+}
diff --git a/rpcs3/Emu/Io/Mouse.cpp b/rpcs3/Emu/Io/Mouse.cpp
index e938745249..3c9d569125 100644
--- a/rpcs3/Emu/Io/Mouse.cpp
+++ b/rpcs3/Emu/Io/Mouse.cpp
@@ -38,4 +38,4 @@ void MouseManager::Close()
 	m_mouse_handler = nullptr;
 
 	m_inited = false;
-}
\ No newline at end of file
+}
diff --git a/rpcs3/Ini.cpp b/rpcs3/Ini.cpp
index 1f8c728349..ad54b0dca8 100644
--- a/rpcs3/Ini.cpp
+++ b/rpcs3/Ini.cpp
@@ -2,7 +2,6 @@
 #include "Ini.h"
 
 #include "Utilities/StrFmt.h"
-#include "Utilities/rPlatform.h"
 
 #include <algorithm>
 #include <cctype>
diff --git a/rpcs3/Ini.h b/rpcs3/Ini.h
index a64fdda666..8abdfec5ea 100644
--- a/rpcs3/Ini.h
+++ b/rpcs3/Ini.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <utility>
-#include "../Utilities/simpleini/SimpleIni.h"
+#include "Utilities/rPlatform.h"
+#include "Utilities/simpleini/SimpleIni.h"
 
 //TODO: make thread safe/remove static singleton
 CSimpleIniCaseA *getIniFile();
diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h
index 302c56290f..c61296bf72 100644
--- a/rpcs3/stdafx.h
+++ b/rpcs3/stdafx.h
@@ -69,7 +69,6 @@ typedef int64_t s64;
 #include "Utilities/rXml.h"
 #include "Utilities/rConcurrency.h"
 #include "Utilities/rMsgBox.h"
-#include "Utilities/rPlatform.h"
 #include "Utilities/Thread.h"
 #include "Utilities/Array.h"
 #include "Utilities/Timer.h"