diff --git a/bin/condense_debug_x32_gmake b/bin/condense_debug_x32_gmake
deleted file mode 100755
index ca779be..0000000
Binary files a/bin/condense_debug_x32_gmake and /dev/null differ
diff --git a/bin/pretty_debug_x32_gmake b/bin/pretty_debug_x32_gmake
deleted file mode 100755
index 35eebf3..0000000
Binary files a/bin/pretty_debug_x32_gmake and /dev/null differ
diff --git a/bin/prettyauto_debug_x32_gmake b/bin/prettyauto_debug_x32_gmake
deleted file mode 100755
index 2391a29..0000000
Binary files a/bin/prettyauto_debug_x32_gmake and /dev/null differ
diff --git a/bin/serialize_debug_x32_gmake b/bin/serialize_debug_x32_gmake
deleted file mode 100755
index 6a20c53..0000000
Binary files a/bin/serialize_debug_x32_gmake and /dev/null differ
diff --git a/bin/tutorial_debug_x32_gmake b/bin/tutorial_debug_x32_gmake
deleted file mode 100755
index 19f9b46..0000000
Binary files a/bin/tutorial_debug_x32_gmake and /dev/null differ
diff --git a/bin/unittest_debug_x32_gmake b/bin/unittest_debug_x32_gmake
deleted file mode 100755
index 2292887..0000000
Binary files a/bin/unittest_debug_x32_gmake and /dev/null differ
diff --git a/build/gmake/condense.make b/build/gmake/condense.make
deleted file mode 100644
index a24ece4..0000000
--- a/build/gmake/condense.make
+++ /dev/null
@@ -1,176 +0,0 @@
-# GNU Make project makefile autogenerated by Premake
-ifndef config
-  config=debug32
-endif
-
-ifndef verbose
-  SILENT = @
-endif
-
-ifndef CC
-  CC = gcc
-endif
-
-ifndef CXX
-  CXX = g++
-endif
-
-ifndef AR
-  AR = ar
-endif
-
-ifeq ($(config),debug32)
-  OBJDIR     = ../../intermediate/debug/gmake/condense/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/condense_debug_x32_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m32 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m32 -L/usr/lib32
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release32)
-  OBJDIR     = ../../intermediate/release/gmake/condense/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/condense_release_x32_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -msse2 -m32 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m32 -L/usr/lib32
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),debug64)
-  OBJDIR     = ../../intermediate/debug/gmake/condense/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/condense_debug_x64_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m64 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m64 -L/usr/lib64
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release64)
-  OBJDIR     = ../../intermediate/release/gmake/condense/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/condense_release_x64_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -msse2 -m64 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m64 -L/usr/lib64
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-OBJECTS := \
-	$(OBJDIR)/condense.o \
-
-RESOURCES := \
-
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
-endif
-
-.PHONY: clean prebuild prelink
-
-all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
-	@:
-
-$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)
-	@echo Linking condense
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
-
-$(TARGETDIR):
-	@echo Creating $(TARGETDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(TARGETDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
-endif
-
-$(OBJDIR):
-	@echo Creating $(OBJDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
-
-clean:
-	@echo Cleaning condense
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) rm -f  $(TARGET)
-	$(SILENT) rm -rf $(OBJDIR)
-else
-	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
-	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
-endif
-
-prebuild:
-	$(PREBUILDCMDS)
-
-prelink:
-	$(PRELINKCMDS)
-
-ifneq (,$(PCH))
-$(GCH): $(PCH)
-	@echo $(notdir $<)
-	-$(SILENT) cp $< $(OBJDIR)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-endif
-
-$(OBJDIR)/condense.o: ../../example/condense/condense.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
--include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake/example.make b/build/gmake/example.make
deleted file mode 100644
index 64e5bc7..0000000
--- a/build/gmake/example.make
+++ /dev/null
@@ -1,60 +0,0 @@
-# GNU Make solution makefile autogenerated by Premake
-# Type "make help" for usage help
-
-ifndef config
-  config=debug32
-endif
-export config
-
-PROJECTS := condense pretty prettyauto tutorial serialize
-
-.PHONY: all clean help $(PROJECTS)
-
-all: $(PROJECTS)
-
-condense: 
-	@echo "==== Building condense ($(config)) ===="
-	@${MAKE} --no-print-directory -C . -f condense.make
-
-pretty: 
-	@echo "==== Building pretty ($(config)) ===="
-	@${MAKE} --no-print-directory -C . -f pretty.make
-
-prettyauto: 
-	@echo "==== Building prettyauto ($(config)) ===="
-	@${MAKE} --no-print-directory -C . -f prettyauto.make
-
-tutorial: 
-	@echo "==== Building tutorial ($(config)) ===="
-	@${MAKE} --no-print-directory -C . -f tutorial.make
-
-serialize: 
-	@echo "==== Building serialize ($(config)) ===="
-	@${MAKE} --no-print-directory -C . -f serialize.make
-
-clean:
-	@${MAKE} --no-print-directory -C . -f condense.make clean
-	@${MAKE} --no-print-directory -C . -f pretty.make clean
-	@${MAKE} --no-print-directory -C . -f prettyauto.make clean
-	@${MAKE} --no-print-directory -C . -f tutorial.make clean
-	@${MAKE} --no-print-directory -C . -f serialize.make clean
-
-help:
-	@echo "Usage: make [config=name] [target]"
-	@echo ""
-	@echo "CONFIGURATIONS:"
-	@echo "   debug32"
-	@echo "   release32"
-	@echo "   debug64"
-	@echo "   release64"
-	@echo ""
-	@echo "TARGETS:"
-	@echo "   all (default)"
-	@echo "   clean"
-	@echo "   condense"
-	@echo "   pretty"
-	@echo "   prettyauto"
-	@echo "   tutorial"
-	@echo "   serialize"
-	@echo ""
-	@echo "For more information, see http://industriousone.com/premake/quick-start"
diff --git a/build/gmake/gtest.make b/build/gmake/gtest.make
deleted file mode 100644
index f1ad3f5..0000000
--- a/build/gmake/gtest.make
+++ /dev/null
@@ -1,176 +0,0 @@
-# GNU Make project makefile autogenerated by Premake
-ifndef config
-  config=debug32
-endif
-
-ifndef verbose
-  SILENT = @
-endif
-
-ifndef CC
-  CC = gcc
-endif
-
-ifndef CXX
-  CXX = g++
-endif
-
-ifndef AR
-  AR = ar
-endif
-
-ifeq ($(config),debug32)
-  OBJDIR     = ../../intermediate/debug/gmake/gtest/x32
-  TARGETDIR  = ../../thirdparty/lib
-  TARGET     = $(TARGETDIR)/libgtest_debug_x32_gmake.a
-  DEFINES   += -DDEBUG -DGTEST_HAS_PTHREAD=0
-  INCLUDES  += -I../../thirdparty/gtest -I../../thirdparty/gtest/include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m32 -msse4.2 -Werror=cast-qual
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m32 -L/usr/lib32
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(AR) -rcs $(TARGET) $(OBJECTS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release32)
-  OBJDIR     = ../../intermediate/release/gmake/gtest/x32
-  TARGETDIR  = ../../thirdparty/lib
-  TARGET     = $(TARGETDIR)/libgtest_release_x32_gmake.a
-  DEFINES   += -DNDEBUG -DGTEST_HAS_PTHREAD=0
-  INCLUDES  += -I../../thirdparty/gtest -I../../thirdparty/gtest/include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -m32 -msse4.2 -Werror=cast-qual
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m32 -L/usr/lib32
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(AR) -rcs $(TARGET) $(OBJECTS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),debug64)
-  OBJDIR     = ../../intermediate/debug/gmake/gtest/x64
-  TARGETDIR  = ../../thirdparty/lib
-  TARGET     = $(TARGETDIR)/libgtest_debug_x64_gmake.a
-  DEFINES   += -DDEBUG -DGTEST_HAS_PTHREAD=0
-  INCLUDES  += -I../../thirdparty/gtest -I../../thirdparty/gtest/include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m64 -msse4.2 -Werror=cast-qual
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m64 -L/usr/lib64
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(AR) -rcs $(TARGET) $(OBJECTS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release64)
-  OBJDIR     = ../../intermediate/release/gmake/gtest/x64
-  TARGETDIR  = ../../thirdparty/lib
-  TARGET     = $(TARGETDIR)/libgtest_release_x64_gmake.a
-  DEFINES   += -DNDEBUG -DGTEST_HAS_PTHREAD=0
-  INCLUDES  += -I../../thirdparty/gtest -I../../thirdparty/gtest/include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -m64 -msse4.2 -Werror=cast-qual
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m64 -L/usr/lib64
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(AR) -rcs $(TARGET) $(OBJECTS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-OBJECTS := \
-	$(OBJDIR)/gtest-all.o \
-
-RESOURCES := \
-
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
-endif
-
-.PHONY: clean prebuild prelink
-
-all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
-	@:
-
-$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)
-	@echo Linking gtest
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
-
-$(TARGETDIR):
-	@echo Creating $(TARGETDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(TARGETDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
-endif
-
-$(OBJDIR):
-	@echo Creating $(OBJDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
-
-clean:
-	@echo Cleaning gtest
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) rm -f  $(TARGET)
-	$(SILENT) rm -rf $(OBJDIR)
-else
-	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
-	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
-endif
-
-prebuild:
-	$(PREBUILDCMDS)
-
-prelink:
-	$(PRELINKCMDS)
-
-ifneq (,$(PCH))
-$(GCH): $(PCH)
-	@echo $(notdir $<)
-	-$(SILENT) cp $< $(OBJDIR)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-endif
-
-$(OBJDIR)/gtest-all.o: ../../thirdparty/gtest/src/gtest-all.cc
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
--include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake/perftest.make b/build/gmake/perftest.make
deleted file mode 100644
index 81aaa30..0000000
--- a/build/gmake/perftest.make
+++ /dev/null
@@ -1,204 +0,0 @@
-# GNU Make project makefile autogenerated by Premake
-ifndef config
-  config=debug32
-endif
-
-ifndef verbose
-  SILENT = @
-endif
-
-ifndef CC
-  CC = gcc
-endif
-
-ifndef CXX
-  CXX = g++
-endif
-
-ifndef AR
-  AR = ar
-endif
-
-ifeq ($(config),debug32)
-  OBJDIR     = ../../intermediate/debug/gmake/perftest/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/perftest_debug_x32_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include -I../../thirdparty/gtest/include -I../../thirdparty -I../../thirdparty/jsoncpp/include -I../../thirdparty/libjson -I../../thirdparty/yajl/include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m32 -msse4.2 -Werror=cast-qual
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m32 -L/usr/lib32 -L../../thirdparty/lib
-  LIBS      += -lgtest_debug_x32_gmake
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release32)
-  OBJDIR     = ../../intermediate/release/gmake/perftest/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/perftest_release_x32_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include -I../../thirdparty/gtest/include -I../../thirdparty -I../../thirdparty/jsoncpp/include -I../../thirdparty/libjson -I../../thirdparty/yajl/include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -m32 -msse4.2 -Werror=cast-qual
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m32 -L/usr/lib32 -L../../thirdparty/lib
-  LIBS      += -lgtest_release_x32_gmake
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),debug64)
-  OBJDIR     = ../../intermediate/debug/gmake/perftest/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/perftest_debug_x64_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include -I../../thirdparty/gtest/include -I../../thirdparty -I../../thirdparty/jsoncpp/include -I../../thirdparty/libjson -I../../thirdparty/yajl/include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m64 -msse4.2 -Werror=cast-qual
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m64 -L/usr/lib64 -L../../thirdparty/lib
-  LIBS      += -lgtest_debug_x64_gmake
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release64)
-  OBJDIR     = ../../intermediate/release/gmake/perftest/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/perftest_release_x64_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include -I../../thirdparty/gtest/include -I../../thirdparty -I../../thirdparty/jsoncpp/include -I../../thirdparty/libjson -I../../thirdparty/yajl/include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -m64 -msse4.2 -Werror=cast-qual
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m64 -L/usr/lib64 -L../../thirdparty/lib
-  LIBS      += -lgtest_release_x64_gmake
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += ../../thirdparty/lib/libgtest_release_x64_gmake.a
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-OBJECTS := \
-	$(OBJDIR)/jsoncpptest.o \
-	$(OBJDIR)/misctest.o \
-	$(OBJDIR)/perftest.o \
-	$(OBJDIR)/platformtest.o \
-	$(OBJDIR)/rapidjsontest.o \
-	$(OBJDIR)/ultrajsontest.o \
-	$(OBJDIR)/yajltest.o \
-	$(OBJDIR)/yajl_all.o \
-
-RESOURCES := \
-
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
-endif
-
-.PHONY: clean prebuild prelink
-
-all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
-	@:
-
-$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)
-	@echo Linking perftest
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
-
-$(TARGETDIR):
-	@echo Creating $(TARGETDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(TARGETDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
-endif
-
-$(OBJDIR):
-	@echo Creating $(OBJDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
-
-clean:
-	@echo Cleaning perftest
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) rm -f  $(TARGET)
-	$(SILENT) rm -rf $(OBJDIR)
-else
-	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
-	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
-endif
-
-prebuild:
-	$(PREBUILDCMDS)
-
-prelink:
-	$(PRELINKCMDS)
-
-ifneq (,$(PCH))
-$(GCH): $(PCH)
-	@echo $(notdir $<)
-	-$(SILENT) cp $< $(OBJDIR)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-endif
-
-$(OBJDIR)/jsoncpptest.o: ../../test/perftest/jsoncpptest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/misctest.o: ../../test/perftest/misctest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/perftest.o: ../../test/perftest/perftest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/platformtest.o: ../../test/perftest/platformtest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/rapidjsontest.o: ../../test/perftest/rapidjsontest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/ultrajsontest.o: ../../test/perftest/ultrajsontest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/yajltest.o: ../../test/perftest/yajltest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/yajl_all.o: ../../test/perftest/yajl_all.c
-	@echo $(notdir $<)
-	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-
--include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake/pretty.make b/build/gmake/pretty.make
deleted file mode 100644
index d809831..0000000
--- a/build/gmake/pretty.make
+++ /dev/null
@@ -1,176 +0,0 @@
-# GNU Make project makefile autogenerated by Premake
-ifndef config
-  config=debug32
-endif
-
-ifndef verbose
-  SILENT = @
-endif
-
-ifndef CC
-  CC = gcc
-endif
-
-ifndef CXX
-  CXX = g++
-endif
-
-ifndef AR
-  AR = ar
-endif
-
-ifeq ($(config),debug32)
-  OBJDIR     = ../../intermediate/debug/gmake/pretty/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/pretty_debug_x32_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m32 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m32 -L/usr/lib32
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release32)
-  OBJDIR     = ../../intermediate/release/gmake/pretty/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/pretty_release_x32_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -msse2 -m32 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m32 -L/usr/lib32
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),debug64)
-  OBJDIR     = ../../intermediate/debug/gmake/pretty/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/pretty_debug_x64_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m64 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m64 -L/usr/lib64
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release64)
-  OBJDIR     = ../../intermediate/release/gmake/pretty/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/pretty_release_x64_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -msse2 -m64 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m64 -L/usr/lib64
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-OBJECTS := \
-	$(OBJDIR)/pretty.o \
-
-RESOURCES := \
-
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
-endif
-
-.PHONY: clean prebuild prelink
-
-all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
-	@:
-
-$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)
-	@echo Linking pretty
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
-
-$(TARGETDIR):
-	@echo Creating $(TARGETDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(TARGETDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
-endif
-
-$(OBJDIR):
-	@echo Creating $(OBJDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
-
-clean:
-	@echo Cleaning pretty
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) rm -f  $(TARGET)
-	$(SILENT) rm -rf $(OBJDIR)
-else
-	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
-	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
-endif
-
-prebuild:
-	$(PREBUILDCMDS)
-
-prelink:
-	$(PRELINKCMDS)
-
-ifneq (,$(PCH))
-$(GCH): $(PCH)
-	@echo $(notdir $<)
-	-$(SILENT) cp $< $(OBJDIR)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-endif
-
-$(OBJDIR)/pretty.o: ../../example/pretty/pretty.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
--include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake/prettyauto.make b/build/gmake/prettyauto.make
deleted file mode 100644
index 17d3007..0000000
--- a/build/gmake/prettyauto.make
+++ /dev/null
@@ -1,176 +0,0 @@
-# GNU Make project makefile autogenerated by Premake
-ifndef config
-  config=debug32
-endif
-
-ifndef verbose
-  SILENT = @
-endif
-
-ifndef CC
-  CC = gcc
-endif
-
-ifndef CXX
-  CXX = g++
-endif
-
-ifndef AR
-  AR = ar
-endif
-
-ifeq ($(config),debug32)
-  OBJDIR     = ../../intermediate/debug/gmake/prettyauto/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/prettyauto_debug_x32_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m32 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m32 -L/usr/lib32
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release32)
-  OBJDIR     = ../../intermediate/release/gmake/prettyauto/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/prettyauto_release_x32_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -msse2 -m32 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m32 -L/usr/lib32
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),debug64)
-  OBJDIR     = ../../intermediate/debug/gmake/prettyauto/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/prettyauto_debug_x64_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m64 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m64 -L/usr/lib64
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release64)
-  OBJDIR     = ../../intermediate/release/gmake/prettyauto/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/prettyauto_release_x64_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -msse2 -m64 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m64 -L/usr/lib64
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-OBJECTS := \
-	$(OBJDIR)/prettyauto.o \
-
-RESOURCES := \
-
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
-endif
-
-.PHONY: clean prebuild prelink
-
-all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
-	@:
-
-$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)
-	@echo Linking prettyauto
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
-
-$(TARGETDIR):
-	@echo Creating $(TARGETDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(TARGETDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
-endif
-
-$(OBJDIR):
-	@echo Creating $(OBJDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
-
-clean:
-	@echo Cleaning prettyauto
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) rm -f  $(TARGET)
-	$(SILENT) rm -rf $(OBJDIR)
-else
-	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
-	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
-endif
-
-prebuild:
-	$(PREBUILDCMDS)
-
-prelink:
-	$(PRELINKCMDS)
-
-ifneq (,$(PCH))
-$(GCH): $(PCH)
-	@echo $(notdir $<)
-	-$(SILENT) cp $< $(OBJDIR)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-endif
-
-$(OBJDIR)/prettyauto.o: ../../example/prettyauto/prettyauto.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
--include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake/serialize.make b/build/gmake/serialize.make
deleted file mode 100644
index c6c13d9..0000000
--- a/build/gmake/serialize.make
+++ /dev/null
@@ -1,176 +0,0 @@
-# GNU Make project makefile autogenerated by Premake
-ifndef config
-  config=debug32
-endif
-
-ifndef verbose
-  SILENT = @
-endif
-
-ifndef CC
-  CC = gcc
-endif
-
-ifndef CXX
-  CXX = g++
-endif
-
-ifndef AR
-  AR = ar
-endif
-
-ifeq ($(config),debug32)
-  OBJDIR     = ../../intermediate/debug/gmake/serialize/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/serialize_debug_x32_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m32 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m32 -L/usr/lib32
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release32)
-  OBJDIR     = ../../intermediate/release/gmake/serialize/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/serialize_release_x32_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -msse2 -m32 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m32 -L/usr/lib32
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),debug64)
-  OBJDIR     = ../../intermediate/debug/gmake/serialize/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/serialize_debug_x64_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m64 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m64 -L/usr/lib64
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release64)
-  OBJDIR     = ../../intermediate/release/gmake/serialize/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/serialize_release_x64_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -msse2 -m64 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m64 -L/usr/lib64
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-OBJECTS := \
-	$(OBJDIR)/serialize.o \
-
-RESOURCES := \
-
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
-endif
-
-.PHONY: clean prebuild prelink
-
-all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
-	@:
-
-$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)
-	@echo Linking serialize
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
-
-$(TARGETDIR):
-	@echo Creating $(TARGETDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(TARGETDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
-endif
-
-$(OBJDIR):
-	@echo Creating $(OBJDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
-
-clean:
-	@echo Cleaning serialize
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) rm -f  $(TARGET)
-	$(SILENT) rm -rf $(OBJDIR)
-else
-	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
-	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
-endif
-
-prebuild:
-	$(PREBUILDCMDS)
-
-prelink:
-	$(PRELINKCMDS)
-
-ifneq (,$(PCH))
-$(GCH): $(PCH)
-	@echo $(notdir $<)
-	-$(SILENT) cp $< $(OBJDIR)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-endif
-
-$(OBJDIR)/serialize.o: ../../example/serialize/serialize.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
--include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake/test.make b/build/gmake/test.make
deleted file mode 100644
index 091b8d4..0000000
--- a/build/gmake/test.make
+++ /dev/null
@@ -1,48 +0,0 @@
-# GNU Make solution makefile autogenerated by Premake
-# Type "make help" for usage help
-
-ifndef config
-  config=debug32
-endif
-export config
-
-PROJECTS := gtest unittest perftest
-
-.PHONY: all clean help $(PROJECTS)
-
-all: $(PROJECTS)
-
-gtest: 
-	@echo "==== Building gtest ($(config)) ===="
-	@${MAKE} --no-print-directory -C . -f gtest.make
-
-unittest: gtest
-	@echo "==== Building unittest ($(config)) ===="
-	@${MAKE} --no-print-directory -C . -f unittest.make
-
-perftest: gtest
-	@echo "==== Building perftest ($(config)) ===="
-	@${MAKE} --no-print-directory -C . -f perftest.make
-
-clean:
-	@${MAKE} --no-print-directory -C . -f gtest.make clean
-	@${MAKE} --no-print-directory -C . -f unittest.make clean
-	@${MAKE} --no-print-directory -C . -f perftest.make clean
-
-help:
-	@echo "Usage: make [config=name] [target]"
-	@echo ""
-	@echo "CONFIGURATIONS:"
-	@echo "   debug32"
-	@echo "   release32"
-	@echo "   debug64"
-	@echo "   release64"
-	@echo ""
-	@echo "TARGETS:"
-	@echo "   all (default)"
-	@echo "   clean"
-	@echo "   gtest"
-	@echo "   unittest"
-	@echo "   perftest"
-	@echo ""
-	@echo "For more information, see http://industriousone.com/premake/quick-start"
diff --git a/build/gmake/tutorial.make b/build/gmake/tutorial.make
deleted file mode 100644
index b32033e..0000000
--- a/build/gmake/tutorial.make
+++ /dev/null
@@ -1,176 +0,0 @@
-# GNU Make project makefile autogenerated by Premake
-ifndef config
-  config=debug32
-endif
-
-ifndef verbose
-  SILENT = @
-endif
-
-ifndef CC
-  CC = gcc
-endif
-
-ifndef CXX
-  CXX = g++
-endif
-
-ifndef AR
-  AR = ar
-endif
-
-ifeq ($(config),debug32)
-  OBJDIR     = ../../intermediate/debug/gmake/tutorial/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/tutorial_debug_x32_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m32 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m32 -L/usr/lib32
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release32)
-  OBJDIR     = ../../intermediate/release/gmake/tutorial/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/tutorial_release_x32_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -msse2 -m32 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m32 -L/usr/lib32
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),debug64)
-  OBJDIR     = ../../intermediate/debug/gmake/tutorial/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/tutorial_debug_x64_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m64 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m64 -L/usr/lib64
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release64)
-  OBJDIR     = ../../intermediate/release/gmake/tutorial/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/tutorial_release_x64_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -msse2 -m64 -Weverything
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m64 -L/usr/lib64
-  LIBS      += 
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-OBJECTS := \
-	$(OBJDIR)/tutorial.o \
-
-RESOURCES := \
-
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
-endif
-
-.PHONY: clean prebuild prelink
-
-all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
-	@:
-
-$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)
-	@echo Linking tutorial
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
-
-$(TARGETDIR):
-	@echo Creating $(TARGETDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(TARGETDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
-endif
-
-$(OBJDIR):
-	@echo Creating $(OBJDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
-
-clean:
-	@echo Cleaning tutorial
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) rm -f  $(TARGET)
-	$(SILENT) rm -rf $(OBJDIR)
-else
-	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
-	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
-endif
-
-prebuild:
-	$(PREBUILDCMDS)
-
-prelink:
-	$(PRELINKCMDS)
-
-ifneq (,$(PCH))
-$(GCH): $(PCH)
-	@echo $(notdir $<)
-	-$(SILENT) cp $< $(OBJDIR)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-endif
-
-$(OBJDIR)/tutorial.o: ../../example/tutorial/tutorial.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
--include $(OBJECTS:%.o=%.d)
diff --git a/build/gmake/unittest.make b/build/gmake/unittest.make
deleted file mode 100644
index e735255..0000000
--- a/build/gmake/unittest.make
+++ /dev/null
@@ -1,208 +0,0 @@
-# GNU Make project makefile autogenerated by Premake
-ifndef config
-  config=debug32
-endif
-
-ifndef verbose
-  SILENT = @
-endif
-
-ifndef CC
-  CC = gcc
-endif
-
-ifndef CXX
-  CXX = g++
-endif
-
-ifndef AR
-  AR = ar
-endif
-
-ifeq ($(config),debug32)
-  OBJDIR     = ../../intermediate/debug/gmake/unittest/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/unittest_debug_x32_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include -I../../thirdparty/gtest/include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m32 -msse4.2 -Werror=cast-qual
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m32 -L/usr/lib32 -L../../thirdparty/lib
-  LIBS      += -lgtest_debug_x32_gmake
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release32)
-  OBJDIR     = ../../intermediate/release/gmake/unittest/x32
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/unittest_release_x32_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include -I../../thirdparty/gtest/include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -m32 -msse4.2 -Werror=cast-qual
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m32 -L/usr/lib32 -L../../thirdparty/lib
-  LIBS      += -lgtest_release_x32_gmake
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),debug64)
-  OBJDIR     = ../../intermediate/debug/gmake/unittest/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/unittest_debug_x64_gmake
-  DEFINES   += -DDEBUG
-  INCLUDES  += -I../../include -I../../thirdparty/gtest/include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g -m64 -msse4.2 -Werror=cast-qual
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -m64 -L/usr/lib64 -L../../thirdparty/lib
-  LIBS      += -lgtest_debug_x64_gmake
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += 
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-ifeq ($(config),release64)
-  OBJDIR     = ../../intermediate/release/gmake/unittest/x64
-  TARGETDIR  = ../../bin
-  TARGET     = $(TARGETDIR)/unittest_release_x64_gmake
-  DEFINES   += -DNDEBUG
-  INCLUDES  += -I../../include -I../../thirdparty/gtest/include
-  CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -O2 -m64 -msse4.2 -Werror=cast-qual
-  CXXFLAGS  += $(CFLAGS) 
-  LDFLAGS   += -Wl,-x -m64 -L/usr/lib64 -L../../thirdparty/lib
-  LIBS      += -lgtest_release_x64_gmake
-  RESFLAGS  += $(DEFINES) $(INCLUDES) 
-  LDDEPS    += ../../thirdparty/lib/libgtest_release_x64_gmake.a
-  LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-  define PREBUILDCMDS
-  endef
-  define PRELINKCMDS
-  endef
-  define POSTBUILDCMDS
-  endef
-endif
-
-OBJECTS := \
-	$(OBJDIR)/documenttest.o \
-	$(OBJDIR)/encodedstreamtest.o \
-	$(OBJDIR)/encodingstest.o \
-	$(OBJDIR)/filestreamtest.o \
-	$(OBJDIR)/jsoncheckertest.o \
-	$(OBJDIR)/readertest.o \
-	$(OBJDIR)/unittest.o \
-	$(OBJDIR)/valuetest.o \
-	$(OBJDIR)/writertest.o \
-
-RESOURCES := \
-
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
-  SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
-  SHELLTYPE := posix
-endif
-
-.PHONY: clean prebuild prelink
-
-all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
-	@:
-
-$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)
-	@echo Linking unittest
-	$(SILENT) $(LINKCMD)
-	$(POSTBUILDCMDS)
-
-$(TARGETDIR):
-	@echo Creating $(TARGETDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(TARGETDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
-endif
-
-$(OBJDIR):
-	@echo Creating $(OBJDIR)
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) mkdir -p $(OBJDIR)
-else
-	$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
-endif
-
-clean:
-	@echo Cleaning unittest
-ifeq (posix,$(SHELLTYPE))
-	$(SILENT) rm -f  $(TARGET)
-	$(SILENT) rm -rf $(OBJDIR)
-else
-	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
-	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
-endif
-
-prebuild:
-	$(PREBUILDCMDS)
-
-prelink:
-	$(PRELINKCMDS)
-
-ifneq (,$(PCH))
-$(GCH): $(PCH)
-	@echo $(notdir $<)
-	-$(SILENT) cp $< $(OBJDIR)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-endif
-
-$(OBJDIR)/documenttest.o: ../../test/unittest/documenttest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/encodedstreamtest.o: ../../test/unittest/encodedstreamtest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/encodingstest.o: ../../test/unittest/encodingstest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/filestreamtest.o: ../../test/unittest/filestreamtest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jsoncheckertest.o: ../../test/unittest/jsoncheckertest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/readertest.o: ../../test/unittest/readertest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/unittest.o: ../../test/unittest/unittest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/valuetest.o: ../../test/unittest/valuetest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/writertest.o: ../../test/unittest/writertest.cpp
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
--include $(OBJECTS:%.o=%.d)
diff --git a/build/premake4.lua b/build/premake4.lua
index d971f51..0c131b5 100644
--- a/build/premake4.lua
+++ b/build/premake4.lua
@@ -149,9 +149,6 @@ solution "example"
 	configuration "vs*"
 		defines { "_CRT_SECURE_NO_WARNINGS" }
 
-	configuration "gmake"
-		buildoptions "-Weverything"
-
 	project "condense"
 		kind "ConsoleApp"
 		files "../example/condense/*"
diff --git a/example/serialize/serialize.cpp b/example/serialize/serialize.cpp
index 160730d..b1192ba 100644
--- a/example/serialize/serialize.cpp
+++ b/example/serialize/serialize.cpp
@@ -12,7 +12,7 @@ using namespace rapidjson;
 class Person {
 public:
 	Person(const std::string& name, unsigned age) : name_(name), age_(age) {}
-	virtual ~Person();
+	virtual ~Person() {}
 
 protected:
 	template <typename Writer>
@@ -30,9 +30,6 @@ private:
 	unsigned age_;
 };
 
-Person::~Person() {
-}
-
 class Education {
 public:
 	Education(const std::string& school, double GPA) : school_(school), GPA_(GPA) {}
@@ -59,7 +56,7 @@ class Dependent : public Person {
 public:
 	Dependent(const std::string& name, unsigned age, Education* education = 0) : Person(name, age), education_(education) {}
 	Dependent(const Dependent& rhs) : Person(rhs) { education_ = (rhs.education_ == 0) ? 0 : new Education(*rhs.education_); }
-	virtual ~Dependent();
+	~Dependent() { delete education_; }
 
 	template <typename Writer>
 	void Serialize(Writer& writer) const {
@@ -80,14 +77,9 @@ private:
 	Education *education_;
 };
 
-Dependent::~Dependent() { 
-	delete education_;
-}
-
 class Employee : public Person {
 public:
 	Employee(const std::string& name, unsigned age, bool married) : Person(name, age), married_(married) {}
-	virtual ~Employee();
 
 	void AddDependent(const Dependent& dependent) {
 		dependents_.push_back(dependent);
@@ -112,13 +104,10 @@ public:
 	}
 
 private:
-	std::vector<Dependent> dependents_;
 	bool married_;
+	std::vector<Dependent> dependents_;
 };
 
-Employee::~Employee() {
-}
-
 int main(int, char*[]) {
 	std::vector<Employee> employees;
 
diff --git a/include/rapidjson/allocators.h b/include/rapidjson/allocators.h
index 1db5a1b..6dfa85a 100644
--- a/include/rapidjson/allocators.h
+++ b/include/rapidjson/allocators.h
@@ -43,7 +43,7 @@ concept Allocator {
 
 //! C-runtime library allocator.
 /*! This class is just wrapper for standard C library memory routines.
-	\note implements Allocator concept
+	\implements Allocator
 */
 class CrtAllocator {
 public:
@@ -70,7 +70,7 @@ public:
     The user-buffer is not deallocated by this allocator.
 
     \tparam BaseAllocator the allocator type for allocating memory chunks. Default is CrtAllocator.
-	\note implements Allocator concept
+	\implements Allocator
 */
 template <typename BaseAllocator = CrtAllocator>
 class MemoryPoolAllocator {
@@ -99,12 +99,12 @@ public:
 		\param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
 		\param baseAllocator The allocator for allocating memory chunks.
 	*/
-	MemoryPoolAllocator(void *buffer, size_t size, size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
+	MemoryPoolAllocator(char *buffer, size_t size, size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
 		chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(buffer), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
 	{
 		RAPIDJSON_ASSERT(buffer != 0);
 		RAPIDJSON_ASSERT(size > sizeof(ChunkHeader));
-		chunkHead_ = reinterpret_cast<ChunkHeader *>(buffer);
+		chunkHead_ = (ChunkHeader*)buffer;
 		chunkHead_->capacity = size - sizeof(ChunkHeader);
 		chunkHead_->size = 0;
 		chunkHead_->next = 0;
@@ -120,7 +120,7 @@ public:
 
 	//! Deallocates all memory chunks, excluding the user-supplied buffer.
 	void Clear() {
-		while(chunkHead_ != 0 && chunkHead_ != userBuffer_) {
+		while(chunkHead_ != 0 && chunkHead_ != (ChunkHeader *)userBuffer_) {
 			ChunkHeader* next = chunkHead_->next;
 			baseAllocator_->Free(chunkHead_);
 			chunkHead_ = next;
@@ -153,7 +153,7 @@ public:
 		if (chunkHead_->size + size > chunkHead_->capacity)
 			AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size);
 
-		void *buffer = reinterpret_cast<char *>(chunkHead_ + 1) + chunkHead_->size;
+		char *buffer = (char *)(chunkHead_ + 1) + chunkHead_->size;
 		chunkHead_->size += size;
 		return buffer;
 	}
@@ -169,7 +169,7 @@ public:
 
 		// Simply expand it if it is the last allocation and there is sufficient space
 		if (originalPtr == (char *)(chunkHead_ + 1) + chunkHead_->size - originalSize) {
-			size_t increment = static_cast<size_t>(newSize - originalSize);
+			size_t increment = newSize - originalSize;
 			increment = RAPIDJSON_ALIGN(increment);
 			if (chunkHead_->size + increment <= chunkHead_->capacity) {
 				chunkHead_->size += increment;
@@ -211,7 +211,7 @@ private:
 
 	ChunkHeader *chunkHead_;	//!< Head of the chunk linked-list. Only the head chunk serves allocation.
 	size_t chunk_capacity_;		//!< The minimum capacity of chunk when they are allocated.
-	void *userBuffer_;			//!< User supplied buffer.
+	char *userBuffer_;			//!< User supplied buffer.
 	BaseAllocator* baseAllocator_;	//!< base allocator for allocating memory chunks.
 	BaseAllocator* ownBaseAllocator_;	//!< base allocator created by this object.
 };
diff --git a/include/rapidjson/encodings.h b/include/rapidjson/encodings.h
index 16397e6..c7e8e5b 100644
--- a/include/rapidjson/encodings.h
+++ b/include/rapidjson/encodings.h
@@ -64,7 +64,7 @@ concept Encoding {
 /*! http://en.wikipedia.org/wiki/UTF-8
 	http://tools.ietf.org/html/rfc3629
 	\tparam CharType Code unit for storing 8-bit UTF-8 data. Default is char.
-	\note implements Encoding concept.
+	\implements Encoding
 */
 template<typename CharType = char>
 struct UTF8 {
@@ -73,22 +73,22 @@ struct UTF8 {
 	template<typename OutputStream>
 	static void Encode(OutputStream& os, unsigned codepoint) {
 		if (codepoint <= 0x7F) 
-			os.Put(static_cast<Ch>(codepoint & 0xFF));
+			os.Put(codepoint & 0xFF);
 		else if (codepoint <= 0x7FF) {
-			os.Put(static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
-			os.Put(static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
+			os.Put(0xC0 | ((codepoint >> 6) & 0xFF));
+			os.Put(0x80 | ((codepoint & 0x3F)));
 		}
 		else if (codepoint <= 0xFFFF) {
-			os.Put(static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
-			os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-			os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+			os.Put(0xE0 | ((codepoint >> 12) & 0xFF));
+			os.Put(0x80 | ((codepoint >> 6) & 0x3F));
+			os.Put(0x80 | (codepoint & 0x3F));
 		}
 		else {
 			RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-			os.Put(static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
-			os.Put(static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
-			os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-			os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+			os.Put(0xF0 | ((codepoint >> 18) & 0xFF));
+			os.Put(0x80 | ((codepoint >> 12) & 0x3F));
+			os.Put(0x80 | ((codepoint >> 6) & 0x3F));
+			os.Put(0x80 | (codepoint & 0x3F));
 		}
 	}
 
@@ -204,7 +204,7 @@ struct UTF8 {
 /*! http://en.wikipedia.org/wiki/UTF-16
 	http://tools.ietf.org/html/rfc2781
 	\tparam CharType Type for storing 16-bit UTF-16 data. Default is wchar_t. C++11 may use char16_t instead.
-	\note implements Encoding concept
+	\implements Encoding
 
 	\note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
 	For streaming, use UTF16LE and UTF16BE, which handle endianness.
@@ -332,8 +332,8 @@ struct UTF16BE : UTF16<CharType> {
 
 //! UTF-32 encoding. 
 /*! http://en.wikipedia.org/wiki/UTF-32
-	\tparam CharType Type for storing 32-bit UTF-32 data. Default is unsigned. C++11 may use char32_t instead.
-	\note implements Encoding concept
+	\tparam Ch Type for storing 32-bit UTF-32 data. Default is unsigned. C++11 may use char32_t instead.
+	\implements Encoding
 
 	\note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
 	For streaming, use UTF32LE and UTF32BE, which handle endianness.
@@ -448,7 +448,7 @@ enum UTFType {
 	kUTF16LE = 1,	//!< UTF-16 little endian.
 	kUTF16BE = 2,	//!< UTF-16 big endian.
 	kUTF32LE = 3,	//!< UTF-32 little endian.
-	kUTF32BE = 4	//!< UTF-32 big endian.
+	kUTF32BE = 4,	//!< UTF-32 big endian.
 };
 
 //! Dynamically select encoding according to stream's runtime-specified UTF encoding type.
diff --git a/include/rapidjson/filereadstream.h b/include/rapidjson/filereadstream.h
index 4d42d38..2d20841 100644
--- a/include/rapidjson/filereadstream.h
+++ b/include/rapidjson/filereadstream.h
@@ -8,7 +8,7 @@ namespace rapidjson {
 
 //! File byte stream for input using fread().
 /*!
-	\note implements Stream concept
+	\implements Stream
 */
 class FileReadStream {
 public:
@@ -28,7 +28,7 @@ public:
 
 	Ch Peek() const { return *current_; }
 	Ch Take() { Ch c = *current_; Read(); return c; }
-	size_t Tell() const { return count_ + static_cast<size_t>(current_ - buffer_); }
+	size_t Tell() const { return count_ + (current_ - buffer_); }
 
 	// Not implemented
 	void Put(Ch) { RAPIDJSON_ASSERT(false); }
diff --git a/include/rapidjson/filestream.h b/include/rapidjson/filestream.h
index e0099d5..57ab0ba 100644
--- a/include/rapidjson/filestream.h
+++ b/include/rapidjson/filestream.h
@@ -9,7 +9,7 @@ namespace rapidjson {
 //! (Depreciated) Wrapper of C file stream for input or output.
 /*!
 	This simple wrapper does not check the validity of the stream.
-	\note implements Stream concept
+	\implements Stream
 	\deprecated { This was only for basic testing in version 0.1, it is found that the performance is very low by using fgetc(). Use FileReadStream instead. }
 */
 class FileStream {
diff --git a/include/rapidjson/filewritestream.h b/include/rapidjson/filewritestream.h
index 9f0ce65..3d15ea8 100644
--- a/include/rapidjson/filewritestream.h
+++ b/include/rapidjson/filewritestream.h
@@ -8,7 +8,7 @@ namespace rapidjson {
 
 //! Wrapper of C file stream for input using fread().
 /*!
-	\note implements Stream concept
+	\implements Stream
 */
 class FileWriteStream {
 public:
@@ -26,13 +26,13 @@ public:
 	}
 
 	void PutN(char c, size_t n) {
-		size_t avail = static_cast<size_t>(bufferEnd_ - current_);
+		size_t avail = bufferEnd_ - current_;
 		while (n > avail) {
 			memset(current_, c, avail);
 			current_ += avail;
 			Flush();
 			n -= avail;
-			avail = static_cast<size_t>(bufferEnd_ - current_);
+			avail = bufferEnd_ - current_;
 		}
 
 		if (n > 0) {
@@ -43,7 +43,7 @@ public:
 
 	void Flush() {
 		if (current_ != buffer_) {
-			fwrite(buffer_, 1, static_cast<size_t>(current_ - buffer_), fp_);
+			fwrite(buffer_, 1, current_ - buffer_, fp_);
 			current_ = buffer_;
 		}
 	}
diff --git a/include/rapidjson/internal/stack.h b/include/rapidjson/internal/stack.h
index c1a8bed..6ed47e3 100644
--- a/include/rapidjson/internal/stack.h
+++ b/include/rapidjson/internal/stack.h
@@ -42,7 +42,7 @@ public:
 			stack_top_ = stack_ + size;
 			stack_end_ = stack_ + stack_capacity_;
 		}
-		T* ret = reinterpret_cast<T*>(stack_top_);
+		T* ret = (T*)stack_top_;
 		stack_top_ += sizeof(T) * count;
 		return ret;
 	}
@@ -51,13 +51,13 @@ public:
 	T* Pop(size_t count) {
 		RAPIDJSON_ASSERT(GetSize() >= count * sizeof(T));
 		stack_top_ -= count * sizeof(T);
-		return reinterpret_cast<T*>(stack_top_);
+		return (T*)stack_top_;
 	}
 
 	template<typename T>
 	T* Top() { 
 		RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
-		return reinterpret_cast<T*>(stack_top_ - sizeof(T));
+		return (T*)(stack_top_ - sizeof(T));
 	}
 
 	template<typename T>
@@ -65,7 +65,7 @@ public:
 
 	Allocator& GetAllocator() { return *allocator_; }
 	bool Empty() const { return stack_top_ == stack_; }
-	size_t GetSize() const { return static_cast<size_t>(stack_top_ - stack_); }
+	size_t GetSize() const { return stack_top_ - stack_; }
 	size_t GetCapacity() const { return stack_capacity_; }
 
 private:
diff --git a/include/rapidjson/prettywriter.h b/include/rapidjson/prettywriter.h
index 112456e..2a0a505 100644
--- a/include/rapidjson/prettywriter.h
+++ b/include/rapidjson/prettywriter.h
@@ -8,8 +8,7 @@ namespace rapidjson {
 //! Writer with indentation and spacing.
 /*!
 	\tparam OutputStream Type of ouptut os.
-	\tparam SourceEncoding Encoding of source.
-	\tparam TargetEncoding Encoding of target in output stream.
+	\tparam Encoding Encoding of both source strings and output.
 	\tparam Allocator Type of allocator for allocating memory of stack.
 */
 template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename Allocator = MemoryPoolAllocator<> >
@@ -27,7 +26,7 @@ public:
 		Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}
 
 	//! Set custom indentation.
-	/*! \param indentChar		Character for indentation. Must be whitespace character (' ', '\\t', '\\n', '\\r').
+	/*! \param indentChar		Character for indentation. Must be whitespace character (' ', '\t', '\n', '\r').
 		\param indentCharCount	Number of indent characters for each indentation level.
 		\note The default indentation is 4 spaces.
 	*/
diff --git a/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h
index b11e6b9..2ba3c58 100644
--- a/include/rapidjson/rapidjson.h
+++ b/include/rapidjson/rapidjson.h
@@ -55,7 +55,7 @@ typedef unsigned __int64 uint64_t;
 	Currently the default uses 4 bytes alignment. User can customize this.
 */
 #ifndef RAPIDJSON_ALIGN
-#define RAPIDJSON_ALIGN(x) ((x + 3u) & ~3u)
+#define RAPIDJSON_ALIGN(x) ((x + 3) & ~3)
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -183,7 +183,7 @@ inline void PutN(Stream& stream, Ch c, size_t n) {
 // StringStream
 
 //! Read-only string stream.
-/*! \note implements Stream concept
+/*! \implements Stream
 */
 template <typename Encoding>
 struct GenericStringStream {
@@ -193,7 +193,7 @@ struct GenericStringStream {
 
 	Ch Peek() const { return *src_; }
 	Ch Take() { return *src_++; }
-	size_t Tell() const { return static_cast<size_t>(src_ - head_); }
+	size_t Tell() const { return src_ - head_; }
 
 	Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
 	void Put(Ch) { RAPIDJSON_ASSERT(false); }
@@ -211,7 +211,7 @@ typedef GenericStringStream<UTF8<> > StringStream;
 
 //! A read-write string stream.
 /*! This string stream is particularly designed for in-situ parsing.
-	\note implements Stream concept
+	\implements Stream
 */
 template <typename Encoding>
 struct GenericInsituStringStream {
@@ -248,7 +248,7 @@ enum Type {
 	kObjectType = 3,	//!< object
 	kArrayType = 4,		//!< array 
 	kStringType = 5,	//!< string
-	kNumberType = 6		//!< number
+	kNumberType = 6,	//!< number
 };
 
 } // namespace rapidjson
diff --git a/include/rapidjson/reader.h b/include/rapidjson/reader.h
index 67f52e4..c932dea 100644
--- a/include/rapidjson/reader.h
+++ b/include/rapidjson/reader.h
@@ -39,7 +39,7 @@ namespace rapidjson {
 enum ParseFlag {
 	kParseDefaultFlags = 0,			//!< Default parse flags. Non-destructive parsing. Text strings are decoded into allocated buffer.
 	kParseInsituFlag = 1,			//!< In-situ(destructive) parsing.
-	kParseValidateEncodingFlag = 2	//!< Validate encoding of JSON strings.
+	kParseValidateEncodingFlag = 2,	//!< Validate encoding of JSON strings.
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -71,7 +71,7 @@ concept Handler {
 
 //! Default implementation of Handler.
 /*! This can be used as base class of any reader handler.
-	\note implements Handler concept
+	\implements Handler
 */
 template<typename Encoding = UTF8<> >
 struct BaseReaderHandler {
@@ -96,7 +96,7 @@ struct BaseReaderHandler {
 // SkipWhitespace
 
 //! Skip the JSON white spaces in a stream.
-/*! \param is A input stream for skipping white spaces.
+/*! \param stream A input stream for skipping white spaces.
 	\note This function has SSE2/SSE4.2 specialization.
 */
 template<typename InputStream>
@@ -216,7 +216,7 @@ public:
 	/*! \tparam parseFlags Combination of ParseFlag. 
 		 \tparam InputStream Type of input stream.
 		 \tparam Handler Type of handler which must implement Handler concept.
-		 \param is Input stream to be parsed.
+		 \param stream Input stream to be parsed.
 		 \param handler The handler to receive events.
 		 \return Whether the parsing is successful.
 	*/
@@ -368,7 +368,7 @@ private:
 		for (int i = 0; i < 4; i++) {
 			Ch c = s.Take();
 			codepoint <<= 4;
-			codepoint += static_cast<unsigned>(c);
+			codepoint += c;
 			if (c >= '0' && c <= '9')
 				codepoint -= '0';
 			else if (c >= 'A' && c <= 'F')
@@ -494,7 +494,7 @@ private:
 			s.Take();
 		}
 		else if (s.Peek() >= '1' && s.Peek() <= '9') {
-			i = static_cast<unsigned>(s.Take() - '0');
+			i = s.Take() - '0';
 
 			if (minus)
 				while (s.Peek() >= '0' && s.Peek() <= '9') {
@@ -504,7 +504,7 @@ private:
 							break;
 						}
 					}
-					i = i * 10 + static_cast<unsigned>(s.Take() - '0');
+					i = i * 10 + (s.Take() - '0');
 				}
 			else
 				while (s.Peek() >= '0' && s.Peek() <= '9') {
@@ -514,7 +514,7 @@ private:
 							break;
 						}
 					}
-					i = i * 10 + static_cast<unsigned>(s.Take() - '0');
+					i = i * 10 + (s.Take() - '0');
 				}
 		}
 		else
@@ -532,7 +532,7 @@ private:
 							useDouble = true;
 							break;
 						}
-					i64 = i64 * 10 + static_cast<unsigned>(s.Take() - '0');
+					i64 = i64 * 10 + (s.Take() - '0');
 				}
 			else
 				while (s.Peek() >= '0' && s.Peek() <= '9') {					
@@ -541,7 +541,7 @@ private:
 							useDouble = true;
 							break;
 						}
-					i64 = i64 * 10 + static_cast<unsigned>(s.Take() - '0');
+					i64 = i64 * 10 + (s.Take() - '0');
 				}
 		}
 
diff --git a/include/rapidjson/writer.h b/include/rapidjson/writer.h
index 38dc8b8..4f3aedc 100644
--- a/include/rapidjson/writer.h
+++ b/include/rapidjson/writer.h
@@ -27,7 +27,7 @@ namespace rapidjson {
 	\tparam OutputStream Type of output stream.
 	\tparam SourceEncoding Encoding of both source strings.
 	\tparam TargetEncoding Encoding of and output stream.
-	\note implements Handler concept
+	\implements Handler
 */
 template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename Allocator = MemoryPoolAllocator<> >
 class Writer {
@@ -97,9 +97,9 @@ public:
 protected:
 	//! Information for each nested level
 	struct Level {
-		Level(bool inArray_) : valueCount(0), inArray(inArray_) {}
-		size_t valueCount;	//!< number of values in this level
+		Level(bool inArray_) : inArray(inArray_), valueCount(0) {}
 		bool inArray;		//!< true if in array, otherwise in object
+		size_t valueCount;	//!< number of values in this level
 	};
 
 	static const size_t kDefaultLevelDepth = 32;
@@ -164,7 +164,7 @@ protected:
 	//! \todo Optimization with custom double-to-string converter.
 	void WriteDouble(double d) {
 		char buffer[100];
-#ifdef _MSC_VER
+#if _MSC_VER
 		int ret = sprintf_s(buffer, sizeof(buffer), "%g", d);
 #else
 		int ret = snprintf(buffer, sizeof(buffer), "%g", d);
diff --git a/intermediate/debug/gmake/condense/x32/condense.d b/intermediate/debug/gmake/condense/x32/condense.d
deleted file mode 100644
index dadc0f6..0000000
--- a/intermediate/debug/gmake/condense/x32/condense.d
+++ /dev/null
@@ -1,31 +0,0 @@
-../../intermediate/debug/gmake/condense/x32/condense.o: \
-  ../../example/condense/condense.cpp ../../include/rapidjson/reader.h \
-  ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/internal/pow10.h \
-  ../../include/rapidjson/internal/stack.h \
-  ../../include/rapidjson/writer.h \
-  ../../include/rapidjson/internal/strfunc.h \
-  ../../include/rapidjson/filereadstream.h \
-  ../../include/rapidjson/filewritestream.h
-
-../../include/rapidjson/reader.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/internal/pow10.h:
-
-../../include/rapidjson/internal/stack.h:
-
-../../include/rapidjson/writer.h:
-
-../../include/rapidjson/internal/strfunc.h:
-
-../../include/rapidjson/filereadstream.h:
-
-../../include/rapidjson/filewritestream.h:
diff --git a/intermediate/debug/gmake/condense/x32/condense.o b/intermediate/debug/gmake/condense/x32/condense.o
deleted file mode 100644
index 3c1c485..0000000
Binary files a/intermediate/debug/gmake/condense/x32/condense.o and /dev/null differ
diff --git a/intermediate/debug/gmake/gtest/x32/gtest-all.d b/intermediate/debug/gmake/gtest/x32/gtest-all.d
deleted file mode 100644
index 010b1ff..0000000
--- a/intermediate/debug/gmake/gtest/x32/gtest-all.d
+++ /dev/null
@@ -1,83 +0,0 @@
-../../intermediate/debug/gmake/gtest/x32/gtest-all.o: \
-  ../../thirdparty/gtest/src/gtest-all.cc \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h \
-  ../../thirdparty/gtest/src/gtest.cc \
-  ../../thirdparty/gtest/include/gtest/gtest-spi.h \
-  ../../thirdparty/gtest/src/gtest-internal-inl.h \
-  ../../thirdparty/gtest/src/gtest-death-test.cc \
-  ../../thirdparty/gtest/src/gtest-filepath.cc \
-  ../../thirdparty/gtest/src/gtest-port.cc \
-  ../../thirdparty/gtest/src/gtest-printers.cc \
-  ../../thirdparty/gtest/src/gtest-test-part.cc \
-  ../../thirdparty/gtest/src/gtest-typed-test.cc
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
-
-../../thirdparty/gtest/src/gtest.cc:
-
-../../thirdparty/gtest/include/gtest/gtest-spi.h:
-
-../../thirdparty/gtest/src/gtest-internal-inl.h:
-
-../../thirdparty/gtest/src/gtest-death-test.cc:
-
-../../thirdparty/gtest/src/gtest-filepath.cc:
-
-../../thirdparty/gtest/src/gtest-port.cc:
-
-../../thirdparty/gtest/src/gtest-printers.cc:
-
-../../thirdparty/gtest/src/gtest-test-part.cc:
-
-../../thirdparty/gtest/src/gtest-typed-test.cc:
diff --git a/intermediate/debug/gmake/gtest/x32/gtest-all.o b/intermediate/debug/gmake/gtest/x32/gtest-all.o
deleted file mode 100644
index 7bcbdbe..0000000
Binary files a/intermediate/debug/gmake/gtest/x32/gtest-all.o and /dev/null differ
diff --git a/intermediate/debug/gmake/perftest/x32/jsoncpptest.d b/intermediate/debug/gmake/perftest/x32/jsoncpptest.d
deleted file mode 100644
index b012306..0000000
--- a/intermediate/debug/gmake/perftest/x32/jsoncpptest.d
+++ /dev/null
@@ -1,58 +0,0 @@
-../../intermediate/debug/gmake/perftest/x32/jsoncpptest.o: \
-  ../../test/perftest/jsoncpptest.cpp ../../test/perftest/perftest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h
-
-../../test/perftest/perftest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
diff --git a/intermediate/debug/gmake/perftest/x32/jsoncpptest.o b/intermediate/debug/gmake/perftest/x32/jsoncpptest.o
deleted file mode 100644
index 8aa6208..0000000
Binary files a/intermediate/debug/gmake/perftest/x32/jsoncpptest.o and /dev/null differ
diff --git a/intermediate/debug/gmake/perftest/x32/misctest.d b/intermediate/debug/gmake/perftest/x32/misctest.d
deleted file mode 100644
index 4c70832..0000000
--- a/intermediate/debug/gmake/perftest/x32/misctest.d
+++ /dev/null
@@ -1,58 +0,0 @@
-../../intermediate/debug/gmake/perftest/x32/misctest.o: \
-  ../../test/perftest/misctest.cpp ../../test/perftest/perftest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h
-
-../../test/perftest/perftest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
diff --git a/intermediate/debug/gmake/perftest/x32/misctest.o b/intermediate/debug/gmake/perftest/x32/misctest.o
deleted file mode 100644
index 84fb345..0000000
Binary files a/intermediate/debug/gmake/perftest/x32/misctest.o and /dev/null differ
diff --git a/intermediate/debug/gmake/perftest/x32/perftest.d b/intermediate/debug/gmake/perftest/x32/perftest.d
deleted file mode 100644
index c868c2b..0000000
--- a/intermediate/debug/gmake/perftest/x32/perftest.d
+++ /dev/null
@@ -1,58 +0,0 @@
-../../intermediate/debug/gmake/perftest/x32/perftest.o: \
-  ../../test/perftest/perftest.cpp ../../test/perftest/perftest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h
-
-../../test/perftest/perftest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
diff --git a/intermediate/debug/gmake/perftest/x32/perftest.o b/intermediate/debug/gmake/perftest/x32/perftest.o
deleted file mode 100644
index e2619aa..0000000
Binary files a/intermediate/debug/gmake/perftest/x32/perftest.o and /dev/null differ
diff --git a/intermediate/debug/gmake/perftest/x32/platformtest.d b/intermediate/debug/gmake/perftest/x32/platformtest.d
deleted file mode 100644
index 7ce8422..0000000
--- a/intermediate/debug/gmake/perftest/x32/platformtest.d
+++ /dev/null
@@ -1,58 +0,0 @@
-../../intermediate/debug/gmake/perftest/x32/platformtest.o: \
-  ../../test/perftest/platformtest.cpp ../../test/perftest/perftest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h
-
-../../test/perftest/perftest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
diff --git a/intermediate/debug/gmake/perftest/x32/platformtest.o b/intermediate/debug/gmake/perftest/x32/platformtest.o
deleted file mode 100644
index e78811b..0000000
Binary files a/intermediate/debug/gmake/perftest/x32/platformtest.o and /dev/null differ
diff --git a/intermediate/debug/gmake/perftest/x32/rapidjsontest.d b/intermediate/debug/gmake/perftest/x32/rapidjsontest.d
deleted file mode 100644
index 056c9e6..0000000
--- a/intermediate/debug/gmake/perftest/x32/rapidjsontest.d
+++ /dev/null
@@ -1,96 +0,0 @@
-../../intermediate/debug/gmake/perftest/x32/rapidjsontest.o: \
-  ../../test/perftest/rapidjsontest.cpp ../../test/perftest/perftest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h \
-  ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h ../../include/rapidjson/document.h \
-  ../../include/rapidjson/reader.h \
-  ../../include/rapidjson/internal/pow10.h \
-  ../../include/rapidjson/internal/stack.h \
-  ../../include/rapidjson/internal/strfunc.h \
-  ../../include/rapidjson/prettywriter.h \
-  ../../include/rapidjson/writer.h \
-  ../../include/rapidjson/stringbuffer.h \
-  ../../include/rapidjson/filestream.h \
-  ../../include/rapidjson/filereadstream.h
-
-../../test/perftest/perftest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/document.h:
-
-../../include/rapidjson/reader.h:
-
-../../include/rapidjson/internal/pow10.h:
-
-../../include/rapidjson/internal/stack.h:
-
-../../include/rapidjson/internal/strfunc.h:
-
-../../include/rapidjson/prettywriter.h:
-
-../../include/rapidjson/writer.h:
-
-../../include/rapidjson/stringbuffer.h:
-
-../../include/rapidjson/filestream.h:
-
-../../include/rapidjson/filereadstream.h:
diff --git a/intermediate/debug/gmake/pretty/x32/pretty.d b/intermediate/debug/gmake/pretty/x32/pretty.d
deleted file mode 100644
index 17810c1..0000000
--- a/intermediate/debug/gmake/pretty/x32/pretty.d
+++ /dev/null
@@ -1,34 +0,0 @@
-../../intermediate/debug/gmake/pretty/x32/pretty.o: \
-  ../../example/pretty/pretty.cpp ../../include/rapidjson/reader.h \
-  ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/internal/pow10.h \
-  ../../include/rapidjson/internal/stack.h \
-  ../../include/rapidjson/prettywriter.h \
-  ../../include/rapidjson/writer.h \
-  ../../include/rapidjson/internal/strfunc.h \
-  ../../include/rapidjson/filereadstream.h \
-  ../../include/rapidjson/filewritestream.h
-
-../../include/rapidjson/reader.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/internal/pow10.h:
-
-../../include/rapidjson/internal/stack.h:
-
-../../include/rapidjson/prettywriter.h:
-
-../../include/rapidjson/writer.h:
-
-../../include/rapidjson/internal/strfunc.h:
-
-../../include/rapidjson/filereadstream.h:
-
-../../include/rapidjson/filewritestream.h:
diff --git a/intermediate/debug/gmake/pretty/x32/pretty.o b/intermediate/debug/gmake/pretty/x32/pretty.o
deleted file mode 100644
index 41781a2..0000000
Binary files a/intermediate/debug/gmake/pretty/x32/pretty.o and /dev/null differ
diff --git a/intermediate/debug/gmake/prettyauto/x32/prettyauto.d b/intermediate/debug/gmake/prettyauto/x32/prettyauto.d
deleted file mode 100644
index 5d31645..0000000
--- a/intermediate/debug/gmake/prettyauto/x32/prettyauto.d
+++ /dev/null
@@ -1,37 +0,0 @@
-../../intermediate/debug/gmake/prettyauto/x32/prettyauto.o: \
-  ../../example/prettyauto/prettyauto.cpp \
-  ../../include/rapidjson/reader.h ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/internal/pow10.h \
-  ../../include/rapidjson/internal/stack.h \
-  ../../include/rapidjson/prettywriter.h \
-  ../../include/rapidjson/writer.h \
-  ../../include/rapidjson/internal/strfunc.h \
-  ../../include/rapidjson/filereadstream.h \
-  ../../include/rapidjson/filewritestream.h \
-  ../../include/rapidjson/encodedstream.h
-
-../../include/rapidjson/reader.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/internal/pow10.h:
-
-../../include/rapidjson/internal/stack.h:
-
-../../include/rapidjson/prettywriter.h:
-
-../../include/rapidjson/writer.h:
-
-../../include/rapidjson/internal/strfunc.h:
-
-../../include/rapidjson/filereadstream.h:
-
-../../include/rapidjson/filewritestream.h:
-
-../../include/rapidjson/encodedstream.h:
diff --git a/intermediate/debug/gmake/prettyauto/x32/prettyauto.o b/intermediate/debug/gmake/prettyauto/x32/prettyauto.o
deleted file mode 100644
index 7947df0..0000000
Binary files a/intermediate/debug/gmake/prettyauto/x32/prettyauto.o and /dev/null differ
diff --git a/intermediate/debug/gmake/serialize/x32/serialize.d b/intermediate/debug/gmake/serialize/x32/serialize.d
deleted file mode 100644
index c2e2429..0000000
--- a/intermediate/debug/gmake/serialize/x32/serialize.d
+++ /dev/null
@@ -1,25 +0,0 @@
-../../intermediate/debug/gmake/serialize/x32/serialize.o: \
-  ../../example/serialize/serialize.cpp \
-  ../../include/rapidjson/prettywriter.h \
-  ../../include/rapidjson/writer.h ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/internal/stack.h \
-  ../../include/rapidjson/internal/strfunc.h \
-  ../../include/rapidjson/filestream.h
-
-../../include/rapidjson/prettywriter.h:
-
-../../include/rapidjson/writer.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/internal/stack.h:
-
-../../include/rapidjson/internal/strfunc.h:
-
-../../include/rapidjson/filestream.h:
diff --git a/intermediate/debug/gmake/serialize/x32/serialize.o b/intermediate/debug/gmake/serialize/x32/serialize.o
deleted file mode 100644
index 3a19f41..0000000
Binary files a/intermediate/debug/gmake/serialize/x32/serialize.o and /dev/null differ
diff --git a/intermediate/debug/gmake/tutorial/x32/tutorial.d b/intermediate/debug/gmake/tutorial/x32/tutorial.d
deleted file mode 100644
index 3e74441..0000000
--- a/intermediate/debug/gmake/tutorial/x32/tutorial.d
+++ /dev/null
@@ -1,32 +0,0 @@
-../../intermediate/debug/gmake/tutorial/x32/tutorial.o: \
-  ../../example/tutorial/tutorial.cpp ../../include/rapidjson/document.h \
-  ../../include/rapidjson/reader.h ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/internal/pow10.h \
-  ../../include/rapidjson/internal/stack.h \
-  ../../include/rapidjson/internal/strfunc.h \
-  ../../include/rapidjson/prettywriter.h \
-  ../../include/rapidjson/writer.h ../../include/rapidjson/filestream.h
-
-../../include/rapidjson/document.h:
-
-../../include/rapidjson/reader.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/internal/pow10.h:
-
-../../include/rapidjson/internal/stack.h:
-
-../../include/rapidjson/internal/strfunc.h:
-
-../../include/rapidjson/prettywriter.h:
-
-../../include/rapidjson/writer.h:
-
-../../include/rapidjson/filestream.h:
diff --git a/intermediate/debug/gmake/tutorial/x32/tutorial.o b/intermediate/debug/gmake/tutorial/x32/tutorial.o
deleted file mode 100644
index b0b34ba..0000000
Binary files a/intermediate/debug/gmake/tutorial/x32/tutorial.o and /dev/null differ
diff --git a/intermediate/debug/gmake/unittest/x32/documenttest.d b/intermediate/debug/gmake/unittest/x32/documenttest.d
deleted file mode 100644
index 9aa733b..0000000
--- a/intermediate/debug/gmake/unittest/x32/documenttest.d
+++ /dev/null
@@ -1,84 +0,0 @@
-../../intermediate/debug/gmake/unittest/x32/documenttest.o: \
-  ../../test/unittest/documenttest.cpp ../../test/unittest/unittest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h \
-  ../../include/rapidjson/document.h ../../include/rapidjson/reader.h \
-  ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/internal/pow10.h \
-  ../../include/rapidjson/internal/stack.h \
-  ../../include/rapidjson/internal/strfunc.h \
-  ../../include/rapidjson/writer.h
-
-../../test/unittest/unittest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
-
-../../include/rapidjson/document.h:
-
-../../include/rapidjson/reader.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/internal/pow10.h:
-
-../../include/rapidjson/internal/stack.h:
-
-../../include/rapidjson/internal/strfunc.h:
-
-../../include/rapidjson/writer.h:
diff --git a/intermediate/debug/gmake/unittest/x32/documenttest.o b/intermediate/debug/gmake/unittest/x32/documenttest.o
deleted file mode 100644
index a65e667..0000000
Binary files a/intermediate/debug/gmake/unittest/x32/documenttest.o and /dev/null differ
diff --git a/intermediate/debug/gmake/unittest/x32/encodedstreamtest.d b/intermediate/debug/gmake/unittest/x32/encodedstreamtest.d
deleted file mode 100644
index 0b53d8a..0000000
--- a/intermediate/debug/gmake/unittest/x32/encodedstreamtest.d
+++ /dev/null
@@ -1,83 +0,0 @@
-../../intermediate/debug/gmake/unittest/x32/encodedstreamtest.o: \
-  ../../test/unittest/encodedstreamtest.cpp \
-  ../../test/unittest/unittest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h \
-  ../../include/rapidjson/filereadstream.h \
-  ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/filewritestream.h \
-  ../../include/rapidjson/encodedstream.h \
-  ../../include/rapidjson/stringbuffer.h \
-  ../../include/rapidjson/internal/stack.h
-
-../../test/unittest/unittest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
-
-../../include/rapidjson/filereadstream.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/filewritestream.h:
-
-../../include/rapidjson/encodedstream.h:
-
-../../include/rapidjson/stringbuffer.h:
-
-../../include/rapidjson/internal/stack.h:
diff --git a/intermediate/debug/gmake/unittest/x32/encodedstreamtest.o b/intermediate/debug/gmake/unittest/x32/encodedstreamtest.o
deleted file mode 100644
index b46ea48..0000000
Binary files a/intermediate/debug/gmake/unittest/x32/encodedstreamtest.o and /dev/null differ
diff --git a/intermediate/debug/gmake/unittest/x32/encodingstest.d b/intermediate/debug/gmake/unittest/x32/encodingstest.d
deleted file mode 100644
index 49ee7a0..0000000
--- a/intermediate/debug/gmake/unittest/x32/encodingstest.d
+++ /dev/null
@@ -1,82 +0,0 @@
-../../intermediate/debug/gmake/unittest/x32/encodingstest.o: \
-  ../../test/unittest/encodingstest.cpp ../../test/unittest/unittest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h \
-  ../../include/rapidjson/filereadstream.h \
-  ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/filewritestream.h \
-  ../../include/rapidjson/encodedstream.h \
-  ../../include/rapidjson/stringbuffer.h \
-  ../../include/rapidjson/internal/stack.h
-
-../../test/unittest/unittest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
-
-../../include/rapidjson/filereadstream.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/filewritestream.h:
-
-../../include/rapidjson/encodedstream.h:
-
-../../include/rapidjson/stringbuffer.h:
-
-../../include/rapidjson/internal/stack.h:
diff --git a/intermediate/debug/gmake/unittest/x32/encodingstest.o b/intermediate/debug/gmake/unittest/x32/encodingstest.o
deleted file mode 100644
index 2cde1dd..0000000
Binary files a/intermediate/debug/gmake/unittest/x32/encodingstest.o and /dev/null differ
diff --git a/intermediate/debug/gmake/unittest/x32/filestreamtest.d b/intermediate/debug/gmake/unittest/x32/filestreamtest.d
deleted file mode 100644
index d85014a..0000000
--- a/intermediate/debug/gmake/unittest/x32/filestreamtest.d
+++ /dev/null
@@ -1,79 +0,0 @@
-../../intermediate/debug/gmake/unittest/x32/filestreamtest.o: \
-  ../../test/unittest/filestreamtest.cpp ../../test/unittest/unittest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h \
-  ../../include/rapidjson/filestream.h \
-  ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/filereadstream.h \
-  ../../include/rapidjson/filewritestream.h \
-  ../../include/rapidjson/encodedstream.h
-
-../../test/unittest/unittest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
-
-../../include/rapidjson/filestream.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/filereadstream.h:
-
-../../include/rapidjson/filewritestream.h:
-
-../../include/rapidjson/encodedstream.h:
diff --git a/intermediate/debug/gmake/unittest/x32/filestreamtest.o b/intermediate/debug/gmake/unittest/x32/filestreamtest.o
deleted file mode 100644
index b56fc54..0000000
Binary files a/intermediate/debug/gmake/unittest/x32/filestreamtest.o and /dev/null differ
diff --git a/intermediate/debug/gmake/unittest/x32/jsoncheckertest.d b/intermediate/debug/gmake/unittest/x32/jsoncheckertest.d
deleted file mode 100644
index 73283da..0000000
--- a/intermediate/debug/gmake/unittest/x32/jsoncheckertest.d
+++ /dev/null
@@ -1,81 +0,0 @@
-../../intermediate/debug/gmake/unittest/x32/jsoncheckertest.o: \
-  ../../test/unittest/jsoncheckertest.cpp ../../test/unittest/unittest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h \
-  ../../include/rapidjson/document.h ../../include/rapidjson/reader.h \
-  ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/internal/pow10.h \
-  ../../include/rapidjson/internal/stack.h \
-  ../../include/rapidjson/internal/strfunc.h
-
-../../test/unittest/unittest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
-
-../../include/rapidjson/document.h:
-
-../../include/rapidjson/reader.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/internal/pow10.h:
-
-../../include/rapidjson/internal/stack.h:
-
-../../include/rapidjson/internal/strfunc.h:
diff --git a/intermediate/debug/gmake/unittest/x32/jsoncheckertest.o b/intermediate/debug/gmake/unittest/x32/jsoncheckertest.o
deleted file mode 100644
index b4e11f3..0000000
Binary files a/intermediate/debug/gmake/unittest/x32/jsoncheckertest.o and /dev/null differ
diff --git a/intermediate/debug/gmake/unittest/x32/readertest.d b/intermediate/debug/gmake/unittest/x32/readertest.d
deleted file mode 100644
index d32e128..0000000
--- a/intermediate/debug/gmake/unittest/x32/readertest.d
+++ /dev/null
@@ -1,75 +0,0 @@
-../../intermediate/debug/gmake/unittest/x32/readertest.o: \
-  ../../test/unittest/readertest.cpp ../../test/unittest/unittest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h \
-  ../../include/rapidjson/reader.h ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/internal/pow10.h \
-  ../../include/rapidjson/internal/stack.h
-
-../../test/unittest/unittest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
-
-../../include/rapidjson/reader.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/internal/pow10.h:
-
-../../include/rapidjson/internal/stack.h:
diff --git a/intermediate/debug/gmake/unittest/x32/readertest.o b/intermediate/debug/gmake/unittest/x32/readertest.o
deleted file mode 100644
index d8b65dc..0000000
Binary files a/intermediate/debug/gmake/unittest/x32/readertest.o and /dev/null differ
diff --git a/intermediate/debug/gmake/unittest/x32/unittest.d b/intermediate/debug/gmake/unittest/x32/unittest.d
deleted file mode 100644
index 8e92941..0000000
--- a/intermediate/debug/gmake/unittest/x32/unittest.d
+++ /dev/null
@@ -1,58 +0,0 @@
-../../intermediate/debug/gmake/unittest/x32/unittest.o: \
-  ../../test/unittest/unittest.cpp ../../test/unittest/unittest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h
-
-../../test/unittest/unittest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
diff --git a/intermediate/debug/gmake/unittest/x32/unittest.o b/intermediate/debug/gmake/unittest/x32/unittest.o
deleted file mode 100644
index a3e409b..0000000
Binary files a/intermediate/debug/gmake/unittest/x32/unittest.o and /dev/null differ
diff --git a/intermediate/debug/gmake/unittest/x32/valuetest.d b/intermediate/debug/gmake/unittest/x32/valuetest.d
deleted file mode 100644
index d274bc5..0000000
--- a/intermediate/debug/gmake/unittest/x32/valuetest.d
+++ /dev/null
@@ -1,81 +0,0 @@
-../../intermediate/debug/gmake/unittest/x32/valuetest.o: \
-  ../../test/unittest/valuetest.cpp ../../test/unittest/unittest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h \
-  ../../include/rapidjson/document.h ../../include/rapidjson/reader.h \
-  ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/internal/pow10.h \
-  ../../include/rapidjson/internal/stack.h \
-  ../../include/rapidjson/internal/strfunc.h
-
-../../test/unittest/unittest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
-
-../../include/rapidjson/document.h:
-
-../../include/rapidjson/reader.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/internal/pow10.h:
-
-../../include/rapidjson/internal/stack.h:
-
-../../include/rapidjson/internal/strfunc.h:
diff --git a/intermediate/debug/gmake/unittest/x32/valuetest.o b/intermediate/debug/gmake/unittest/x32/valuetest.o
deleted file mode 100644
index daea03d..0000000
Binary files a/intermediate/debug/gmake/unittest/x32/valuetest.o and /dev/null differ
diff --git a/intermediate/debug/gmake/unittest/x32/writertest.d b/intermediate/debug/gmake/unittest/x32/writertest.d
deleted file mode 100644
index 94310f7..0000000
--- a/intermediate/debug/gmake/unittest/x32/writertest.d
+++ /dev/null
@@ -1,84 +0,0 @@
-../../intermediate/debug/gmake/unittest/x32/writertest.o: \
-  ../../test/unittest/writertest.cpp ../../test/unittest/unittest.h \
-  ../../thirdparty/gtest/include/gtest/gtest.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-internal.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-port.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-string.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h \
-  ../../thirdparty/gtest/include/gtest/gtest-death-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h \
-  ../../thirdparty/gtest/include/gtest/gtest-message.h \
-  ../../thirdparty/gtest/include/gtest/gtest-param-test.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h \
-  ../../thirdparty/gtest/include/gtest/gtest-printers.h \
-  ../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h \
-  ../../thirdparty/gtest/include/gtest/gtest_prod.h \
-  ../../thirdparty/gtest/include/gtest/gtest-test-part.h \
-  ../../thirdparty/gtest/include/gtest/gtest-typed-test.h \
-  ../../thirdparty/gtest/include/gtest/gtest_pred_impl.h \
-  ../../include/rapidjson/reader.h ../../include/rapidjson/rapidjson.h \
-  ../../include/rapidjson/allocators.h \
-  ../../include/rapidjson/encodings.h \
-  ../../include/rapidjson/internal/pow10.h \
-  ../../include/rapidjson/internal/stack.h \
-  ../../include/rapidjson/writer.h \
-  ../../include/rapidjson/internal/strfunc.h \
-  ../../include/rapidjson/stringbuffer.h
-
-../../test/unittest/unittest.h:
-
-../../thirdparty/gtest/include/gtest/gtest.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-internal.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-port.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-string.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-filepath.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-type-util.h:
-
-../../thirdparty/gtest/include/gtest/gtest-death-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-death-test-internal.h:
-
-../../thirdparty/gtest/include/gtest/gtest-message.h:
-
-../../thirdparty/gtest/include/gtest/gtest-param-test.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-linked_ptr.h:
-
-../../thirdparty/gtest/include/gtest/gtest-printers.h:
-
-../../thirdparty/gtest/include/gtest/internal/gtest-param-util-generated.h:
-
-../../thirdparty/gtest/include/gtest/gtest_prod.h:
-
-../../thirdparty/gtest/include/gtest/gtest-test-part.h:
-
-../../thirdparty/gtest/include/gtest/gtest-typed-test.h:
-
-../../thirdparty/gtest/include/gtest/gtest_pred_impl.h:
-
-../../include/rapidjson/reader.h:
-
-../../include/rapidjson/rapidjson.h:
-
-../../include/rapidjson/allocators.h:
-
-../../include/rapidjson/encodings.h:
-
-../../include/rapidjson/internal/pow10.h:
-
-../../include/rapidjson/internal/stack.h:
-
-../../include/rapidjson/writer.h:
-
-../../include/rapidjson/internal/strfunc.h:
-
-../../include/rapidjson/stringbuffer.h:
diff --git a/intermediate/debug/gmake/unittest/x32/writertest.o b/intermediate/debug/gmake/unittest/x32/writertest.o
deleted file mode 100644
index 65f6281..0000000
Binary files a/intermediate/debug/gmake/unittest/x32/writertest.o and /dev/null differ
diff --git a/thirdparty/lib/libgtest_debug_x32_gmake.a b/thirdparty/lib/libgtest_debug_x32_gmake.a
deleted file mode 100644
index e91845a..0000000
Binary files a/thirdparty/lib/libgtest_debug_x32_gmake.a and /dev/null differ