diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfe5724d7..476efb05f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@
 # SUCH DAMAGE.
 #
 
-project(usrsctplib)
+project(usrsctplib C)
 cmake_minimum_required(VERSION 3.0)
 
 # Debug build type as default
@@ -43,30 +43,6 @@ include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckCCompilerFlag)
 
-#################################################
-# CHECK OPTIONS
-#################################################
-
-option(sctp_invariants "Add runtime checks" 0)
-if (sctp_invariants)
-	add_definitions(-DINVARIANTS)
-endif ()
-
-option(sctp_debug "Provide debug information" 1)
-if (sctp_debug)
-	add_definitions(-DSCTP_DEBUG)
-endif ()
-
-option(sctp_inet "Support IPv4" 1)
-if (sctp_inet)
-	add_definitions(-DINET)
-endif ()
-
-option(sctp_inet6 "Support IPv6" 1)
-if (sctp_inet6)
-	add_definitions(-DINET6)
-endif ()
-
 option(sctp_werror "Treat warning as error" 1)
 
 option(sctp_link_programs_static "Link example programs static" 0)
@@ -81,158 +57,23 @@ if (sctp_sanitizer_address AND sctp_sanitizer_memory)
 	message(FATAL_ERROR "Can not compile with both sanitizer options")
 endif ()
 
-if (sctp_link_programs_static OR WIN32)
-	set(programs_link_library "usrsctp-static")
-else ()
-	set(programs_link_library "usrsctp")
-endif ()
-
 
-#################################################
-# CHECK FOR TYPES AND FUNCTIONS
-#################################################
-
-check_include_files("sys/queue.h" have_sys_queue_h)
-if (have_sys_queue_h)
-	add_definitions(-DHAVE_SYS_QUEUE_H)
-endif ()
-
-check_include_files("sys/socket.h;linux/if_addr.h" have_linux_if_addr_h)
-if (have_linux_if_addr_h)
-	add_definitions(-DHAVE_LINUX_IF_ADDR_H)
-endif ()
-
-check_include_files("sys/socket.h;linux/rtnetlink.h" have_linux_rtnetlink_h)
-if (have_linux_rtnetlink_h)
-	add_definitions(-DHAVE_LINUX_RTNETLINK_H)
-endif ()
-
-check_include_files("sys/types.h;netinet/in.h;netinet/ip.h;netinet/ip_icmp.h" have_netinet_ip_icmp_h)
-if (have_netinet_ip_icmp_h)
-	add_definitions(-DHAVE_NETINET_IP_ICMP_H)
-endif ()
-
-check_include_files("stdatomic.h" have_stdatomic_h)
-if (have_stdatomic_h)
-	add_definitions(-DHAVE_STDATOMIC_H)
-endif ()
 
 
 #################################################
 # CHECK STRUCT MEMBERS
 #################################################
 
-set(CMAKE_REQUIRED_INCLUDES "${CMAKE_SOURCE_DIR}/usrsctplib")
+#set(CMAKE_REQUIRED_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/usrsctplib")
 
-check_include_file(usrsctp.h have_usrsctp_h)
+check_include_file(${CMAKE_CURRENT_LIST_DIR}/usrsctplib/usrsctp.h have_usrsctp_h)
 if (NOT have_usrsctp_h)
 	message(FATAL_ERROR "usrsctp.h not found")
 endif ()
 
-check_struct_has_member("struct sockaddr" "sa_len" "sys/types.h;sys/socket.h" have_sa_len)
-if (have_sa_len)
-	message(STATUS "have_sa_len")
-	add_definitions(-DHAVE_SA_LEN)
-endif ()
-
-check_struct_has_member("struct sockaddr_in" "sin_len" "sys/types.h;netinet/in.h" have_sin_len)
-if (have_sin_len)
-	message(STATUS "have_sin_len")
-	add_definitions(-DHAVE_SIN_LEN)
-endif ()
 
