diff --git a/asio/.cvsignore b/asio/.gitignore
similarity index 65%
rename from asio/.cvsignore
rename to asio/.gitignore
index 97a8ffa..5d6164c 100644
--- a/asio/.cvsignore
+++ b/asio/.gitignore
@@ -2,14 +2,18 @@
 Makefile.in
 aclocal.m4
 autom4te.cache
+compile
+config.guess
 config.log
 config.status
+config.sub
 configure
 depcomp
 install-sh
-doc
-lib
-boostified
+missing
+/doc
+/lib
+/boostified
 *.gz
 *.bz2
 *.zip
diff --git a/asio/include/.cvsignore b/asio/include/.gitignore
similarity index 100%
rename from asio/include/.cvsignore
rename to asio/include/.gitignore
diff --git a/asio/include/asio/impl/.cvsignore b/asio/include/asio/impl/.cvsignore
deleted file mode 100644
index ec96903..0000000
--- a/asio/include/asio/impl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.deps
-.dirstamp
diff --git a/asio/src/.cvsignore b/asio/src/.gitignore
similarity index 62%
rename from asio/src/.cvsignore
rename to asio/src/.gitignore
index 84e0ea1..b4aa567 100644
--- a/asio/src/.cvsignore
+++ b/asio/src/.gitignore
@@ -1,4 +1,8 @@
 Makefile
 Makefile.in
 .deps
+*.a
+*.o
+*.obj
+*.lib
 *.pdb
diff --git a/asio/src/doc/.cvsignore b/asio/src/doc/.gitignore
similarity index 100%
rename from asio/src/doc/.cvsignore
rename to asio/src/doc/.gitignore
diff --git a/asio/src/examples/allocation/.cvsignore b/asio/src/examples/allocation/.gitignore
similarity index 85%
rename from asio/src/examples/allocation/.cvsignore
rename to asio/src/examples/allocation/.gitignore
index 8c96c1a..180ba88 100644
--- a/asio/src/examples/allocation/.cvsignore
+++ b/asio/src/examples/allocation/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 server
 *.ilk
diff --git a/asio/src/examples/buffers/.cvsignore b/asio/src/examples/buffers/.gitignore
similarity index 87%
rename from asio/src/examples/buffers/.cvsignore
rename to asio/src/examples/buffers/.gitignore
index ae24f54..abe68c6 100644
--- a/asio/src/examples/buffers/.cvsignore
+++ b/asio/src/examples/buffers/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 reference_counted
 *.ilk
diff --git a/asio/src/examples/chat/.cvsignore b/asio/src/examples/chat/.gitignore
similarity index 87%
rename from asio/src/examples/chat/.cvsignore
rename to asio/src/examples/chat/.gitignore
index 8d8c47d..0882fa6 100644
--- a/asio/src/examples/chat/.cvsignore
+++ b/asio/src/examples/chat/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *_server
 *_client
diff --git a/asio/src/examples/echo/.cvsignore b/asio/src/examples/echo/.gitignore
similarity index 87%
rename from asio/src/examples/echo/.cvsignore
rename to asio/src/examples/echo/.gitignore
index 8d8c47d..0882fa6 100644
--- a/asio/src/examples/echo/.cvsignore
+++ b/asio/src/examples/echo/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *_server
 *_client
diff --git a/asio/src/examples/http/client/.cvsignore b/asio/src/examples/http/client/.cvsignore
deleted file mode 100644
index b5e97f1..0000000
--- a/asio/src/examples/http/client/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.dirstamp
-*.exe
-*_client
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/services/.cvsignore b/asio/src/examples/http/client/.gitignore
similarity index 85%
copy from asio/src/examples/services/.cvsignore
copy to asio/src/examples/http/client/.gitignore
index 6d6f2b6..e80f510 100644
--- a/asio/src/examples/services/.cvsignore
+++ b/asio/src/examples/http/client/.gitignore
@@ -1,9 +1,10 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *_client
 *.ilk
 *.manifest
 *.pdb
 *.tds
-log.txt
diff --git a/asio/src/examples/http/server/.cvsignore b/asio/src/examples/http/server/.gitignore
similarity index 87%
rename from asio/src/examples/http/server/.cvsignore
rename to asio/src/examples/http/server/.gitignore
index 8d8c47d..0882fa6 100644
--- a/asio/src/examples/http/server/.cvsignore
+++ b/asio/src/examples/http/server/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *_server
 *_client
