diff --git a/CMakeLists.txt b/CMakeLists.txt
index d14dccd3bff565dfee96f5ff9faa093519896df0..d24443b2fda15dcd002a136384993f66063513ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.1)
 project(arbitrateor)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 11) #Change to 17 when possible for filesystem support
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++1z") #Until then, force c++17 where we can.
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
diff --git a/src/GroovePlayer.cpp b/src/GroovePlayer.cpp
index d80bab3536d23ca539250bbddf030f0161559b66..544f863c3fdf49890a536aca0c17f504126f52c5 100644
--- a/src/GroovePlayer.cpp
+++ b/src/GroovePlayer.cpp
@@ -23,6 +23,7 @@
 #include <Wt/WServer>
 #include <Wt/WApplication>
 #include "WebInterface.h"
+#include <experimental/filesystem> //TODO:Change to non-gcc way when officially using c++17
 
 GroovePlayer::GroovePlayer(std::string dbFile) : sqliteConnection(dbFile)
 {