diff --git a/ChangeLog b/ChangeLog
index 16c4f92659..8549ae8f9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-05-06  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* docs/gst/Makefile.am:
+	* docs/gst/gstreamer-docs.sgml:
+	* docs/gst/gstreamer-sections.txt:
+	* docs/gst/tmpl/gstatomic.sgml:
+	* docs/gst/tmpl/gstmemchunk.sgml:
+	* testsuite/elements/struct_i386.h:
+	* win32/GStreamer.vcproj:
+	* win32/Makefile:
+	  Purge GstAtomic stuff from docs and win32 makefiles as well
+
 2005-05-06  Wim Taymans  <wim@fluendo.com>
 
 	* gst/base/gstbasetransform.c: (gst_base_transform_proxy_getcaps):
diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am
index 8cdfedb5d1..8af749cf1b 100644
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -64,7 +64,6 @@ IGNORE_HFILES= \
 	gst-i18n-lib.h \
 	gst-i18n-app.h \
 	gst_private.h \
-	gstatomic_impl.h \
 	gstdata_private.h \
 	gstarch.h \
 	cothreads.h \
diff --git a/docs/gst/gstreamer-docs.sgml b/docs/gst/gstreamer-docs.sgml
index 7410e50b37..5a934fabb6 100644
--- a/docs/gst/gstreamer-docs.sgml
+++ b/docs/gst/gstreamer-docs.sgml
@@ -4,7 +4,6 @@
 <!ENTITY % version-entities SYSTEM "version.entities">
 %version-entities;
 <!ENTITY Gst SYSTEM "xml/gst.xml">
-<!ENTITY GstAtomic SYSTEM "xml/gstatomic.xml">
 <!ENTITY GstBin SYSTEM "xml/gstbin.xml">
 <!ENTITY GstBuffer SYSTEM "xml/gstbuffer.xml">
 <!ENTITY GstCaps SYSTEM "xml/gstcaps.xml">
@@ -153,7 +152,6 @@
       Theses elements support the gstreamer core and applications using it.
     </para>
 
-    &GstAtomic;
     &GstMacros;
     &GstMemChunk;
 
diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index 9931515ffa..871eee010d 100644
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -26,20 +26,6 @@ gst_main_quit
 #GstPoptOption
 </SECTION>
 
-<SECTION>
-<FILE>gstatomic</FILE>
-<TITLE>GstAtomic</TITLE>
-gst_vgint
-GstAtomicInt
-gst_atomic_int_init
-gst_atomic_int_destroy
-gst_atomic_int_set
-gst_atomic_int_read
-gst_atomic_int_add
-gst_atomic_int_inc
-gst_atomic_int_dec_and_test
-</SECTION>
-
 <SECTION>
 <FILE>gstbin</FILE>
 <TITLE>GstBin</TITLE>
diff --git a/docs/gst/tmpl/gstatomic.sgml b/docs/gst/tmpl/gstatomic.sgml
deleted file mode 100644
index 44d76c0136..0000000000
--- a/docs/gst/tmpl/gstatomic.sgml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GstAtomic
-
-<!-- ##### SECTION Short_Description ##### -->
-Functions that implement atomic operations.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Functions that implement atomic operations on a #GstAtomicInt structure. 
-Atomic operations are thread safe and don't use heavyweight locking mechanisms.
-</para>
-<para>
-These functions will be inlined in the GStreamer core but are available to plugins
-as external methods.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GstMemChunk
-</para>
-
-<!-- ##### FUNCTION gst_atomic_int_set ##### -->
-<para>
-Atomically set the value on the #GstAtomicInt.
-</para>
-
-@atomic_int: 
-@value: 
-<!-- # Unused Parameters # -->
-@aint: a #GstAtomicInt
-@val: The new value
-
-
diff --git a/docs/gst/tmpl/gstmemchunk.sgml b/docs/gst/tmpl/gstmemchunk.sgml
index 1d3bd10d6e..af74215f5b 100644
--- a/docs/gst/tmpl/gstmemchunk.sgml
+++ b/docs/gst/tmpl/gstmemchunk.sgml
@@ -18,7 +18,7 @@ The GstMemChunk is used to allocate critical resources for #GstBuffer and
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
-#GstAtomic, #GstBuffer, #GstEvent, #GstData
+#GstBuffer, #GstEvent, #GstData
 </para>
 
 <!-- ##### STRUCT GstMemChunk ##### -->
