Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -60,11 +60,11 @@
         PURPOSE "Support for rendering EPS files in Cantor")
 
     find_package(LibSpectre)
-    if(LibSpectre_FOUND)
+    if(LIBSPECTRE_FOUND)
         set(WITH_EPS On)
-    else(LibSpectre_FOUND)
+    else(LIBSPECTRE_FOUND)
         set(WITH_EPS Off)
-    endif(LibSpectre_FOUND)
+    endif(LIBSPECTRE_FOUND)
 
 else(NOT WIN32)
     set(WITH_EPS Off)
Index: src/backends/octave/octaveexpression.h
===================================================================
--- src/backends/octave/octaveexpression.h
+++ src/backends/octave/octaveexpression.h
@@ -20,6 +20,8 @@
 #ifndef OCTAVEEXPRESSION_H
 #define OCTAVEEXPRESSION_H
 
+#include <config-cantorlib.h>
+
 #include <expression.h>
 #include <QStringList>
 
Index: src/backends/octave/octaveexpression.cpp
===================================================================
--- src/backends/octave/octaveexpression.cpp
+++ src/backends/octave/octaveexpression.cpp
@@ -27,8 +27,6 @@
 #include <QFile>
 #include <helpresult.h>
 
-#include <config-cantorlib.h>
-
 
 static const char* printCommand = "cantor_print();";
 
Index: src/worksheet.cpp
===================================================================
--- src/worksheet.cpp
+++ src/worksheet.cpp
@@ -46,6 +46,8 @@
 #include "lib/session.h"
 #include "lib/defaulthighlighter.h"
 
+#include <config-cantorlib.h>
+
 const double Worksheet::LeftMargin = 4;
 const double Worksheet::RightMargin = 4;
 const double Worksheet::TopMargin = 4;