-check_struct_has_member("struct sockaddr_in6" "sin6_len" "sys/types.h;netinet/in.h" have_sin6_len)
-if (have_sin6_len)
-	message(STATUS "have_sin6_len")
-	add_definitions(-DHAVE_SIN6_LEN)
-endif ()
-
-check_struct_has_member("struct sockaddr_conn" "sconn_len" "usrsctp.h" have_sconn_len)
-if (have_sconn_len)
-	message(STATUS "HAVE_SCONN_LEN")
-	add_definitions(-DHAVE_SCONN_LEN)
-endif ()
 
 
-#################################################
-# COMPILER SETTINGS
-#################################################
-
-# SETTINGS FOR UNIX COMPILER
-if (CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID MATCHES "AppleClang" OR CMAKE_C_COMPILER_ID MATCHES "GNU")
-	set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -std=c99 -pedantic -Wall -Wextra")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c99 -pedantic -Wall -Wextra")
-
-	check_c_compiler_flag(-Wfloat-equal has_wfloat_equal)
-	if (has_wfloat_equal)
-		set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wfloat-equal")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wfloat-equal")
-	endif ()
-
-	check_c_compiler_flag(-Wshadow has_wshadow)
-	if (has_wshadow)
-		set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wshadow")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
-	endif ()
-
-	check_c_compiler_flag(-Wpointer-arith has_wpointer_aritih)
-	if (has_wpointer_aritih)
-		set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wpointer-arith")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpointer-arith")
-	endif ()
-
-	check_c_compiler_flag(-Wunreachable-code has_wunreachable_code)
-	if (has_wunreachable_code)
-		set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wunreachable-code")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunreachable-code")
-	endif ()
-
-	check_c_compiler_flag(-Winit-self has_winit_self)
-	if (has_winit_self)
-		set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Winit-self")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Winit-self")
-	endif ()
-
-	check_c_compiler_flag(-Wno-unused-function has_wno_unused_function)
-	if (has_wno_unused_function)
-		set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wno-unused-function")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")
-	endif ()
-
-	check_c_compiler_flag(-Wno-unused-parameter has_wno_unused_parameter)
-	if (has_wno_unused_parameter)
-		set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wno-unused-parameter")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
-	endif ()
-
-	check_c_compiler_flag(-Wno-unreachable-code has_wno_unreachable_code)
-	if (has_wno_unreachable_code)
-		set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wno-unreachable-code")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unreachable-code")
-	endif ()
-
-	check_c_compiler_flag(-Wstrict-prototypes has_wstrict_prototypes)
-	if (has_wstrict_prototypes)
-		set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wstrict-prototypes")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-prototypes")
-	endif ()
-
-	if (sctp_werror)
-		set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Werror")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-	endif ()
-
-	if (sctp_sanitizer_address)
-		set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fsanitize=address -fno-omit-frame-pointer -g")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer -g")
-	endif ()
-
-	if (sctp_sanitizer_memory)
-		set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fsanitize=memory -fno-omit-frame-pointer -g -fsanitize-memory-track-origins")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=memory -fno-omit-frame-pointer -g -fsanitize-memory-track-origins")
-	endif ()
-endif ()
-
 # SETTINGS FOR VISUAL STUDIO COMPILER
 if (CMAKE_C_COMPILER_ID MATCHES "MSVC")
 	if (CMAKE_C_FLAGS MATCHES "/W[0-4]")
@@ -259,7 +100,6 @@ if (CMAKE_C_COMPILER_ID MATCHES "MSVC")
 	endif ()
 endif ()
 
-message(STATUS "Compiler flags (CMAKE_C_FLAGS): ${CMAKE_C_FLAGS}")
 
 
 #################################################
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index e81bc8e8e..b605f759b 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -91,7 +91,6 @@ set(check_programs
 	test_timer.c
 	tsctp.c
 )
