diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18b0219..0b1ac0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -301,16 +301,16 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL Linux)
     endif()
 endif()
 
-option(WITH_STATIC "Compile static linked library" OFF)
-if(WITH_STATIC)
-    add_library(${LIBRARY_NAME} STATIC ${SRC_FILES} ${SRC_ADDITIONAL_FILES})
-    target_link_libraries(${LIBRARY_NAME} ${LINK_LIBS})
-else()
-    add_library(${LIBRARY_NAME} SHARED ${SRC_FILES} ${SRC_ADDITIONAL_FILES})
-    target_link_libraries(${LIBRARY_NAME} ${LINK_LIBS})
+option(BUILD_SHARED_LIBS "Compile shared libraries" OFF)
+
+add_library(${LIBRARY_NAME} ${SRC_FILES} ${SRC_ADDITIONAL_FILES})
+target_link_libraries(${LIBRARY_NAME} ${LINK_LIBS})
+target_compile_definitions(${LIBRARY_NAME} PUBLIC -D__STORMLIB_NO_AUTO_LINK__) #CMake should take care of the linking
+target_include_directories(${LIBRARY_NAME} PUBLIC include/)
+set_target_properties(${LIBRARY_NAME} PROPERTIES PUBLIC_HEADER "include/StormLib.h;include/StormPort.h")
+if(BUILD_SHARED_LIBS)
     if(APPLE)
         set_target_properties(${LIBRARY_NAME} PROPERTIES FRAMEWORK true)
-        set_target_properties(${LIBRARY_NAME} PROPERTIES PUBLIC_HEADER "src/StormLib.h src/StormPort.h")
         set_target_properties(${LIBRARY_NAME} PROPERTIES LINK_FLAGS "-framework Carbon")
     endif()
     if(UNIX)
@@ -326,37 +326,42 @@ else()
     if(WIN32)
         set_target_properties(${LIBRARY_NAME} PROPERTIES OUTPUT_NAME StormLib)
     endif()
+endif()
+install(TARGETS ${LIBRARY_NAME} 
+	RUNTIME DESTINATION bin 
+	LIBRARY DESTINATION lib 
+	ARCHIVE DESTINATION lib 
+	FRAMEWORK DESTINATION /Library/Frameworks
+	PUBLIC_HEADER DESTINATION include
+	INCLUDES DESTINATION include)
 
-    install(TARGETS ${LIBRARY_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib FRAMEWORK DESTINATION /Library/Frameworks)
-
-    #CPack configurtion
-    SET(CPACK_GENERATOR "DEB" "RPM")
-    SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
-    SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPQ manipulation library")
-    SET(CPACK_PACKAGE_VENDOR "Ladislav Zezula")
-    SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
-    SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
-    SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
-    SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
+#CPack configurtion
+SET(CPACK_GENERATOR "DEB" "RPM")
+SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPQ manipulation library")
+SET(CPACK_PACKAGE_VENDOR "Ladislav Zezula")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
+SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
+SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
 
-    #DEB configuration
-    SET(CPACK_DEBIAN_PACKAGE_SECTION "libs")
-    SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://www.zezula.net/en/mpq/stormlib.html")
-    SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "imbacen@gmail.com")
-    SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
-    SET(CPACK_DEBIAN_PACKAGE_DEPENDS "zlib1g,bzip2")
+#DEB configuration
+SET(CPACK_DEBIAN_PACKAGE_SECTION "libs")
+SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://www.zezula.net/en/mpq/stormlib.html")
+SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "imbacen@gmail.com")
+SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
+SET(CPACK_DEBIAN_PACKAGE_DEPENDS "zlib1g,bzip2")
 