diff --git a/asio/src/examples/http/server2/.cvsignore b/asio/src/examples/http/server2/.cvsignore
deleted file mode 100644
index 8d8c47d..0000000
--- a/asio/src/examples/http/server2/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.dirstamp
-*.exe
-*_server
-*_client
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/http/server/.cvsignore b/asio/src/examples/http/server2/.gitignore
similarity index 87%
copy from asio/src/examples/http/server/.cvsignore
copy to asio/src/examples/http/server2/.gitignore
index 8d8c47d..0882fa6 100644
--- a/asio/src/examples/http/server/.cvsignore
+++ b/asio/src/examples/http/server2/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *_server
 *_client
diff --git a/asio/src/examples/http/server3/.cvsignore b/asio/src/examples/http/server3/.cvsignore
deleted file mode 100644
index 8d8c47d..0000000
--- a/asio/src/examples/http/server3/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.dirstamp
-*.exe
-*_server
-*_client
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/http/server/.cvsignore b/asio/src/examples/http/server3/.gitignore
similarity index 87%
copy from asio/src/examples/http/server/.cvsignore
copy to asio/src/examples/http/server3/.gitignore
index 8d8c47d..0882fa6 100644
--- a/asio/src/examples/http/server/.cvsignore
+++ b/asio/src/examples/http/server3/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *_server
 *_client
diff --git a/asio/src/examples/http/server4/.cvsignore b/asio/src/examples/http/server4/.cvsignore
deleted file mode 100644
index 5050d6c..0000000
--- a/asio/src/examples/http/server4/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.dirstamp
-*.exe
-*_server
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/http/server/.cvsignore b/asio/src/examples/http/server4/.gitignore
similarity index 87%
copy from asio/src/examples/http/server/.cvsignore
copy to asio/src/examples/http/server4/.gitignore
index 8d8c47d..0882fa6 100644
--- a/asio/src/examples/http/server/.cvsignore
+++ b/asio/src/examples/http/server4/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *_server
 *_client
diff --git a/asio/src/examples/icmp/.cvsignore b/asio/src/examples/icmp/.gitignore
similarity index 84%
rename from asio/src/examples/icmp/.cvsignore
rename to asio/src/examples/icmp/.gitignore
index 3790549..62ea912 100644
--- a/asio/src/examples/icmp/.cvsignore
+++ b/asio/src/examples/icmp/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 ping
 *.ilk
diff --git a/asio/src/examples/invocation/.cvsignore b/asio/src/examples/invocation/.gitignore
similarity index 87%
rename from asio/src/examples/invocation/.cvsignore
rename to asio/src/examples/invocation/.gitignore
index 18f1513..e5876b7 100644
--- a/asio/src/examples/invocation/.cvsignore
+++ b/asio/src/examples/invocation/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 prioritised_handlers
 *.ilk
diff --git a/asio/src/examples/iostreams/.cvsignore b/asio/src/examples/iostreams/.gitignore
similarity index 87%
rename from asio/src/examples/iostreams/.cvsignore
rename to asio/src/examples/iostreams/.gitignore
index f54aa9b..bc2b4f8 100644
--- a/asio/src/examples/iostreams/.cvsignore
+++ b/asio/src/examples/iostreams/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *_client
 *_server
diff --git a/asio/src/examples/local/.cvsignore b/asio/src/examples/local/.gitignore
similarity index 91%
rename from asio/src/examples/local/.cvsignore
rename to asio/src/examples/local/.gitignore
index ea38a86..688277b 100644
--- a/asio/src/examples/local/.cvsignore
+++ b/asio/src/examples/local/.gitignore
@@ -1,10 +1,12 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 connect_pair
-iostream_client
 stream_server
 stream_client
+iostream_client
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/multicast/.cvsignore b/asio/src/examples/multicast/.gitignore
similarity index 86%
rename from asio/src/examples/multicast/.cvsignore
rename to asio/src/examples/multicast/.gitignore
index 2128e0a..0c30ebd 100644
--- a/asio/src/examples/multicast/.cvsignore
+++ b/asio/src/examples/multicast/.gitignore
@@ -2,6 +2,8 @@
 .dirstamp
 receiver
 sender
+*.o
+*.obj
 *.exe
 *.ilk
 *.manifest
