diff --git a/Workspace_msvc/lib_dec.vcxproj.filters b/Workspace_msvc/lib_dec.vcxproj.filters
index b916d743c959dfdc028a67cc88001e74892c5246..ef14ddf0e47f22646d686d7263637b5628af85e2 100644
--- a/Workspace_msvc/lib_dec.vcxproj.filters
+++ b/Workspace_msvc/lib_dec.vcxproj.filters
@@ -439,9 +439,6 @@
     <ClCompile Include="..\lib_dec\lead_deindexing.c">
       <Filter>decoder_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\lib_dec.c">
-      <Filter>decoder_all_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_dec\lp_exc_d.c">
       <Filter>decoder_all_c</Filter>
     </ClCompile>
@@ -520,6 +517,7 @@
     <ClCompile Include="..\lib_dec\waveadjust_fec_dec.c">
       <Filter>decoder_all_c</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib_dec\lib_dec.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\lib_dec\ivas_stat_dec.h">
@@ -558,9 +556,7 @@
     <ClInclude Include="..\lib_dec\rom_dec.h">
       <Filter>decoder_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_dec\lib_dec.h">
-      <Filter>decoder_h</Filter>
-    </ClInclude>
+    <ClInclude Include="..\lib_dec\lib_dec.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="decoder_all_c">
diff --git a/Workspace_msvc/lib_enc.vcxproj.filters b/Workspace_msvc/lib_enc.vcxproj.filters
index b15d61431f876896a9325af8c3b270dce4f76ea2..e74f441c4c7902d05da6850e2642eebf15c1208e 100644
--- a/Workspace_msvc/lib_enc.vcxproj.filters
+++ b/Workspace_msvc/lib_enc.vcxproj.filters
@@ -590,10 +590,12 @@
     <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc.c">
       <Filter>enc_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_osba_enc.c" />
     <ClCompile Include="..\lib_enc\ivas_omasa_enc.c">
       <Filter>enc_ivas_c</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_osba_enc.c">
+      <Filter>enc_ivas_c</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\lib_enc\ivas_stat_enc.h">
@@ -624,4 +626,4 @@
       <UniqueIdentifier>{6cccabbe-510f-43d3-90e1-8ed5ea3837d7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/lib_rend/ivas_splitRendererPLC.c b/lib_rend/ivas_splitRendererPLC.c
index dcdd515b6f790aca719bf229f1ce1d28cd8d6469..3753787df7ed50d9f84946272c626ed306c6398a 100644
--- a/lib_rend/ivas_splitRendererPLC.c
+++ b/lib_rend/ivas_splitRendererPLC.c
@@ -30,9 +30,9 @@
 
 *******************************************************************************************************/
 
+#include <stdint.h>
 #include "options.h"
 #ifdef SPLIT_REND_WITH_HEAD_ROT
-#include <stdint.h>
 #include <math.h>
 #include "ivas_prot.h"
 #include "prot.h"
diff --git a/lib_rend/ivas_splitRenderer_utils.c b/lib_rend/ivas_splitRenderer_utils.c
index af0672445b671ea7f56a1e1cce66ab4d3c96836f..ceaa3642f4e462463010777f3cc61ce46207d1c1 100644
--- a/lib_rend/ivas_splitRenderer_utils.c
+++ b/lib_rend/ivas_splitRenderer_utils.c
@@ -30,9 +30,9 @@
 
 *******************************************************************************************************/
 
+#include <stdint.h>
 #include "options.h"
 #ifdef SPLIT_REND_WITH_HEAD_ROT
-#include <stdint.h>
 #include <math.h>
 #include "ivas_prot.h"
 #include "prot.h"
diff --git a/lib_util/split_rend_bfi_file_reader.c b/lib_util/split_rend_bfi_file_reader.c
index 64ec04738e36a3d8d0049f428e2a79376cf9240f..66f0a17ecee72eb9e3f7b7937f914dae8d657858 100644
--- a/lib_util/split_rend_bfi_file_reader.c
+++ b/lib_util/split_rend_bfi_file_reader.c
@@ -30,13 +30,13 @@
 
 *******************************************************************************************************/
 
+#include <stdint.h>
 #include "options.h"
 #ifdef SPLIT_REND_WITH_HEAD_ROT
 #include "split_rend_bfi_file_reader.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
 #include "prot.h"
 
 struct SplitRendBFIFileReader
diff --git a/lib_util/split_render_file_read_write.c b/lib_util/split_render_file_read_write.c
index d81d49482863d9a421062ddcda65cf6681291922..5028ac88bb34a0df25efc22a840641bb132a6f31 100644
--- a/lib_util/split_render_file_read_write.c
+++ b/lib_util/split_render_file_read_write.c
@@ -30,12 +30,12 @@
 
 *******************************************************************************************************/
 
+#include <stdint.h>
 #include "options.h"
 #ifdef SPLIT_REND_WITH_HEAD_ROT
 #include "split_render_file_read_write.h"
 #include <ctype.h>
 #include <string.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include "cmdl_tools.h"