diff --git a/glib/Makefile.am b/glib/Makefile.am
index f5c510d..95c71de 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -6,10 +6,8 @@ include $(top_srcdir)/Makefile.decl
 
 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
 
-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-DIST_SUBDIRS = $(SUBDIRS) build
-
-bin_SCRIPTS = glib-gettextize
+SUBDIRS = . m4macros glib
+DIST_SUBDIRS = $(SUBDIRS)
 
 AM_CPPFLAGS = 					\
 	-DG_LOG_DOMAIN=g_log_domain_glib 	\
@@ -18,85 +16,18 @@ AM_CPPFLAGS = 					\
 	-DGLIB_COMPILATION
 
 EXTRA_DIST += 			\
-	ChangeLog.pre-2-20	\
-	ChangeLog.pre-2-18	\
-	ChangeLog.pre-2-16	\
-	ChangeLog.pre-2-14	\
-	ChangeLog.pre-2-12	\
-	ChangeLog.pre-2-10	\
-	ChangeLog.pre-2-8	\
-	ChangeLog.pre-2-6	\
-	ChangeLog.pre-2-4	\
-	ChangeLog.pre-2-2	\
-	ChangeLog.pre-2-0	\
-	ChangeLog.pre-1-2	\
-	glib-zip.in		\
-	NEWS.pre-1-3		\
 	acglib.m4		\
-	sanity_check		\
-	README.commits		\
 	README.in		\
-	INSTALL.in		\
-	README.win32		\
-	HACKING			\
-	autogen.sh		\
 	Makefile.decl		\
-	mkinstalldirs		\
-	makefile.msc		\
-	msvc_recommended_pragmas.h \
-	config.h.win32.in	\
-        po/po2tbl.sed.in        \
-	glib-2.0.pc.in 		\
-	gobject-2.0.pc.in 	\
-	gmodule-2.0.pc.in	\
-	gmodule-export-2.0.pc.in	\
-	gmodule-no-export-2.0.pc.in	\
-	gthread-2.0.pc.in	\
-	gio-2.0.pc.in		\
-	gio-unix-2.0.pc.in	\
-	gio-windows-2.0.pc.in
+	mkinstalldirs
 
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST = 		\
-	README			\
-	INSTALL			\
-	ChangeLog		\
-	config.h.win32		\
-	gtk-doc.make
+	README
 
 CONFIGURE_DEPENDENCIES = acglib.m4
 
-ChangeLog:
-	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GLIB_2_20_0^^.. --stat) | fmt --split-only > $@.tmp \
-	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
-	else \
-	  test -f $@ || \
-	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git-log is required to generate this file >> $@); \
-	fi
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc gio-2.0.pc
-
-if OS_UNIX
-pkgconfig_DATA += gio-unix-2.0.pc
-endif
-
-if OS_WIN32
-pkgconfig_DATA += gio-windows-2.0.pc
-endif
-
-$(pkgconfig_DATA): config.status
-
-# install mkinstalldirs for glib-gettextize's benefit
-gettextdir = $(datadir)/glib-2.0/gettext
-gettext_SCRIPTS = mkinstalldirs
-
 # build documentation when doing distcheck
 DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode
 
@@ -107,7 +38,7 @@ distclean-local: lcov-clean
 	    rm -f $(BUILT_EXTRA_DIST); \
 	fi
 
-.PHONY: files release sanity snapshot ChangeLog
+.PHONY: files release sanity snapshot
 
 files:
 	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
diff --git a/glib/configure.ac b/glib/configure.ac
index cadd925..f7a1632 100644
--- a/glib/configure.ac
+++ b/glib/configure.ac
@@ -474,8 +474,6 @@ dnl
 dnl gettext support
 dnl
 
-ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
 GLIB_GNU_GETTEXT
 
 if test "$gt_cv_have_gettext" != "yes" ; then
@@ -1724,37 +1722,6 @@ int main() { return 0; } ]])],
 
 AM_CONDITIONAL(HAVE_FEN, [test "$fen_support" = "yes"])
 