-    #RPM configuration
-    SET(CPACK_RPM_PACKAGE_RELEASE 1)
-    SET(CPACK_RPM_PACKAGE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    SET(CPACK_RPM_PACKAGE_GROUP "${PROJECT_NAME}")
-    SET(CPACK_RPM_PACKAGE_URL "http://www.zezula.net/en/mpq/stormlib.html")
-    SET(CPACK_RPM_PACKAGE_REQUIRES "zlib,bzip2")
+#RPM configuration
+SET(CPACK_RPM_PACKAGE_RELEASE 1)
+SET(CPACK_RPM_PACKAGE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+SET(CPACK_RPM_PACKAGE_GROUP "${PROJECT_NAME}")
+SET(CPACK_RPM_PACKAGE_URL "http://www.zezula.net/en/mpq/stormlib.html")
+SET(CPACK_RPM_PACKAGE_REQUIRES "zlib,bzip2")
 
-    INCLUDE(CPack)
+INCLUDE(CPack)
 
-endif()
 
 option(WITH_TEST "Compile Test application" OFF)
 if(WITH_TEST)
diff --git a/Makefile.linux b/Makefile.linux
index ff81e98..e9ffdf6 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -24,7 +24,7 @@ AR = ar
 DFLAGS = -D__SYS_ZLIB
 OFLAGS =
 LFLAGS = -lbz2 -lz
-CFLAGS = -fPIC -D_7ZIP_ST
+CFLAGS = -fPIC -D_7ZIP_ST -Iinclude
 CFLAGS += $(OFLAGS) $(DFLAGS)
 
 OBJS =  src/adpcm/adpcm.o \
@@ -292,6 +292,6 @@ all: $(LIB)
 install: $(LIB)
 	install $(LIB) /usr/local/lib
 	mkdir -p /usr/local/include/StormLib
-	cp src/StormLib.h /usr/local/include/StormLib
-	cp src/StormPort.h /usr/local/include/StormLib
+	cp include/StormLib.h /usr/local/include/StormLib
+	cp include/StormPort.h /usr/local/include/StormLib
 	ldconfig
diff --git a/Makefile.mac b/Makefile.mac
index b5c59db..4c65510 100644
--- a/Makefile.mac
+++ b/Makefile.mac
@@ -10,7 +10,7 @@
 
 CPP    = g++
 CC     = gcc
-CFLAGS = -Wall
+CFLAGS = -Wall -Iinclude
 LFLAGS = -lbz2 -lz -framework Carbon
 ARCH = -arch x86_64
 DFLAGS = -D__SYS_BZLIB -D__SYS_ZLIB -D_7ZIP_ST
diff --git a/Premake5.lua b/Premake5.lua
index 8805a62..ad996d5 100644
--- a/Premake5.lua
+++ b/Premake5.lua
@@ -22,6 +22,8 @@ solution 'StormLib'
         'src/pklib/crc32.c',
         'src/zlib/compress.c',
     }
+	
+	includedirs { "include" }
 
     filter 'configurations:Debug*'
         flags { 'Symbols' }
diff --git a/StormLib_vs12.vcxproj b/StormLib_vs12.vcxproj
index 5de4e81..d56978b 100644
--- a/StormLib_vs12.vcxproj
+++ b/StormLib_vs12.vcxproj
@@ -313,6 +313,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -334,6 +335,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -352,6 +354,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -373,6 +376,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -389,6 +393,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -408,6 +413,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -424,6 +430,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -443,6 +450,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -461,6 +469,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -482,6 +491,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -500,6 +510,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -521,6 +532,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -537,6 +549,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -556,6 +569,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -572,6 +586,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -591,6 +606,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -606,8 +622,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\StormCommon.h" />
-    <ClInclude Include="src\StormLib.h" />
-    <ClInclude Include="src\StormPort.h" />
+    <ClInclude Include="include\StormLib.h" />
+    <ClInclude Include="include\StormPort.h" />
     <ClInclude Include="src\adpcm\adpcm.h" />
     <ClInclude Include="src\huffman\huff.h" />
     <ClInclude Include="src\pklib\pklib.h" />
diff --git a/StormLib_vs12.vcxproj.filters b/StormLib_vs12.vcxproj.filters
index ffbc876..a532132 100644
--- a/StormLib_vs12.vcxproj.filters
+++ b/StormLib_vs12.vcxproj.filters
@@ -80,10 +80,10 @@
     <ClInclude Include="src\StormCommon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\StormLib.h">
+    <ClInclude Include="include\StormLib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\StormPort.h">
+    <ClInclude Include="include\StormPort.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\adpcm\adpcm.h">
diff --git a/StormLib_vs15.vcxproj b/StormLib_vs15.vcxproj
index 75d3b01..62c3081 100644
--- a/StormLib_vs15.vcxproj
+++ b/StormLib_vs15.vcxproj
@@ -314,6 +314,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -335,6 +336,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -353,6 +355,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -374,6 +377,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -390,6 +394,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -409,6 +414,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -425,6 +431,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -444,6 +451,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -462,6 +470,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -483,6 +492,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -501,6 +511,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -522,6 +533,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -538,6 +550,8 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -557,6 +571,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -573,6 +588,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -592,6 +608,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -607,8 +624,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\StormCommon.h" />
-    <ClInclude Include="src\StormLib.h" />
-    <ClInclude Include="src\StormPort.h" />
+    <ClInclude Include="include\StormLib.h" />
+    <ClInclude Include="include\StormPort.h" />
     <ClInclude Include="src\adpcm\adpcm.h" />
     <ClInclude Include="src\huffman\huff.h" />
     <ClInclude Include="src\pklib\pklib.h" />
diff --git a/StormLib_vs15.vcxproj.filters b/StormLib_vs15.vcxproj.filters
index ffbc876..a532132 100644
--- a/StormLib_vs15.vcxproj.filters
+++ b/StormLib_vs15.vcxproj.filters
@@ -80,10 +80,10 @@
     <ClInclude Include="src\StormCommon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\StormLib.h">
+    <ClInclude Include="include\StormLib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\StormPort.h">
+    <ClInclude Include="include\StormPort.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\adpcm\adpcm.h">
diff --git a/src/StormLib.h b/include/StormLib.h
similarity index 99%
rename from src/StormLib.h
rename to include/StormLib.h
index b6df481..f2a59c6 100644
--- a/src/StormLib.h
+++ b/include/StormLib.h
@@ -98,7 +98,7 @@ extern "C" {
 //  Z - S for static-linked CRT library, D for multithreaded DLL CRT library
 //
 
-#if defined(_MSC_VER) && !defined(__STORMLIB_SELF__)
+#if defined(_MSC_VER) && !defined(__STORMLIB_NO_AUTO_LINK__)
   
   #ifdef _DEBUG                                 // DEBUG VERSIONS
     #ifndef _UNICODE                            
diff --git a/src/StormPort.h b/include/StormPort.h
similarity index 100%
rename from src/StormPort.h
rename to include/StormPort.h
diff --git a/makefile.w32 b/makefile.w32
index a32019d..da3bd8d 100644
--- a/makefile.w32
+++ b/makefile.w32
@@ -10,7 +10,7 @@
 
 CC        = @gcc
 CPP       = @g++
-CFLAGS    = -Wall
+CFLAGS    = -Wall -Iinclude
 DFLAGS    = -D_7ZIP_ST
 EXELFLAGS = -s -Wl,--subsystem,console -lwininet
 DLLLFLAGS = -shared -lwininet
diff --git a/src/FileStream.cpp b/src/FileStream.cpp
index 1e88b63..68454fb 100644
--- a/src/FileStream.cpp
+++ b/src/FileStream.cpp
@@ -13,8 +13,8 @@
 /* 11.06.10  1.00  Lad  Derived from StormPortMac.cpp and StormPortLinux.cpp */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 #include "FileStream.h"
 
diff --git a/src/SBaseCommon.cpp b/src/SBaseCommon.cpp
index aa891df..86a62c8 100644
--- a/src/SBaseCommon.cpp
+++ b/src/SBaseCommon.cpp
@@ -11,8 +11,8 @@
 /* 06.09.10  1.01  Lad  Renamed to SBaseCommon.cpp                           */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 char StormLibCopyright[] = "StormLib v " STORMLIB_VERSION_STRING " Copyright Ladislav Zezula 1998-2014";
diff --git a/src/SBaseDumpData.cpp b/src/SBaseDumpData.cpp
index 334561b..10f6256 100644
--- a/src/SBaseDumpData.cpp
+++ b/src/SBaseDumpData.cpp
@@ -9,7 +9,7 @@
 /*****************************************************************************/
 
 #define __STORMLIB_SELF__
-#include "StormLib.h"
+#include <StormLib.h>
 #include "StormCommon.h"
 
 #ifdef __STORMLIB_DUMP_DATA__
diff --git a/src/SBaseFileTable.cpp b/src/SBaseFileTable.cpp
index c7a26aa..a84c784 100644
--- a/src/SBaseFileTable.cpp
+++ b/src/SBaseFileTable.cpp
@@ -8,8 +8,8 @@
 /* 06.09.10  1.00  Lad  The first version of SBaseFileTable.cpp              */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/SBaseSubTypes.cpp b/src/SBaseSubTypes.cpp
index 47c205e..a92856f 100644
--- a/src/SBaseSubTypes.cpp
+++ b/src/SBaseSubTypes.cpp
@@ -8,8 +8,8 @@
 /* 02.11.11  1.00  Lad  The first version of SBaseSubTypes.cpp               */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 /*****************************************************************************/
diff --git a/src/SCompression.cpp b/src/SCompression.cpp
index d706a6f..82eacef 100644
--- a/src/SCompression.cpp
+++ b/src/SCompression.cpp
@@ -12,8 +12,8 @@
 /* 19.11.03  1.01  Dan  Big endian handling                                  */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/SFileAddFile.cpp b/src/SFileAddFile.cpp
index 0b70d35..798b7f5 100644
--- a/src/SFileAddFile.cpp
+++ b/src/SFileAddFile.cpp
@@ -9,8 +9,8 @@
 /* 21.04.13  1.01  Dea  AddFile callback now part of TMPQArchive             */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/SFileAttributes.cpp b/src/SFileAttributes.cpp
index d58426c..d9f812d 100644
--- a/src/SFileAttributes.cpp
+++ b/src/SFileAttributes.cpp
@@ -8,8 +8,8 @@
 /* 12.06.04  1.00  Lad  The first version of SAttrFile.cpp                   */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/SFileCompactArchive.cpp b/src/SFileCompactArchive.cpp
index 2895baa..55a74e1 100644
--- a/src/SFileCompactArchive.cpp
+++ b/src/SFileCompactArchive.cpp
@@ -10,8 +10,8 @@
 /* 21.04.13  1.02  Dea  Compact callback now part of TMPQArchive             */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 /*****************************************************************************/
diff --git a/src/SFileCreateArchive.cpp b/src/SFileCreateArchive.cpp
index 47354fe..243cab0 100644
--- a/src/SFileCreateArchive.cpp
+++ b/src/SFileCreateArchive.cpp
@@ -9,8 +9,8 @@
 /* 08.06.10  1.00  Lad  Renamed to SFileCreateArchive.cpp                    */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/SFileExtractFile.cpp b/src/SFileExtractFile.cpp
index cabde49..64be8d3 100644
--- a/src/SFileExtractFile.cpp
+++ b/src/SFileExtractFile.cpp
@@ -8,8 +8,8 @@
 /* 20.06.03  1.00  Lad  The first version of SFileExtractFile.cpp            */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 bool WINAPI SFileExtractFile(HANDLE hMpq, const char * szToExtract, const TCHAR * szExtracted, DWORD dwSearchScope)
diff --git a/src/SFileFindFile.cpp b/src/SFileFindFile.cpp
index 18bf4d5..c66e454 100644
--- a/src/SFileFindFile.cpp
+++ b/src/SFileFindFile.cpp
@@ -8,8 +8,8 @@
 /* 25.03.03  1.00  Lad  The first version of SFileFindFile.cpp               */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/SFileGetFileInfo.cpp b/src/SFileGetFileInfo.cpp
index 365dce5..cebbcf4 100644
--- a/src/SFileGetFileInfo.cpp
+++ b/src/SFileGetFileInfo.cpp
@@ -8,8 +8,8 @@
 /* 30.11.13  1.00  Lad  The first version of SFileGetFileInfo.cpp            */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/SFileListFile.cpp b/src/SFileListFile.cpp
index 3918bd9..546825f 100644
--- a/src/SFileListFile.cpp
+++ b/src/SFileListFile.cpp
@@ -8,8 +8,8 @@
 /* 12.06.04  1.00  Lad  The first version of SListFile.cpp                   */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 #include <assert.h>
 
diff --git a/src/SFileOpenArchive.cpp b/src/SFileOpenArchive.cpp
index 62effe7..29232af 100644
--- a/src/SFileOpenArchive.cpp
+++ b/src/SFileOpenArchive.cpp
@@ -13,8 +13,8 @@
 /* 19.11.03  1.01  Dan  Big endian handling                                  */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 #define HEADER_SEARCH_BUFFER_SIZE   0x1000
diff --git a/src/SFileOpenFileEx.cpp b/src/SFileOpenFileEx.cpp
index 9ce0ae2..5751b7e 100644
--- a/src/SFileOpenFileEx.cpp
+++ b/src/SFileOpenFileEx.cpp
@@ -8,8 +8,8 @@
 /* xx.xx.99  1.00  Lad  The first version of SFileOpenFileEx.cpp             */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 /*****************************************************************************/
diff --git a/src/SFilePatchArchives.cpp b/src/SFilePatchArchives.cpp
index 37b4612..d1a3f93 100644
--- a/src/SFilePatchArchives.cpp
+++ b/src/SFilePatchArchives.cpp
@@ -8,8 +8,8 @@
 /* 18.08.10  1.00  Lad  The first version of SFilePatchArchives.cpp          */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/SFileReadFile.cpp b/src/SFileReadFile.cpp
index 485b361..58763f1 100644
--- a/src/SFileReadFile.cpp
+++ b/src/SFileReadFile.cpp
@@ -9,8 +9,8 @@
 /* 24.03.99  1.00  Lad  Added the SFileGetFileInfo function                  */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/SFileVerify.cpp b/src/SFileVerify.cpp
index e68d51a..98aabe9 100644
--- a/src/SFileVerify.cpp
+++ b/src/SFileVerify.cpp
@@ -13,8 +13,8 @@
 /* 04.05.10  1.00  Lad  The first version of SFileVerify.cpp                 */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
-#include "StormLib.h"
+#define __STORMLIB_NO_AUTO_LINK__
+#include <StormLib.h>
 #include "StormCommon.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/adpcm/adpcm.cpp b/src/adpcm/adpcm.cpp
index e3741b6..7c6f48a 100644
--- a/src/adpcm/adpcm.cpp
+++ b/src/adpcm/adpcm.cpp
@@ -13,7 +13,7 @@
 /* 10.01.13  3.00  Lad  Refactored, beautified, documented :-)               */
 /*****************************************************************************/
 
-#include "../StormPort.h"
+#include <StormPort.h>
 #include "adpcm.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/adpcm/adpcm_old.h b/src/adpcm/adpcm_old.h
index beb9615..7b76aff 100644
--- a/src/adpcm/adpcm_old.h
+++ b/src/adpcm/adpcm_old.h
@@ -14,7 +14,7 @@
 //-----------------------------------------------------------------------------
 // Functions
 
-#include "../StormPort.h"
+#include <StormPort.h>
 
 int  CompressADPCM  (unsigned char * pbOutBuffer, int dwOutLength, short * pwInBuffer, int dwInLength, int nCmpType, int nChannels);
 int  DecompressADPCM(unsigned char * pbOutBuffer, int dwOutLength, unsigned char * pbInBuffer, int dwInLength, int nChannels);
diff --git a/src/huffman/huff.cpp b/src/huffman/huff.cpp
index 1636a80..d2552a0 100644
--- a/src/huffman/huff.cpp
+++ b/src/huffman/huff.cpp
@@ -19,7 +19,7 @@
 #include <assert.h>
 #include <string.h>
  
-#include "../StormPort.h"
+#include <StormPort.h>
 #include "huff.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/pklib/pklib.h b/src/pklib/pklib.h
index f43da15..56508f1 100644
--- a/src/pklib/pklib.h
+++ b/src/pklib/pklib.h
@@ -11,7 +11,7 @@
 #ifndef __PKLIB_H__
 #define __PKLIB_H__
 
-#include "../StormPort.h"
+#include <StormPort.h>
 
 //-----------------------------------------------------------------------------
 // Defines
diff --git a/src/sparse/sparse.h b/src/sparse/sparse.h
index b1cd872..eb996e1 100644
--- a/src/sparse/sparse.h
+++ b/src/sparse/sparse.h
@@ -11,7 +11,7 @@
 #ifndef __SPARSE_H__
 #define __SPARSE_H__
 
-#include "../StormPort.h"
+#include <StormPort.h>
 
 void CompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer);
 int  DecompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer);