diff --git a/pico/pico/memory.c b/pico/pico/pico_memory.c
similarity index 100%
rename from pico/pico/memory.c
rename to pico/pico/pico_memory.c
diff --git a/pico/pico/pico.c b/pico/pico/pico_pico.c
similarity index 100%
rename from pico/pico/pico.c
rename to pico/pico/pico_pico.c
diff --git a/platform/common/common.mak b/platform/common/common.mak
index d19f16ac..3c0a5127 100644
--- a/platform/common/common.mak
+++ b/platform/common/common.mak
@@ -104,7 +104,7 @@ else
 DEFINES += NO_32X
 endif
 # Pico
-SRCS_COMMON += $(R)pico/pico/pico.c $(R)pico/pico/memory.c $(R)pico/pico/xpcm.c
+SRCS_COMMON += $(R)pico/pico/pico_pico.c $(R)pico/pico/pico_memory.c $(R)pico/pico/xpcm.c
 # carthw
 SRCS_COMMON += $(R)pico/carthw/carthw.c
 # SVP
diff --git a/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj b/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj
index b792e1af..35e309d8 100644
--- a/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj
+++ b/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj
@@ -116,6 +116,9 @@
     <ClCompile Include="..\..\..\..\pico\mode4.c" />
     <ClCompile Include="..\..\..\..\pico\patch.c" />
     <ClCompile Include="..\..\..\..\pico\pico.c" />
+    <ClCompile Include="..\..\..\..\pico\pico\pico_memory.c" />
+    <ClCompile Include="..\..\..\..\pico\pico\pico_pico.c" />
+    <ClCompile Include="..\..\..\..\pico\pico\xpcm.c" />
     <ClCompile Include="..\..\..\..\pico\sek.c" />
     <ClCompile Include="..\..\..\..\pico\sms.c" />
     <ClCompile Include="..\..\..\..\pico\sound\mix.c" />
@@ -147,4 +150,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters b/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
index b9fd7053..44573abc 100644
--- a/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
+++ b/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
@@ -64,6 +64,9 @@
     <Filter Include="Source Files\cpu\sh2\mame">
       <UniqueIdentifier>{dd1911b8-6d08-42aa-ab21-0ba1154613e1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\pico\pico">
+      <UniqueIdentifier>{a635c355-0290-4923-84c6-8290ea8b0065}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libretro.c">
@@ -210,9 +213,6 @@
     <ClCompile Include="..\..\..\..\pico\32x\32x.c">
       <Filter>Source Files\pico\32x</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\pico\32x\draw.c">
-      <Filter>Source Files\pico\32x</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\pico\32x\32x_memory.c">
       <Filter>Source Files\pico\32x</Filter>
     </ClCompile>
@@ -261,5 +261,17 @@
     <ClCompile Include="..\..\..\..\cpu\sh2\mame\sh2pico.c">
       <Filter>Source Files\cpu\sh2\mame</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\32x\32x_draw.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\pico\pico_memory.c">
+      <Filter>Source Files\pico\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\pico\pico_pico.c">
+      <Filter>Source Files\pico\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\pico\xpcm.c">
+      <Filter>Source Files\pico\pico</Filter>
+    </ClCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file