diff --git a/asio/src/examples/nonblocking/.cvsignore b/asio/src/examples/nonblocking/.gitignore
similarity index 86%
rename from asio/src/examples/nonblocking/.cvsignore
rename to asio/src/examples/nonblocking/.gitignore
index c710635..760e0dc 100644
--- a/asio/src/examples/nonblocking/.cvsignore
+++ b/asio/src/examples/nonblocking/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 third_party_lib
 *.ilk
diff --git a/asio/src/examples/porthopper/.cvsignore b/asio/src/examples/porthopper/.gitignore
similarity index 86%
copy from asio/src/examples/porthopper/.cvsignore
copy to asio/src/examples/porthopper/.gitignore
index a94effd..692ea7e 100644
--- a/asio/src/examples/porthopper/.cvsignore
+++ b/asio/src/examples/porthopper/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 client
 server
diff --git a/asio/src/examples/serialization/.cvsignore b/asio/src/examples/serialization/.cvsignore
deleted file mode 100644
index a94effd..0000000
--- a/asio/src/examples/serialization/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.dirstamp
-*.exe
-client
-server
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/porthopper/.cvsignore b/asio/src/examples/serialization/.gitignore
similarity index 86%
copy from asio/src/examples/porthopper/.cvsignore
copy to asio/src/examples/serialization/.gitignore
index a94effd..692ea7e 100644
--- a/asio/src/examples/porthopper/.cvsignore
+++ b/asio/src/examples/serialization/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 client
 server
diff --git a/asio/src/examples/services/.cvsignore b/asio/src/examples/services/.gitignore
similarity index 87%
rename from asio/src/examples/services/.cvsignore
rename to asio/src/examples/services/.gitignore
index 6d6f2b6..701b1b8 100644
--- a/asio/src/examples/services/.cvsignore
+++ b/asio/src/examples/services/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *_client
 *.ilk
diff --git a/asio/src/examples/socks4/.cvsignore b/asio/src/examples/socks4/.gitignore
similarity index 86%
rename from asio/src/examples/socks4/.cvsignore
rename to asio/src/examples/socks4/.gitignore
index f4436fe..e11e0de 100644
--- a/asio/src/examples/socks4/.cvsignore
+++ b/asio/src/examples/socks4/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 sync_client
 *.ilk
diff --git a/asio/src/examples/ssl/.cvsignore b/asio/src/examples/ssl/.cvsignore
deleted file mode 100644
index b328a34..0000000
--- a/asio/src/examples/ssl/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.dirstamp
-*.exe
-server
-client
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/porthopper/.cvsignore b/asio/src/examples/ssl/.gitignore
similarity index 86%
rename from asio/src/examples/porthopper/.cvsignore
rename to asio/src/examples/ssl/.gitignore
index a94effd..a678112 100644
--- a/asio/src/examples/porthopper/.cvsignore
+++ b/asio/src/examples/ssl/.gitignore
@@ -1,8 +1,10 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
-client
 server
+client
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/timeouts/.cvsignore b/asio/src/examples/timeouts/.gitignore
similarity index 86%
rename from asio/src/examples/timeouts/.cvsignore
rename to asio/src/examples/timeouts/.gitignore
index acd8e97..dda7f39 100644
--- a/asio/src/examples/timeouts/.cvsignore
+++ b/asio/src/examples/timeouts/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *_client
 server
diff --git a/asio/src/examples/timers/.cvsignore b/asio/src/examples/timers/.gitignore
similarity index 85%
rename from asio/src/examples/timers/.cvsignore
rename to asio/src/examples/timers/.gitignore
index 8bb7d7d..a3fe695 100644
--- a/asio/src/examples/timers/.cvsignore
+++ b/asio/src/examples/timers/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *timer
 *.ilk