-dnl ****************************
-dnl *** Checks for FAM (GIO) ***
-dnl ****************************
-
-should_disable_fam=no
-
-AC_ARG_ENABLE(fam,
-              AC_HELP_STRING([--disable-fam],
-                             [don't use fam for file system monitoring]),
-                         [
-                                if test "x$enable_fam" = "xno"; then
-                                        should_disable_fam=yes
-                                fi
-                         ]
-                         )
-fam_support=no
-FAM_LIBS=
-if test "x$should_disable_fam" = "xno"; then
-AC_CHECK_LIB(fam, FAMOpen,
-  [AC_CHECK_HEADERS(fam.h,
-    [AC_DEFINE(HAVE_FAM, [], [Define if we have FAM])
-     AC_CHECK_LIB(fam, FAMNoExists,
-     		  AC_DEFINE(HAVE_FAM_NO_EXISTS, [], [Define if we have FAMNoExists in fam]))
-     FAM_LIBS="-lfam"]
-     fam_support=yes,
-    AC_MSG_WARN(*** FAM support will not be built (header files not found) ***))],
-  AC_MSG_WARN(*** FAM support will not be built (FAM library not found) ***))
-AC_SUBST(FAM_LIBS)
-fi
-AM_CONDITIONAL(HAVE_FAM, [test "$fam_support" = "yes"])
-
 
 dnl *****************************
 dnl *** Check for xattr (GIO) ***
@@ -2585,92 +2552,6 @@ if test $cross_compiling = yes; then
   fi
 fi
 
-dnl **************************
-dnl *** Checks for gtk-doc ***
-dnl **************************
-
-GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
-
-AC_ARG_ENABLE(man,
-              [AC_HELP_STRING([--enable-man],
-                              [regenerate man pages from Docbook [default=no]])],enable_man=yes,
-              enable_man=no)
-
-if test "${enable_man}" != no; then
-dnl
-dnl Check for xsltproc
-dnl
-AC_PATH_PROG([XSLTPROC], [xsltproc])
-  if test -z "$XSLTPROC"; then
-    enable_man=no
-  fi
-
-  dnl check for DocBook DTD and stylesheets in the local catalog.
-  JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
-     [DocBook XML DTD V4.1.2],,enable_man=no)
-  JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
-     [DocBook XSL Stylesheets],,enable_man=no)
-fi
-
-AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
-
-dnl
-dnl Tracing
-dnl
-
-AC_ARG_ENABLE([dtrace],
-             [AS_HELP_STRING([--enable-dtrace],
-                              [include tracing support for dtrace])])
-have_dtrace=no
-AC_MSG_CHECKING([whether to include dtrace tracing support])
-if test "x$enable_dtrace" != xno; then
-  if test x$glib_have_carbon = xyes; then
-    AC_MSG_RESULT([no (not yet compatible with MacOS dtrace)])
-  else 
-    AC_MSG_RESULT([yes])
-    AC_CHECK_PROGS(DTRACE, dtrace)
-    if test -z "$DTRACE"; then
-      if test "x$enable_dtrace" = xyes; then
-        AC_MSG_ERROR([dtrace not found])
-      fi
-    else
-      AC_CHECK_HEADER([sys/sdt.h],have_dtrace=yes,
-                      [if test "x$enable_dtrace" = xyes; then
-                        AC_MSG_ERROR([dtrace support needs sys/sdt.h header])
-                       fi])
-    fi
-  fi
-else
-  AC_MSG_RESULT([no])
-fi
-if test "x$have_dtrace" = xyes; then
-  AC_DEFINE([HAVE_DTRACE], [1], [Define to 1 if using dtrace probes.])
-fi
-AM_CONDITIONAL([ENABLE_DTRACE], [test x$have_dtrace = xyes ])
-
-AC_MSG_CHECKING([whether to include systemtap tracing support])
-AC_ARG_ENABLE([systemtap],
-             [AS_HELP_STRING([--enable-systemtap],
-                              [include tracing support for systemtap])])
-have_systemtap=no
-if test "x$enable_systemtap" != xno -a "x$have_dtrace" = xyes; then
-  have_systemtap=yes
-fi
-AC_MSG_RESULT(${have_systemtap})
-
-AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$have_systemtap = xyes])
-
-AC_ARG_WITH([tapset-install-dir],
-            AS_HELP_STRING([--with-tapset-install-dir=DIR],
-                            [path where systemtap tapsets are installed [DATADIR/systemtap/tapset]]),
-            [if test "x${withval}" = x; then
-	       ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"
-	     else
-	       ABS_TAPSET_DIR="${withval}"
-	      fi],
-	    [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"])
-AC_SUBST(ABS_TAPSET_DIR)
-
 dnl ************************************
 dnl *** Enable lcov coverage reports ***
 dnl ************************************
@@ -3529,87 +3410,22 @@ AC_SUBST(gio_INCLUDES)
 
 
 AC_CONFIG_FILES([
-glib-2.0.pc
-gmodule-2.0.pc
-gmodule-export-2.0.pc
-gmodule-no-export-2.0.pc
-gthread-2.0.pc
-gobject-2.0.pc
-gio-2.0.pc
-gio-unix-2.0.pc
-gio-windows-2.0.pc
-glib-zip
-glib-gettextize
 Makefile
-build/Makefile
-build/win32/Makefile
-build/win32/dirent/Makefile
-build/win32/vs9/Makefile
-build/win32/vs10/Makefile
 glib/Makefile
-glib/glib.stp
 glib/libcharset/Makefile
 glib/gnulib/Makefile
 glib/pcre/Makefile
 glib/update-pcre/Makefile
-glib/tests/Makefile
-gmodule/Makefile
-gmodule/gmoduleconf.h
-gobject/Makefile
-gobject/gobject.stp
-gobject/glib-mkenums
-gobject/tests/Makefile
-gthread/Makefile
-gio/Makefile
-gio/gdbus-2.0/codegen/Makefile
-gio/gdbus-2.0/codegen/config.py
-gio/xdgmime/Makefile
-gio/inotify/Makefile
-gio/fen/Makefile
-gio/fam/Makefile
-gio/win32/Makefile
-gio/tests/Makefile
-gio/tests/gdbus-object-manager-example/Makefile
-po/Makefile.in
-docs/Makefile
-docs/reference/Makefile
-docs/reference/glib/Makefile
-docs/reference/glib/version.xml
-docs/reference/gobject/Makefile
-docs/reference/gobject/version.xml
-docs/reference/gio/Makefile
-docs/reference/gio/gdbus-object-manager-example/Makefile
-docs/reference/gio/version.xml
-tests/Makefile
-tests/gobject/Makefile
-tests/refcount/Makefile
 m4macros/Makefile
 ])
 
-AC_CONFIG_COMMANDS([chmod-scripts],
-[chmod 0755 glib-zip
-chmod 0755 glib-gettextize
-chmod 0755 gobject/glib-mkenums])
-
 # we want to invoke this macro solely so that the config.status script
 # and automake generated makefiles know about these generated files.
 # They are only needed to distcheck the package
 if false; then
   AC_CONFIG_FILES([
-    INSTALL
     README
-    config.h.win32
-    glib/glibconfig.h.win32
-    glib/makefile.msc
     glib/glib.rc
-    gmodule/makefile.msc
-    gmodule/gmodule.rc
-    gobject/makefile.msc
-    gobject/gobject.rc
-    gthread/makefile.msc
-    gthread/gthread.rc
-    gio/gio.rc
-    tests/makefile.msc
   ])
 fi
 
diff --git a/glib/glib/Makefile.am b/glib/glib/Makefile.am
index ac73a8c..6fb3a34 100644
--- a/glib/glib/Makefile.am
+++ b/glib/glib/Makefile.am
@@ -35,9 +35,9 @@ else
 MAYBE_PCRE = pcre 
 endif
 
-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
 
-DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
+DIST_SUBDIRS = libcharset gnulib pcre update-pcre
 
 AM_CPPFLAGS = 				\
 	$(glib_INCLUDES) 		\
@@ -53,7 +53,6 @@ glib.def: glib.symbols
 if OS_LINUX
 if HAVE_GNUC_VISIBILITY
 TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
-TESTS = abicheck.sh
 endif
 endif
 
@@ -66,12 +65,10 @@ MIRRORING_TAB_SOURCE = 				\
 # The compilation of GRegex can be disabled, but the source files must
 # be distributed.
 EXTRA_DIST += 			\
-	makefile.msc.in		\
 	glib.rc.in		\
 	gen-iswide-table.py	\
 	gen-unicode-tables.pl	\
 	gen-script-table.pl	\
-	glibconfig.h.win32.in	\
 	abicheck.sh		\
 	glib.symbols		\
 	gregex.c		\
@@ -86,8 +83,6 @@ CLEANFILES= libglib-gdb.py
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST = 		\
-	makefile.msc		\
-	glibconfig.h.win32	\
 	glib.rc
 
 lib_LTLIBRARIES = libglib-2.0.la
@@ -116,7 +111,6 @@ deprecated_sources = \
 
 libglib_2_0_la_SOURCES = 	\
 	$(deprecated_sources)	\
-	glib_probes.d		\
 	garray.c		\
 	gasyncqueue.c		\
 	gasyncqueueprivate.h	\
@@ -382,24 +376,6 @@ libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
 
 INSTALL_PROGS=
 
-if ENABLE_DTRACE
-glib_probes.h: glib_probes.d Makefile
-	$(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
-	@$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
-glib_probes.o: glib_probes.d Makefile
-	$(AM_V_GEN) $(DTRACE) -G -s $< -o $@
-BUILT_SOURCES += glib_probes.h glib_probes.o
-CLEANFILES += glib_probes.h glib_probes.h.tmp
-libglib_2_0_la_LIBADD += glib_probes.o
-endif
-
-if ENABLE_SYSTEMTAP
-tapset_in_files = glib.stp.in
-tapsetdir   = @ABS_TAPSET_DIR@
-tapset_DATA = $(tapset_in_files:.stp.in=.stp)
-EXTRA_DIST += $(tapset_in_files)
-endif
-
 gspawn-win32-helper-console.c:
 	echo '#define HELPER_CONSOLE' >$@
 	echo '#include "gspawn-win32-helper.c"' >>$@
@@ -461,7 +437,7 @@ endif
 glib-2.0.lib: libglib-2.0.la glib.def
 	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/glib.def -out:$@
 
-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs10/glib.vcxproj ../build/win32/vs10/glib.vcxproj.filters
+dist-hook: $(BUILT_EXTRA_DIST)
 	files='$(BUILT_EXTRA_DIST)'; \
 	for f in $$files; do \
 	  if test -f $$f; then d=.; else d=$(srcdir); fi; \
diff --git a/glib/glib/gnulib/Makefile.am b/glib/glib/gnulib/Makefile.am
index ae8283d..a8666ff 100644
--- a/glib/glib/gnulib/Makefile.am
+++ b/glib/glib/gnulib/Makefile.am
@@ -17,6 +17,3 @@ libgnulib_la_SOURCES = 	\
 	printf.c \
 	printf.h \
 	g-gnulib.h
-
-
-EXTRA_DIST += makefile.msc