diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9715f062c..b492c2fc5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1067,7 +1067,7 @@ set (PCH_SOURCES
 	common/fonts/v_text.cpp	
 	common/textures/hw_ihwtexture.cpp
 	common/textures/hw_material.cpp
-	common/textures/bitmap.cpp
+	gamedata/textures/bitmap.cpp
 	common/textures/m_png.cpp
 	common/textures/texture.cpp
 	common/textures/image.cpp
@@ -1245,6 +1245,7 @@ include_directories( .
 	common/textures
 	common/textures/formats
 	common/textures/hires
+	common/textures
 	common/filesystem
 	common/utility
 	common/console
diff --git a/src/serializer_doom.cpp b/src/serializer_doom.cpp
index 250e275be..27ab87d60 100644
--- a/src/serializer_doom.cpp
+++ b/src/serializer_doom.cpp
@@ -1,3 +1,43 @@
+/*
+** serializer.cpp
+** Savegame wrapper around RapidJSON
+**
+**---------------------------------------------------------------------------
+** Copyright 2016 Christoph Oelckers
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+** 1. Redistributions of source code must retain the above copyright
+**    notice, this list of conditions and the following disclaimer.
+** 2. Redistributions in binary form must reproduce the above copyright
+**    notice, this list of conditions and the following disclaimer in the
+**    documentation and/or other materials provided with the distribution.
+** 3. The name of the author may not be used to endorse or promote products
+**    derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**---------------------------------------------------------------------------
+**
+*/
+
+// The #defines here *MUST* match serializer.cpp, or we will get countless strange errors.
+#define RAPIDJSON_48BITPOINTER_OPTIMIZATION 0	// disable this insanity which is bound to make the code break over time.
+#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
+#define RAPIDJSON_HAS_CXX11_RANGE_FOR 1
+#define RAPIDJSON_PARSE_DEFAULT_FLAGS kParseFullPrecisionFlag
+
 #include <zlib.h>
 #include "rapidjson/rapidjson.h"
 #include "rapidjson/writer.h"