diff --git a/asio/src/examples/tutorial/daytime1/.cvsignore b/asio/src/examples/tutorial/daytime1/.cvsignore
deleted file mode 100644
index 842ef50..0000000
--- a/asio/src/examples/tutorial/daytime1/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-client
-.deps
-.dirstamp
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/porthopper/.cvsignore b/asio/src/examples/tutorial/daytime1/.gitignore
similarity index 84%
copy from asio/src/examples/porthopper/.cvsignore
copy to asio/src/examples/tutorial/daytime1/.gitignore
index a94effd..2926eaf 100644
--- a/asio/src/examples/porthopper/.cvsignore
+++ b/asio/src/examples/tutorial/daytime1/.gitignore
@@ -1,8 +1,9 @@
+client
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
-client
-server
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/tutorial/daytime2/.cvsignore b/asio/src/examples/tutorial/daytime2/.cvsignore
deleted file mode 100644
index f57c87e..0000000
--- a/asio/src/examples/tutorial/daytime2/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-server
-.deps
-.dirstamp
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/porthopper/.cvsignore b/asio/src/examples/tutorial/daytime2/.gitignore
similarity index 84%
copy from asio/src/examples/porthopper/.cvsignore
copy to asio/src/examples/tutorial/daytime2/.gitignore
index a94effd..7f06efb 100644
--- a/asio/src/examples/porthopper/.cvsignore
+++ b/asio/src/examples/tutorial/daytime2/.gitignore
@@ -1,8 +1,9 @@
+server
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
-client
-server
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/tutorial/daytime3/.cvsignore b/asio/src/examples/tutorial/daytime3/.cvsignore
deleted file mode 100644
index f57c87e..0000000
--- a/asio/src/examples/tutorial/daytime3/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-server
-.deps
-.dirstamp
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/porthopper/.cvsignore b/asio/src/examples/tutorial/daytime3/.gitignore
similarity index 84%
copy from asio/src/examples/porthopper/.cvsignore
copy to asio/src/examples/tutorial/daytime3/.gitignore
index a94effd..7f06efb 100644
--- a/asio/src/examples/porthopper/.cvsignore
+++ b/asio/src/examples/tutorial/daytime3/.gitignore
@@ -1,8 +1,9 @@
+server
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
-client
-server
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/tutorial/daytime4/.cvsignore b/asio/src/examples/tutorial/daytime4/.cvsignore
deleted file mode 100644
index 842ef50..0000000
--- a/asio/src/examples/tutorial/daytime4/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-client
-.deps
-.dirstamp
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/porthopper/.cvsignore b/asio/src/examples/tutorial/daytime4/.gitignore
similarity index 84%
copy from asio/src/examples/porthopper/.cvsignore
copy to asio/src/examples/tutorial/daytime4/.gitignore
index a94effd..2926eaf 100644
--- a/asio/src/examples/porthopper/.cvsignore
+++ b/asio/src/examples/tutorial/daytime4/.gitignore
@@ -1,8 +1,9 @@
+client
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
-client
-server
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/tutorial/daytime5/.cvsignore b/asio/src/examples/tutorial/daytime5/.cvsignore
deleted file mode 100644
index f57c87e..0000000
--- a/asio/src/examples/tutorial/daytime5/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-server
-.deps
-.dirstamp
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/porthopper/.cvsignore b/asio/src/examples/tutorial/daytime5/.gitignore
similarity index 84%
copy from asio/src/examples/porthopper/.cvsignore
copy to asio/src/examples/tutorial/daytime5/.gitignore
index a94effd..7f06efb 100644
--- a/asio/src/examples/porthopper/.cvsignore
+++ b/asio/src/examples/tutorial/daytime5/.gitignore
@@ -1,8 +1,9 @@
+server
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
-client
-server
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/tutorial/daytime6/.cvsignore b/asio/src/examples/tutorial/daytime6/.cvsignore
deleted file mode 100644
index f57c87e..0000000
--- a/asio/src/examples/tutorial/daytime6/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-server
-.deps
-.dirstamp
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/porthopper/.cvsignore b/asio/src/examples/tutorial/daytime6/.gitignore
similarity index 84%
copy from asio/src/examples/porthopper/.cvsignore
copy to asio/src/examples/tutorial/daytime6/.gitignore
index a94effd..7f06efb 100644
--- a/asio/src/examples/porthopper/.cvsignore
+++ b/asio/src/examples/tutorial/daytime6/.gitignore
@@ -1,8 +1,9 @@
+server
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
-client
-server
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/tutorial/daytime7/.cvsignore b/asio/src/examples/tutorial/daytime7/.cvsignore
deleted file mode 100644
index f57c87e..0000000
--- a/asio/src/examples/tutorial/daytime7/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-server
-.deps
-.dirstamp
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/porthopper/.cvsignore b/asio/src/examples/tutorial/daytime7/.gitignore
similarity index 84%
copy from asio/src/examples/porthopper/.cvsignore
copy to asio/src/examples/tutorial/daytime7/.gitignore
index a94effd..7f06efb 100644
--- a/asio/src/examples/porthopper/.cvsignore
+++ b/asio/src/examples/tutorial/daytime7/.gitignore
@@ -1,8 +1,9 @@
+server
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
-client
-server
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/tutorial/timer1/.cvsignore b/asio/src/examples/tutorial/timer1/.gitignore
similarity index 76%
rename from asio/src/examples/tutorial/timer1/.cvsignore
rename to asio/src/examples/tutorial/timer1/.gitignore
index fe4742f..1d47ca6 100644
--- a/asio/src/examples/tutorial/timer1/.cvsignore
+++ b/asio/src/examples/tutorial/timer1/.gitignore
@@ -1,6 +1,9 @@
 timer
 .deps
 .dirstamp