diff --git a/tests/old/testsuite/elements/struct_i386.h b/tests/old/testsuite/elements/struct_i386.h
index ec634cd47f..0ffa5bb631 100644
--- a/tests/old/testsuite/elements/struct_i386.h
+++ b/tests/old/testsuite/elements/struct_i386.h
@@ -2,8 +2,6 @@
 Struct list[] = {
   {"GstPoptOption", sizeof (GstPoptOption), 28}
   ,
-  {"GstAtomicInt", sizeof (GstAtomicInt), 8}
-  ,
   {"GstBuffer", sizeof (GstBuffer), 108}
   ,
   {"GstCaps", sizeof (GstCaps), 28}
diff --git a/testsuite/elements/struct_i386.h b/testsuite/elements/struct_i386.h
index ec634cd47f..0ffa5bb631 100644
--- a/testsuite/elements/struct_i386.h
+++ b/testsuite/elements/struct_i386.h
@@ -2,8 +2,6 @@
 Struct list[] = {
   {"GstPoptOption", sizeof (GstPoptOption), 28}
   ,
-  {"GstAtomicInt", sizeof (GstAtomicInt), 8}
-  ,
   {"GstBuffer", sizeof (GstBuffer), 108}
   ,
   {"GstCaps", sizeof (GstCaps), 28}
diff --git a/win32/GStreamer.vcproj b/win32/GStreamer.vcproj
index 090382c60d..5f0cecd1df 100644
--- a/win32/GStreamer.vcproj
+++ b/win32/GStreamer.vcproj
@@ -194,9 +194,6 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 			<File
 				RelativePath="..\gst\gst.c">
 			</File>
-			<File
-				RelativePath="..\gst\gstatomic.c">
-			</File>
 			<File
 				RelativePath="..\gst\gstbin.c">
 			</File>
@@ -349,9 +346,6 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 			<File
 				RelativePath="..\gst\gst.h">
 			</File>
-			<File
-				RelativePath="..\gst\gstatomic.h">
-			</File>
 			<File
 				RelativePath="..\gst\gstbufferpool-default.h">
 			</File>
diff --git a/win32/Makefile b/win32/Makefile
index 74219852f4..b11f771659 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -18,7 +18,7 @@ GLIB_DIR=..\..\glib
 #
 CXX  = cl /Tp
 CC   = cl /Tc
-SRC  = dirent.c $(SRC_DIR)\parse\grammar.tab.c $(SRC_DIR)\gst.c $(SRC_DIR)\gstatomic.c $(SRC_DIR)\gstbin.c $(SRC_DIR)\gstbuffer.c \
+SRC  = dirent.c $(SRC_DIR)\parse\grammar.tab.c $(SRC_DIR)\gst.c $(SRC_DIR)\gstbin.c $(SRC_DIR)\gstbuffer.c \
 $(SRC_DIR)\gstcaps.c $(SRC_DIR)\gstclock.c $(SRC_DIR)\gstcpu.c $(SRC_DIR)\gstdata.c $(SRC_DIR)\gstelement.c $(SRC_DIR)\gstelementfactory.c \
 $(SRC_DIR)\gstenumtypes.c $(SRC_DIR)\gsterror.c $(SRC_DIR)\gstevent.c $(SRC_DIR)\gstfilter.c $(SRC_DIR)\gstformat.c $(SRC_DIR)\gstindex.c \
 $(SRC_DIR)\gstinfo.c $(SRC_DIR)\gstmarshal.c $(SRC_DIR)\gstmemchunk.c $(SRC_DIR)\gstobject.c $(SRC_DIR)\gstpad.c $(SRC_DIR)\gstparse.c \
diff --git a/win32/vs7/GStreamer.vcproj b/win32/vs7/GStreamer.vcproj
index 090382c60d..5f0cecd1df 100644
--- a/win32/vs7/GStreamer.vcproj
+++ b/win32/vs7/GStreamer.vcproj
@@ -194,9 +194,6 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 			<File
 				RelativePath="..\gst\gst.c">
 			</File>
-			<File
-				RelativePath="..\gst\gstatomic.c">
-			</File>
 			<File
 				RelativePath="..\gst\gstbin.c">
 			</File>
@@ -349,9 +346,6 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 			<File
 				RelativePath="..\gst\gst.h">
 			</File>
-			<File
-				RelativePath="..\gst\gstatomic.h">
-			</File>
 			<File
 				RelativePath="..\gst\gstbufferpool-default.h">
 			</File>
diff --git a/win32/vs7/Makefile b/win32/vs7/Makefile
index 74219852f4..b11f771659 100644
--- a/win32/vs7/Makefile
+++ b/win32/vs7/Makefile
@@ -18,7 +18,7 @@ GLIB_DIR=..\..\glib
 #
 CXX  = cl /Tp
 CC   = cl /Tc
-SRC  = dirent.c $(SRC_DIR)\parse\grammar.tab.c $(SRC_DIR)\gst.c $(SRC_DIR)\gstatomic.c $(SRC_DIR)\gstbin.c $(SRC_DIR)\gstbuffer.c \
+SRC  = dirent.c $(SRC_DIR)\parse\grammar.tab.c $(SRC_DIR)\gst.c $(SRC_DIR)\gstbin.c $(SRC_DIR)\gstbuffer.c \
 $(SRC_DIR)\gstcaps.c $(SRC_DIR)\gstclock.c $(SRC_DIR)\gstcpu.c $(SRC_DIR)\gstdata.c $(SRC_DIR)\gstelement.c $(SRC_DIR)\gstelementfactory.c \
 $(SRC_DIR)\gstenumtypes.c $(SRC_DIR)\gsterror.c $(SRC_DIR)\gstevent.c $(SRC_DIR)\gstfilter.c $(SRC_DIR)\gstformat.c $(SRC_DIR)\gstindex.c \
 $(SRC_DIR)\gstinfo.c $(SRC_DIR)\gstmarshal.c $(SRC_DIR)\gstmemchunk.c $(SRC_DIR)\gstobject.c $(SRC_DIR)\gstpad.c $(SRC_DIR)\gstparse.c \