-
 foreach (source_file ${check_programs})
 	get_filename_component(source_file_we ${source_file} NAME_WE)
 	add_executable(
@@ -101,7 +100,7 @@ foreach (source_file ${check_programs})
 
 	target_link_libraries(
 		${source_file_we}
-		${programs_link_library}
-		${CMAKE_THREAD_LIBS_INIT}
+		usrsctp
+		Threads::Threads
 	)
 endforeach ()
diff --git a/usrsctplib/CMakeLists.txt b/usrsctplib/CMakeLists.txt
index 595f529c2..cecccde50 100644
--- a/usrsctplib/CMakeLists.txt
+++ b/usrsctplib/CMakeLists.txt
@@ -87,59 +87,9 @@ endif ()
 # LIBRARY FILES
 #################################################
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
-list(APPEND usrsctp_root_headers
-	user_atomic.h
-	user_environment.h
-	user_inpcb.h
-	user_ip_icmp.h
-	user_ip6_var.h
-	user_malloc.h
-	user_mbuf.h
-	user_queue.h
-	user_recv_thread.h
-	user_route.h
-	user_socketvar.h
-	user_uma.h
-	usrsctp.h
-)
-
-list(APPEND usrsctp_netinet_headers
-	netinet/sctp_asconf.h
-	netinet/sctp_auth.h
-	netinet/sctp_bsd_addr.h
-	netinet/sctp_callout.h
-	netinet/sctp_constants.h
-	netinet/sctp_crc32.h
-	netinet/sctp_header.h
-	netinet/sctp_indata.h
-	netinet/sctp_input.h
-	netinet/sctp_lock_userspace.h
-	netinet/sctp_os_userspace.h
-	netinet/sctp_os.h
-	netinet/sctp_output.h
-	netinet/sctp_pcb.h
-	netinet/sctp_peeloff.h
-	netinet/sctp_process_lock.h
-	netinet/sctp_sha1.h
-	netinet/sctp_structs.h
-	netinet/sctp_sysctl.h
-	netinet/sctp_timer.h
-	netinet/sctp_uio.h
-	netinet/sctp_var.h
-	netinet/sctputil.h
-	netinet/sctp.h
-)
-
-list(APPEND usrsctp_netinet6_headers
-	netinet6/sctp6_var.h
-)
-
-list(APPEND usrsctp_headers
-	${usrsctp_root_headers}
-	${usrsctp_netinet_headers}
-	${usrsctp_netinet6_headers}
+list(APPEND usrsctp_include_dirs
+	${CMAKE_CURRENT_LIST_DIR}/netinet6/
+	${CMAKE_CURRENT_LIST_DIR}/netinet/
 )
 
 list(APPEND usrsctp_sources
@@ -167,28 +117,211 @@ list(APPEND usrsctp_sources
 	user_recv_thread.c
 	user_socket.c
 )
+#################################################
+# CHECK OPTIONAL DEFINITONS 
+################################################
+option(sctp_debug "Provide debug information" 1)
+if (sctp_debug)
+	list(APPEND public_defines SCTP_DEBUG)
+endif ()
 
-add_library(usrsctp SHARED ${usrsctp_sources} ${usrsctp_headers})
-add_library(usrsctp-static STATIC ${usrsctp_sources} ${usrsctp_headers})
+option(sctp_inet "Support IPv4" 1)
+if (sctp_inet)
+	list(APPEND public_defines INET)
+endif ()
 
-if (WIN32)
-	message(STATUS "link library: ws2_32")
-	target_link_libraries(usrsctp ws2_32)
-	target_link_libraries(usrsctp-static ws2_32)
+option(sctp_inet6 "Support IPv6" 1)
+if (sctp_inet6)
+	list(APPEND public_defines INET6)
+endif ()
+
+#################################################
+# CHECK FOR TYPES AND FUNCTIONS
+#################################################
+
+option(sctp_invariants "Add runtime checks" 0)
+if (sctp_invariants)
+	list(APPEND public_defines INVARIANTS)
+endif ()
+
+check_include_files("sys/queue.h" have_sys_queue_h)
+if (have_sys_queue_h)
+	list(APPEND private_defines HAVE_SYS_QUEUE_H)
+endif ()
+
+check_include_files("sys/socket.h;linux/if_addr.h" have_linux_if_addr_h)
+if (have_linux_if_addr_h)
+	list(APPEND private_defines HAVE_LINUX_IF_ADDR_H)
+endif ()
+
+check_include_files("sys/socket.h;linux/rtnetlink.h" have_linux_rtnetlink_h)
+if (have_linux_rtnetlink_h)
+	list(APPEND private_defines HAVE_LINUX_RTNETLINK_H)
+endif ()
+
+check_include_files("sys/types.h;netinet/in.h;netinet/ip.h;netinet/ip_icmp.h" have_netinet_ip_icmp_h)
+if (have_netinet_ip_icmp_h)
+	list(APPEND private_defines HAVE_NETINET_IP_ICMP_H)
+endif ()
+
+check_include_files("stdatomic.h" have_stdatomic_h)
+if (have_stdatomic_h)
+	list(APPEND private_defines HAVE_STDATOMIC_H)
+endif ()
+
+#################################################
+# CHECK STRUCT MEMBERS
+#################################################
+
+
+check_struct_has_member("struct sockaddr" "sa_len" "sys/types.h;sys/socket.h" have_sa_len)
+if (have_sa_len)
+	message(STATUS "have_sa_len")
+	list(APPEND public_defines HAVE_SA_LEN)
+endif ()
+
+check_struct_has_member("struct sockaddr_in" "sin_len" "sys/types.h;netinet/in.h" have_sin_len)
+if (have_sin_len)
+	message(STATUS "have_sin_len")
+	list(APPEND public_defines HAVE_SIN_LEN)
 endif ()
 
+check_struct_has_member("struct sockaddr_in6" "sin6_len" "sys/types.h;netinet/in.h" have_sin6_len)
+if (have_sin6_len)
+	message(STATUS "have_sin6_len")
+	list(APPEND public_defines HAVE_SIN6_LEN)
+endif ()
+
+check_struct_has_member("struct sockaddr_conn" "sconn_len" "usrsctp.h" have_sconn_len)
+if (have_sconn_len)
+	message(STATUS "HAVE_SCONN_LEN")
+	list(APPEND public_defines HAVE_SCONN_LEN)
+endif ()
+
+
+#################################################
+# COMPILER SETTINGS
+#################################################
+
+# SETTINGS FOR UNIX COMPILER
+if (CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID MATCHES "AppleClang" OR CMAKE_C_COMPILER_ID MATCHES "GNU")
+	#target_compile_features(usrsctp-lib PUBLIC c_std_99)
+	list(APPEND private_options -pedantic -Wall -Wextra)
+
+	check_c_compiler_flag(-Wfloat-equal has_wfloat_equal)
+	if (has_wfloat_equal)
+		list(APPEND private_options -Wfloat-equal)
+	endif ()
+
+	check_c_compiler_flag(-Wshadow has_wshadow)
+	if (has_wshadow)
+		list(APPEND private_options -Wshadow)
+	endif ()
+
+	check_c_compiler_flag(-Wpointer-arith has_wpointer_aritih)
+	if (has_wpointer_aritih)
+		list(APPEND private_options -Wpointer-arith)
+	endif ()
+
+	check_c_compiler_flag(-Wunreachable-code has_wunreachable_code)
+	if (has_wunreachable_code)
+		list(APPEND private_options -Wunreachable-code)
+	endif ()
+
+	check_c_compiler_flag(-Winit-self has_winit_self)
+	if (has_winit_self)
+		list(APPEND private_options -Winit-self)
+	endif ()
+
+	check_c_compiler_flag(-Wno-unused-function has_wno_unused_function)
+	if (has_wno_unused_function)
+		list(APPEND private_options -Wno-unused-function)
+	endif ()
+
+	check_c_compiler_flag(-Wno-unused-parameter has_wno_unused_parameter)
+	if (has_wno_unused_parameter)
+		list(APPEND private_options -Wno-unused-parameter)
+	endif ()
+
+	check_c_compiler_flag(-Wno-unreachable-code has_wno_unreachable_code)
+	if (has_wno_unreachable_code)
+		list(APPEND private_options -Wno-unreachable-code)
+	endif ()
+
+	check_c_compiler_flag(-Wstrict-prototypes has_wstrict_prototypes)
+	if (has_wstrict_prototypes)
+		list(APPEND private_options -Wstrict-prototypes)
+	endif ()
+
+	if (sctp_werror)
+		list(APPEND private_options -Werror)
+	endif ()
+
+	if (sctp_sanitizer_address)
+		list(APPEND private_options  -fsanitize=address -fno-omit-frame-pointer -g)
+	endif ()
+
+	if (sctp_sanitizer_memory)
+		list(APPEND private_options -fsanitize=memory -fno-omit-frame-pointer -g -fsanitize-memory-track-origins)
+	endif ()
+endif ()
+
+
+
+
+# shared and static libraries built from the same object files
+add_library(usrsctp-shared SHARED ${usrsctp_sources} )
+target_compile_options(usrsctp-shared PRIVATE ${private_options})
+target_compile_definitions(usrsctp-shared PUBLIC ${public_defines} ${private_defines})
+target_include_directories(usrsctp-shared PRIVATE ${CMAKE_CURRENT_LIST_DIR}/)
+target_include_directories(usrsctp-shared
+        INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/>
+        $<INSTALL_INTERFACE:include/>
+        PRIVATE ${CMAKE_CURRENT_LIST_DIR}/)
+
+add_library(usrsctp-static STATIC ${usrsctp_sources} )
+target_compile_options(usrsctp-static PRIVATE ${private_options})
+target_compile_definitions(usrsctp-static PUBLIC ${public_defines} ${private_defines})
+target_include_directories(usrsctp-static 
+	INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/>
+              $<INSTALL_INTERFACE:include/>
+	PRIVATE ${CMAKE_CURRENT_LIST_DIR}/)
+
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include/")
+configure_file(usrsctp.h ${CMAKE_CURRENT_BINARY_DIR}/include/usrsctp.h COPYONLY)
+# shared libraries need PIC
+set_target_properties(usrsctp-shared PROPERTIES POSITION_INDEPENDENT_CODE 1)
+#add_library(usrsctp-shared SHARED usrsctp-lib)
+#add_library(usrsctp-static STATIC usrsctp-lib)
 set_target_properties(usrsctp-static PROPERTIES OUTPUT_NAME "usrsctp")
-set_target_properties(usrsctp PROPERTIES IMPORT_SUFFIX "_import.lib")
-set_target_properties(usrsctp PROPERTIES SOVERSION 1 VERSION 1.0.0)
+set_target_properties(usrsctp-shared PROPERTIES IMPORT_SUFFIX "_import.lib")
+set_target_properties(usrsctp-shared PROPERTIES SOVERSION 1 VERSION 1.0.0)
 
+if (WIN32)
+	message(STATUS "link library: ws2_32")
+	target_link_libraries(usrsctp-shared PUBLIC ws2_32)
+	target_link_libraries(usrsctp-static PUBLIC ws2_32)
+endif ()
 if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
 	SET(CMAKE_INSTALL_LIBDIR lib)
 endif ()
+if (sctp_link_programs_static OR WIN32)
+	add_library(usrsctp ALIAS usrsctp-static)
+else ()
+	add_library(usrsctp ALIAS usrsctp-shared)
+endif ()
+
 
 
 #################################################
 # INSTALL LIBRARY AND HEADER
 #################################################
+install(TARGETS usrsctp-shared EXPORT usrsctpTargets 
+	LIBRARY DESTINATION lib)
+
+install(EXPORT usrsctpTargets
+	FILE usrsctpTargets.cmake
+	DESTINATION lib/cmake/usrsctp)
 
-install(TARGETS usrsctp usrsctp-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS usrsctp-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
 install(FILES usrsctp.h DESTINATION include)