+*.o
+*.obj
+*.exe
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/tutorial/timer2/.cvsignore b/asio/src/examples/tutorial/timer2/.gitignore
similarity index 76%
rename from asio/src/examples/tutorial/timer2/.cvsignore
rename to asio/src/examples/tutorial/timer2/.gitignore
index fe4742f..1d47ca6 100644
--- a/asio/src/examples/tutorial/timer2/.cvsignore
+++ b/asio/src/examples/tutorial/timer2/.gitignore
@@ -1,6 +1,9 @@
 timer
 .deps
 .dirstamp
+*.o
+*.obj
+*.exe
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/tutorial/timer3/.cvsignore b/asio/src/examples/tutorial/timer3/.gitignore
similarity index 76%
rename from asio/src/examples/tutorial/timer3/.cvsignore
rename to asio/src/examples/tutorial/timer3/.gitignore
index fe4742f..1d47ca6 100644
--- a/asio/src/examples/tutorial/timer3/.cvsignore
+++ b/asio/src/examples/tutorial/timer3/.gitignore
@@ -1,6 +1,9 @@
 timer
 .deps
 .dirstamp
+*.o
+*.obj
+*.exe
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/tutorial/timer4/.cvsignore b/asio/src/examples/tutorial/timer4/.gitignore
similarity index 76%
rename from asio/src/examples/tutorial/timer4/.cvsignore
rename to asio/src/examples/tutorial/timer4/.gitignore
index fe4742f..1d47ca6 100644
--- a/asio/src/examples/tutorial/timer4/.cvsignore
+++ b/asio/src/examples/tutorial/timer4/.gitignore
@@ -1,6 +1,9 @@
 timer
 .deps
 .dirstamp
+*.o
+*.obj
+*.exe
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/tutorial/timer5/.cvsignore b/asio/src/examples/tutorial/timer5/.gitignore
similarity index 76%
rename from asio/src/examples/tutorial/timer5/.cvsignore
rename to asio/src/examples/tutorial/timer5/.gitignore
index fe4742f..1d47ca6 100644
--- a/asio/src/examples/tutorial/timer5/.cvsignore
+++ b/asio/src/examples/tutorial/timer5/.gitignore
@@ -1,6 +1,9 @@
 timer
 .deps
 .dirstamp
+*.o
+*.obj
+*.exe
 *.ilk
 *.manifest
 *.pdb
diff --git a/asio/src/examples/windows/.cvsignore b/asio/src/examples/windows/.gitignore
similarity index 85%
rename from asio/src/examples/windows/.cvsignore
rename to asio/src/examples/windows/.gitignore
index 8c96c1a..180ba88 100644
--- a/asio/src/examples/windows/.cvsignore
+++ b/asio/src/examples/windows/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 server
 *.ilk
diff --git a/asio/src/tests/.cvsignore b/asio/src/tests/.gitignore
similarity index 85%
rename from asio/src/tests/.cvsignore
rename to asio/src/tests/.gitignore
index d0a436e..67a8d24 100644
--- a/asio/src/tests/.cvsignore
+++ b/asio/src/tests/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *_test
 *.ilk
diff --git a/asio/src/tests/latency/.cvsignore b/asio/src/tests/latency/.gitignore
similarity index 86%
rename from asio/src/tests/latency/.cvsignore
rename to asio/src/tests/latency/.gitignore
index f6c306b..feea55d 100644
--- a/asio/src/tests/latency/.cvsignore
+++ b/asio/src/tests/latency/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *client
 *server
