diff --git a/.gitignore b/.gitignore
index da020a729..f00897cab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,8 +29,11 @@ stamp-marshal
 /cogl-pango/cogl-pango.rc
 /cogl/cogl.rc
 /cogl/cogl-defines.h
+/cogl/cogl-defines.h.win32
+/cogl/cogl-defines.h.win32_SDL
 /cogl/cogl-enum-types.c
 /cogl/cogl-enum-types.h
+/cogl/cogl-gl-header.h
 config.h
 config.h.in
 config.h.win32
@@ -38,36 +41,25 @@ config.log
 config.status
 configure
 depcomp
-/doc/reference/cogl/cogl-*.txt
-!/doc/reference/cogl/cogl-sections.txt
-/doc/reference/cogl/html
-/doc/reference/cogl/tmpl
-/doc/reference/cogl/xml
-/doc/reference/cogl/cogl.args
-/doc/reference/cogl/cogl.hierarchy
-/doc/reference/cogl/cogl.interfaces
-/doc/reference/cogl/cogl.prerequisites
-/doc/reference/cogl/cogl.signals
-/doc/reference/cogl/cogl-docs.xml
-/doc/reference/cogl/*.stamp
-/doc/reference/cogl/*.bak
-/doc/reference/cogl-2.0-experimental/cogl-*.txt
-!/doc/reference/cogl-2.0-experimental/cogl-sections.txt
-/doc/reference/cogl-2.0-experimental/html
-/doc/reference/cogl-2.0-experimental/tmpl
-/doc/reference/cogl-2.0-experimental/xml
-/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental.args
-/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental.hierarchy
-/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental.interfaces
-/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental.prerequisites
-/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental.signals
-/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml
-/doc/reference/cogl-2.0-experimental/*.stamp
-/doc/reference/cogl-2.0-experimental/*.bak
+/doc/reference/cogl2/cogl2-*.txt
+!/doc/reference/cogl2/cogl2-sections.txt
+/doc/reference/cogl2/html
+/doc/reference/cogl2/tmpl
+/doc/reference/cogl2/xml
+/doc/reference/cogl2/cogl2.args
+/doc/reference/cogl2/cogl2.hierarchy
+/doc/reference/cogl2/cogl2.interfaces
+/doc/reference/cogl2/cogl2.prerequisites
+/doc/reference/cogl2/cogl2.signals
+/doc/reference/cogl2/cogl2-docs.xml
+/doc/reference/cogl2/*.stamp
+/doc/reference/cogl2/*.bak
 /examples/cogl-crate
+/examples/cogl-gles2-context
 /examples/cogl-hello
 /examples/cogl-info
 /examples/cogl-msaa
+/examples/cogl-sdl-hello
 /examples/cogl-x11-foreign
 /examples/cogl-x11-tfp
 /examples/cogland
@@ -84,6 +76,7 @@ TAGS
 /tests/interactive/wrapper.sh
 /tests/conform/*.bat
 /tests/conform/config.env
+/tests/micro-perf/test-journal
 /po/POTFILES
 /po/*.gmo
 /po/Makefile.in.in