diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 4688312..5991521 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -11,7 +11,7 @@ if(BUILD_SHARED_LIBS)
 endif()
 
 if(WIN32)
-    set(64BIT 0)
+    set(64BIT 1)
 else()
     set(64BIT 1)
 endif()
@@ -104,21 +104,21 @@ if(WIN32)
     set(ZLIB_INCLUDE ${CMAKE_SOURCE_DIR}/_deps/zlib)
 
     add_subdirectory(_deps/freetype)
-    #add_subdirectory(_deps/libjpeg-turbo)
+    add_subdirectory(_deps/libjpeg-turbo)
     #add_subdirectory(_deps/libmpg123)
     add_subdirectory(_deps/libpng)
     #add_subdirectory(_deps/libpq)
     add_subdirectory(_deps/zlib)
 
     set(FREETYPE_LINK freetype_shared)
-    #set(LIBJPEG_LINK jpegturbo_static)
+    set(LIBJPEG_LINK jpegturbo_static)
     #set(LIBMPG123_LINK libmpg123_static)
     set(LIBPNG_LINK libpng_static)
     #set(LIBPQ_LINK libpq_shared)
     set(ZLIB_LINK zlib_static)
 else()
     set(FREETYPE_LINK freetype)
-    #set(LIBJPEG_LINK jpeg)
+    set(LIBJPEG_LINK jpeg)
     #set(LIBMPG123_LINK mpg123)
     set(LIBPNG_LINK png)
     #set(LIBPQ_LINK pq)
diff --git a/library/formats/CMakeLists.txt b/library/formats/CMakeLists.txt
index 5a626d1..85d7da1 100644
--- a/library/formats/CMakeLists.txt
+++ b/library/formats/CMakeLists.txt
@@ -29,10 +29,13 @@ if(WIN32)
 endif()
 
 #include_directories(${FILEHANDLER_INCLUDE} ${LIBMPG123_INCLUDE} ${LIBJPEGTURBO_INCLUDE} ${LIBPNG_INCLUDE})
-include_directories(${FILEHANDLER_INCLUDE} ${LIBPNG_INCLUDE})
+include_directories(${FILEHANDLER_INCLUDE} ${LIBJPEGTURBO_INCLUDE} ${LIBPNG_INCLUDE})
+#TODO-JIP: hack, include vars are not set properly
+include_directories( "../_deps/libjpeg-turbo" )
 
 set(FILEHANDLER_LIB)
 if(BUILD_SHARED_LIBS)
+    # BUILD_SHARED_LIBS
     add_library(FileHandler_shared SHARED ${FILEHANDLER_SOURCES})
     if(WIN32)
         set_target_properties(FileHandler_shared PROPERTIES OUTPUT_NAME "FileHandler${FILEHANDLER_SERIES}")
@@ -57,6 +60,4 @@ else()
     target_link_libraries(FileHandler_static far_static iff_static ${LIBJPEG_LINK} ${LIBMPG123_LINK} ${LIBPNG_LINK} ${ZLIB_LINK})
 
     set(FILEHANDLER_LIB FileHandler_static)
-endif() # BUILD_SHARED_LIBS
-
-target_link_libraries(${FILEHANDLER_LIB} far_static iff_static ${LIBJPEG_LINK} ${LIBMPG123_LINK} ${LIBPNG_LINK} ${ZLIB_LINK})
+endif()
diff --git a/library/formats/Image.cpp b/library/formats/Image.cpp
index b214005..d1cbc57 100644
--- a/library/formats/Image.cpp
+++ b/library/formats/Image.cpp
@@ -17,8 +17,8 @@
 */
 
 #include "FileHandler.h"
-//#include <jpeglib.h>
-//#include <jerror.h>
+#include <jpeglib.h>
+#include <jerror.h>
 #include <png.h>
 #include <setjmp.h> //Used for libpng
 #include "bmp/read_bmp.h"
@@ -120,7 +120,6 @@ static uint8_t * ReadBMP(Image_t * Image, const uint8_t * InData, size_t FileSiz
 
 
 // libjpeg-turbo v6 doesn't support jpeg_mem_src, so we have to implement it here
-/*
 static void term_source(j_decompress_ptr){}
 static int fill_mem_input_buffer(j_decompress_ptr cinfo){
     ERREXIT(cinfo, JERR_FILE_READ);
@@ -137,10 +136,8 @@ static void skip_input_data(j_decompress_ptr cinfo, long bytes)
     src->next_input_byte += bytes;
     src->bytes_in_buffer -= bytes;
 }
-*/
 
 static uint8_t * ReadJPG(Image_t * Image, const uint8_t * InData, size_t FileSize){
-    /*
     //Initialize
     jpeg_decompress_struct cinfo;
     jpeg_error_mgr jerr;
@@ -201,8 +198,6 @@ static uint8_t * ReadJPG(Image_t * Image, const uint8_t * InData, size_t FileSiz
         Image->Data = OutData;
     }
     return OutData;
-    */
-   return NULL;
 }
 
 struct pngdata_t {
diff --git a/library/formats/filehandler.h b/library/formats/filehandler.h
index 07163d9..9b82a32 100644
--- a/library/formats/filehandler.h
+++ b/library/formats/filehandler.h
@@ -82,9 +82,9 @@ namespace File {
     extern int Error;
     extern size_t FileSize;
 
-    fhexport uint8_t * ReadFile(const char * Filename);
-    fhexport Image_t * ReadImageFile(const char * Filename);
-    fhexport Sound_t * ReadSoundFile(const char * Filename);
+    uint8_t * ReadFile(const char * Filename);
+    Image_t * ReadImageFile(const char * Filename);
+    Sound_t * ReadSoundFile(const char * Filename);
 }
 
 #endif
\ No newline at end of file