diff --git a/asio/src/tests/performance/.cvsignore b/asio/src/tests/performance/.cvsignore
deleted file mode 100644
index a94effd..0000000
--- a/asio/src/tests/performance/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.dirstamp
-*.exe
-client
-server
-*.ilk
-*.manifest
-*.pdb
-*.tds
diff --git a/asio/src/examples/porthopper/.cvsignore b/asio/src/tests/performance/.gitignore
similarity index 86%
copy from asio/src/examples/porthopper/.cvsignore
copy to asio/src/tests/performance/.gitignore
index a94effd..692ea7e 100644
--- a/asio/src/examples/porthopper/.cvsignore
+++ b/asio/src/tests/performance/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 client
 server
diff --git a/asio/src/tests/unit/.cvsignore b/asio/src/tests/unit/.gitignore
similarity index 76%
rename from asio/src/tests/unit/.cvsignore
rename to asio/src/tests/unit/.gitignore
index ffe25dd..db16231 100644
--- a/asio/src/tests/unit/.cvsignore
+++ b/asio/src/tests/unit/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *.ilk
 *.manifest
@@ -7,15 +9,20 @@
 *.tds
 basic_datagram_socket
 basic_deadline_timer
+basic_raw_socket
+basic_seq_packet_socket
 basic_serial_port
+basic_signal_set
 basic_socket_acceptor
 basic_stream_socket
+basic_streambuf
 buffer
 buffered_read_stream
 buffered_stream
 buffered_write_stream
 buffers_iterator
 completion_condition
+connect
 datagram_socket_service
 deadline_timer
 deadline_timer_service
@@ -25,16 +32,21 @@
 is_read_buffered
 is_write_buffered
 placeholders
+raw_socket_service
 read
 read_at
 read_until
+seq_packet_socket_service
 serial_port
 serial_port_base
 serial_port_service
+signal_set
+signal_set_service
 socket_acceptor_service
 socket_base
 strand
 stream_socket_service
+streambuf
 thread
 time_traits
 write
diff --git a/asio/src/tests/unit/ip/.cvsignore b/asio/src/tests/unit/ip/.gitignore
similarity index 96%
rename from asio/src/tests/unit/ip/.cvsignore
rename to asio/src/tests/unit/ip/.gitignore
index 32654f2..2a63f03 100644
--- a/asio/src/tests/unit/ip/.cvsignore
+++ b/asio/src/tests/unit/ip/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *.ilk
 *.manifest
diff --git a/asio/src/tests/unit/local/.cvsignore b/asio/src/tests/unit/local/.gitignore
similarity index 91%
rename from asio/src/tests/unit/local/.cvsignore
rename to asio/src/tests/unit/local/.gitignore
index a7fa2cb..f2d0faf 100644
--- a/asio/src/tests/unit/local/.cvsignore
+++ b/asio/src/tests/unit/local/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *.ilk
 *.manifest
diff --git a/asio/src/tests/unit/posix/.cvsignore b/asio/src/tests/unit/posix/.gitignore
similarity index 93%
rename from asio/src/tests/unit/posix/.cvsignore
rename to asio/src/tests/unit/posix/.gitignore
index 4738f58..af4bde6 100644
--- a/asio/src/tests/unit/posix/.cvsignore
+++ b/asio/src/tests/unit/posix/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *.ilk
 *.manifest
diff --git a/asio/src/tests/unit/ssl/.cvsignore b/asio/src/tests/unit/ssl/.gitignore
similarity index 93%
rename from asio/src/tests/unit/ssl/.cvsignore
rename to asio/src/tests/unit/ssl/.gitignore
index 3c61470..439863e 100644
--- a/asio/src/tests/unit/ssl/.cvsignore
+++ b/asio/src/tests/unit/ssl/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *.ilk
 *.manifest
diff --git a/asio/src/tests/unit/windows/.cvsignore b/asio/src/tests/unit/windows/.gitignore
similarity index 95%
rename from asio/src/tests/unit/windows/.cvsignore
rename to asio/src/tests/unit/windows/.gitignore
index 4b31e7c..f52cbd9 100644
--- a/asio/src/tests/unit/windows/.cvsignore
+++ b/asio/src/tests/unit/windows/.gitignore
@@ -1,5 +1,7 @@
 .deps
 .dirstamp
+*.o
+*.obj
 *.exe
 *.ilk
 *.manifest