- missed two things that need to be 'common'.

src/common/engine/palettecontainer.cpp

@@ -40,10 +40,8 @@
 #include "templates.h"
 #include "palettecontainer.h"
 
-#include "v_palette.h"
-
-
 PaletteContainer GPalette;
+FColorMatcher ColorMatcher;
 
 //----------------------------------------------------------------------------
 //
@@ -235,6 +233,21 @@ static bool IndexOutOfRange(const int start1, const int end1, const int start2,
 //
 //----------------------------------------------------------------------------
 
+bool FRemapTable::operator==(const FRemapTable& o)
+{
+	// Two translations are identical when they have the same amount of colors
+	// and the palette values for both are identical.
+	if (&o == this) return true;
+	if (o.NumEntries != NumEntries) return false;
+	return !memcmp(o.Palette, Palette, NumEntries * sizeof(*Palette));
+}
+
+//----------------------------------------------------------------------------
+//
+//
+//
+//----------------------------------------------------------------------------
+
 void FRemapTable::MakeIdentity()
 {
 	int i;

src/r_data/r_translate.cpp

@@ -80,21 +80,6 @@ const uint8_t IcePalette[16][3] =
 //
 //----------------------------------------------------------------------------
 
-bool FRemapTable::operator==(const FRemapTable &o)
-{
-	// Two translations are identical when they have the same amount of colors
-	// and the palette values for both are identical.
-	if (&o == this) return true;
-	if (o.NumEntries != NumEntries) return false;
-	return !memcmp(o.Palette, Palette, NumEntries * sizeof(*Palette));
-}
-
-//----------------------------------------------------------------------------
-//
-//
-//
-//----------------------------------------------------------------------------
-
 static void SerializeRemap(FSerializer &arc, FRemapTable &remap)
 {
 	arc("numentries", remap.NumEntries);

src/r_data/v_palette.cpp

@@ -57,8 +57,6 @@ uint32_t Col2RGB8_2[63][256]; // this array's second dimension is called up by p
 ColorTable32k RGB32k;
 ColorTable256k RGB256k;
 
-FColorMatcher ColorMatcher;
-
 /* Current color blending values */
 int		BlendR, BlendG, BlendB, BlendA;