diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@
 
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libkcardgame/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libkcardgame/include ${FC_SOLVE_INCLUDE_DIRS})
 
 add_subdirectory(icons)
 add_subdirectory(libkcardgame)
diff --git a/patsolve/abstract_fc_solve_solver.cpp b/patsolve/abstract_fc_solve_solver.cpp
--- a/patsolve/abstract_fc_solve_solver.cpp
+++ b/patsolve/abstract_fc_solve_solver.cpp
@@ -18,8 +18,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "freecell-solver/fcs_user.h"
-#include "freecell-solver/fcs_cl.h"
+#include "fcs_user.h"
+#include "fcs_cl.h"
 
 #include "abstract_fc_solve_solver.h"
 
diff --git a/patsolve/freecellsolver.cpp b/patsolve/freecellsolver.cpp
--- a/patsolve/freecellsolver.cpp
+++ b/patsolve/freecellsolver.cpp
@@ -19,8 +19,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "freecell-solver/fcs_user.h"
-#include "freecell-solver/fcs_cl.h"
+#include "fcs_user.h"
+#include "fcs_cl.h"
 
 #include "freecellsolver.h"
 
diff --git a/patsolve/simonsolver.cpp b/patsolve/simonsolver.cpp
--- a/patsolve/simonsolver.cpp
+++ b/patsolve/simonsolver.cpp
@@ -18,8 +18,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "freecell-solver/fcs_user.h"
-#include "freecell-solver/fcs_cl.h"
+#include "fcs_user.h"
+#include "fcs_cl.h"
 
 #include "simonsolver.h"
 
diff --git a/patsolve/solverinterface.h b/patsolve/solverinterface.h
--- a/patsolve/solverinterface.h
+++ b/patsolve/solverinterface.h
@@ -4,7 +4,7 @@
 #include <QList>
 
 #include "../hint.h"
-#include "freecell-solver/fcs_user.h"
+#include "fcs_user.h"
 
 
 /* A card is represented as ( down << 6 ) + (suit << 4) + rank. */