diff --git a/PVRTCEncoder/CMakeLists.txt b/PVRTCEncoder/CMakeLists.txt
index b288744..e5bc214 100644
--- a/PVRTCEncoder/CMakeLists.txt
+++ b/PVRTCEncoder/CMakeLists.txt
@@ -49,8 +49,6 @@
 # 
 # <http://gamma.cs.unc.edu/FasTC/>
 
-INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR})
-
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/include)
 INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/PVRTCEncoder/include)
 
diff --git a/PVRTCEncoder/include/PVRTCCompressor.h b/PVRTCEncoder/include/PVRTCCompressor.h
index b66f1b5..50363fc 100644
--- a/PVRTCEncoder/include/PVRTCCompressor.h
+++ b/PVRTCEncoder/include/PVRTCCompressor.h
@@ -53,7 +53,7 @@
 #ifndef PVRTCENCODER_INCLUDE_PVRTCCOMPRESSOR_H_
 #define PVRTCENCODER_INCLUDE_PVRTCCOMPRESSOR_H_
 
-#include "Base/include/CompressionJob.h"
+#include "CompressionJob.h"
 
 namespace PVRTCC {
 
diff --git a/PVRTCEncoder/src/Block.h b/PVRTCEncoder/src/Block.h
index 9baa114..08c4b3e 100644
--- a/PVRTCEncoder/src/Block.h
+++ b/PVRTCEncoder/src/Block.h
@@ -53,8 +53,7 @@
 #ifndef PVRTCENCODER_SRC_BLOCK_H_
 #define PVRTCENCODER_SRC_BLOCK_H_
 
-#include "Base/include/TexCompTypes.h"
-
+#include "TexCompTypes.h"
 #include "Pixel.h"
 
 namespace PVRTCC {
diff --git a/PVRTCEncoder/src/Image.cpp b/PVRTCEncoder/src/Image.cpp
index cf3f123..57e1091 100644
--- a/PVRTCEncoder/src/Image.cpp
+++ b/PVRTCEncoder/src/Image.cpp
@@ -58,8 +58,8 @@
 
 #include "Pixel.h"
 
-#include "Base/include/Image.h"
-#include "IO/include/ImageFile.h"
+#include "../../Base/include/Image.h"
+#include "../../IO/include/ImageFile.h"
 
 namespace PVRTCC {
 
diff --git a/PVRTCEncoder/src/Image.h b/PVRTCEncoder/src/Image.h
index e264f7c..fc7c751 100644
--- a/PVRTCEncoder/src/Image.h
+++ b/PVRTCEncoder/src/Image.h
@@ -53,7 +53,7 @@
 #ifndef PVRTCENCODER_SRC_IMAGE_H_
 #define PVRTCENCODER_SRC_IMAGE_H_
 
-#include "Base/include/TexCompTypes.h"
+#include "TexCompTypes.h"
 #include "PVRTCCompressor.h"
 
 namespace PVRTCC {
diff --git a/PVRTCEncoder/src/Pixel.h b/PVRTCEncoder/src/Pixel.h
index 05d037a..dc5a5b1 100644
--- a/PVRTCEncoder/src/Pixel.h
+++ b/PVRTCEncoder/src/Pixel.h
@@ -53,7 +53,7 @@
 #ifndef PVRTCENCODER_SRC_PIXEL_H_
 #define PVRTCENCODER_SRC_PIXEL_H_
 
-#include "Base/include/TexCompTypes.h"
+#include "TexCompTypes.h"
 
 namespace PVRTCC {
 
diff --git a/PVRTCEncoder/test/CMakeLists.txt b/PVRTCEncoder/test/CMakeLists.txt
index 5dd45b4..a027222 100644
--- a/PVRTCEncoder/test/CMakeLists.txt
+++ b/PVRTCEncoder/test/CMakeLists.txt
@@ -49,11 +49,10 @@
 # 
 # <http://gamma.cs.unc.edu/FasTC/>
 
-INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR})
-
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/include)
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/PVRTCEncoder/src)
 
+INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Base/include)
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/GTest/include)
 
 SET(TESTS
@@ -98,6 +97,7 @@ IF(PVRTEXLIB_FOUND)
   TARGET_LINK_LIBRARIES(${TEST_NAME} PVRTCEncoder)
   TARGET_LINK_LIBRARIES(${TEST_NAME} gtest_main)
   TARGET_LINK_LIBRARIES(${TEST_NAME} ${PVRTEXLIB_LIBRARIES} )
+  TARGET_LINK_LIBRARIES(${TEST_NAME} FasTCBase)
   TARGET_LINK_LIBRARIES(${TEST_NAME} FasTCIO)
   TARGET_LINK_LIBRARIES(${TEST_NAME} FasTCCore)
 
diff --git a/PVRTCEncoder/test/TestUtils.h b/PVRTCEncoder/test/TestUtils.h
index c25bb5e..9c371d3 100644
--- a/PVRTCEncoder/test/TestUtils.h
+++ b/PVRTCEncoder/test/TestUtils.h
@@ -53,7 +53,7 @@
 #ifndef PVRTCENCODER_TEST_TESTUTILS_H_
 #define PVRTCENCODER_TEST_TESTUTILS_H_
 
-#include "Base/include/TexCompTypes.h"
+#include "TexCompTypes.h"
 
 class PixelPrinter {
  private: