diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b6453871..ae85a4ed 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@ project(rtphone)
 
  
 # Rely on C++ 17
-set (CMAKE_CXX_STANDARD 17)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set (rtphone_libs libs)
@@ -17,9 +17,7 @@ option (USE_MUSL        "Build with MUSL library"               OFF)
 # PIC code by default
 set (CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-if (NOT DEFINED LIB_PLATFORM)
-    set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/../../libraries)
-endif()
+set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/libs/libraries)
 include (${LIB_PLATFORM}/platform_libs.cmake)
 
 message("Libraries: ${LIB_PLATFORM}")
diff --git a/src/engine/audio/CMakeLists.txt b/src/engine/audio/CMakeLists.txt
index 2eb2e050..13e06348 100644
--- a/src/engine/audio/CMakeLists.txt
+++ b/src/engine/audio/CMakeLists.txt
@@ -1,7 +1,7 @@
 project (audio_lib)
 
 # Rely on C++ 11
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/src/engine/helper/CMakeLists.txt b/src/engine/helper/CMakeLists.txt
index ba84ca13..5c1c965b 100644
--- a/src/engine/helper/CMakeLists.txt
+++ b/src/engine/helper/CMakeLists.txt
@@ -5,7 +5,7 @@ project (helper_lib)
 set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set (CMAKE_POSITION_INDEPENDENT_CODE OFF)
+set (CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 file (GLOB HELPER_LIB_SOURCES "*.cpp" "*.h")
 
@@ -15,4 +15,6 @@ set_property(TARGET helper_lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<C
 # Private include directories
 target_include_directories(helper_lib PUBLIC ../../libs/ ../../engine ../ .)
 target_compile_definitions(helper_lib PRIVATE -D_CRT_SECURE_NO_WARNINGS -D_UNICODE)
-target_link_libraries(helper_lib PUBLIC uuid)
+if (TARGET_LINUX)
+target_link_libraries (helper_lib PUBLIC uuid)
+endif()
\ No newline at end of file
diff --git a/src/engine/media/CMakeLists.txt b/src/engine/media/CMakeLists.txt
index e26c004c..a4d54ac5 100644
--- a/src/engine/media/CMakeLists.txt
+++ b/src/engine/media/CMakeLists.txt
@@ -1,7 +1,11 @@
 project (media_lib)
 
-# Rely on C++ 11
-set (CMAKE_CXX_STANDARD 11)
+if (NOT DEFINED LIB_PLATFORM)
+    message(FATAL_ERROR media_lib project requires LIB_PLATFORM to be set - it uses libraries from that directory)
+endif()
+
+# Rely on C++ 20
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Produce PIC code always
@@ -48,7 +52,7 @@ add_library(media_lib ${SOURCES})
 set (LIBS_CODEC)
 
 if (USE_AMR_CODEC)
-    include (../../../../libraries/platform_libs.cmake)
+    include (${LIB_PLATFORM}/platform_libs.cmake)
     message("Media: AMR NB and WB codecs will be included.")
     target_compile_definitions(media_lib PUBLIC USE_AMR_CODEC)
     list (APPEND LIBS_CODEC ${OPENCORE_AMRNB} ${OPENCORE_AMRWB})
diff --git a/src/libs/g722/CMakeLists.txt b/src/libs/g722/CMakeLists.txt
index 7febbc9f..23ca1f26 100644
--- a/src/libs/g722/CMakeLists.txt
+++ b/src/libs/g722/CMakeLists.txt
@@ -1,7 +1,7 @@
 project (g722_codec)
 
 # Rely on C++ 11
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/src/libs/gsmhr/CMakeLists.txt b/src/libs/gsmhr/CMakeLists.txt
index b5c13ff3..fb25bde2 100644
--- a/src/libs/gsmhr/CMakeLists.txt
+++ b/src/libs/gsmhr/CMakeLists.txt
@@ -1,7 +1,7 @@
 project (gsmhr_codec)
 
 # Rely on C++ 11
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/src/libs/ice/CMakeLists.txt b/src/libs/ice/CMakeLists.txt
index ab300b7a..705f8f64 100644
--- a/src/libs/ice/CMakeLists.txt
+++ b/src/libs/ice/CMakeLists.txt
@@ -1,7 +1,7 @@
 project (ice_stack)
 
 # Rely on C++ 17
-set (CMAKE_CXX_STANDARD 17)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/src/libs/libg729/CMakeLists.txt b/src/libs/libg729/CMakeLists.txt
index 13f24cf2..f7def763 100644
--- a/src/libs/libg729/CMakeLists.txt
+++ b/src/libs/libg729/CMakeLists.txt
@@ -1,7 +1,7 @@
 project (g729)
 
 # Rely on C++ 11
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/src/libs/libgsm/CMakeLists.txt b/src/libs/libgsm/CMakeLists.txt
index 21f4fdae..b248d40d 100644
--- a/src/libs/libgsm/CMakeLists.txt
+++ b/src/libs/libgsm/CMakeLists.txt
@@ -1,7 +1,7 @@
 project (gsm_codec)
 
 # Rely on C++ 11
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/src/libs/resiprocate b/src/libs/resiprocate
index 44e04f27..4aa84430 160000
--- a/src/libs/resiprocate
+++ b/src/libs/resiprocate
@@ -1 +1 @@
-Subproject commit 44e04f27e61f8cae5d019fd994d9d949d37c9b4a
+Subproject commit 4aa84430a14153a6666ab925e5fe22edae53127b
diff --git a/src/libs/speexdsp/CMakeLists.txt b/src/libs/speexdsp/CMakeLists.txt
index 24fd1ed4..4c03a8b1 100644
--- a/src/libs/speexdsp/CMakeLists.txt
+++ b/src/libs/speexdsp/CMakeLists.txt
@@ -1,7 +1,7 @@
 project (speexdsp)
 
 # Rely on C++ 11
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/src/libs/srtp/CMakeLists.txt b/src/libs/srtp/CMakeLists.txt
index 892b2e04..a65aeb85 100644
--- a/src/libs/srtp/CMakeLists.txt
+++ b/src/libs/srtp/CMakeLists.txt
@@ -1,7 +1,7 @@
 project (srtp)
 
 # Rely on C++ 11
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)