diff --git a/.gitignore b/.gitignore
index 8c247f64..37fd9e10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,14 +4,8 @@
 *.vspscc
 /ext_libs/Debug
 /ext_libs/Release
-<<<<<<< HEAD
-<<<<<<< HEAD
 /ext_libs/*.exp
 /ext_libs/*.lib
-=======
->>>>>>> Tossed in missing files
-=======
->>>>>>> Tossed in missing files
 /fb2k/Debug
 /fb2k/Release
 /src/Debug
diff --git a/ext_libs/libg7221_decode.exp b/ext_libs/libg7221_decode.exp
deleted file mode 100644
index f5dba32e..00000000
Binary files a/ext_libs/libg7221_decode.exp and /dev/null differ
diff --git a/ext_libs/libg7221_decode.lib b/ext_libs/libg7221_decode.lib
deleted file mode 100644
index 902ba554..00000000
Binary files a/ext_libs/libg7221_decode.lib and /dev/null differ
diff --git a/ext_libs/libmpg123-0.exp b/ext_libs/libmpg123-0.exp
deleted file mode 100644
index c3c4f506..00000000
Binary files a/ext_libs/libmpg123-0.exp and /dev/null differ
diff --git a/ext_libs/libmpg123-0.lib b/ext_libs/libmpg123-0.lib
deleted file mode 100644
index 512bd0eb..00000000
Binary files a/ext_libs/libmpg123-0.lib and /dev/null differ
diff --git a/ext_libs/libvorbis.exp b/ext_libs/libvorbis.exp
deleted file mode 100644
index 836febef..00000000
Binary files a/ext_libs/libvorbis.exp and /dev/null differ
diff --git a/ext_libs/libvorbis.lib b/ext_libs/libvorbis.lib
deleted file mode 100644
index 93d73e0a..00000000
Binary files a/ext_libs/libvorbis.lib and /dev/null differ