diff --git a/src/Attr.cc b/src/Attr.cc
index 40c6c1a75c..82d9c9ddc7 100644
--- a/src/Attr.cc
+++ b/src/Attr.cc
@@ -5,7 +5,7 @@
 #include "Attr.h"
 #include "Expr.h"
 #include "Serializer.h"
-#include "threading/SerializationTypes.h"
+#include "threading/SerialTypes.h"
 
 const char* attr_name(attr_tag t)
 	{
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7a3cc4babf..67d82c577a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -411,7 +411,7 @@ set(bro_SRCS
     threading/BasicThread.cc
     threading/Manager.cc
     threading/MsgThread.cc
-    threading/SerializationTypes.cc
+    threading/SerialTypes.cc
 
     logging/Manager.cc
     logging/WriterBackend.cc
diff --git a/src/RemoteSerializer.cc b/src/RemoteSerializer.cc
index ba2598c018..948dfddaff 100644
--- a/src/RemoteSerializer.cc
+++ b/src/RemoteSerializer.cc
@@ -184,7 +184,7 @@
 #include "File.h"
 #include "Conn.h"
 #include "Reporter.h"
-#include "threading/SerializationTypes.h"
+#include "threading/SerialTypes.h"
 #include "logging/Manager.h"
 
 extern "C" {
diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc
index 5f9f1c4222..6078a1e566 100644
--- a/src/logging/Manager.cc
+++ b/src/logging/Manager.cc
@@ -7,6 +7,8 @@
 #include "../NetVar.h"
 #include "../Net.h"
 
+#include "threading/SerialTypes.h"
+
 #include "Manager.h"
 #include "WriterFrontend.h"
 #include "WriterBackend.h"
@@ -14,8 +16,6 @@
 #include "writers/Ascii.h"
 #include "writers/None.h"
 
-#include "threading/SerializationTypes.h"
-
 using namespace logging;
 using threading::Value;
 using threading::Field;
diff --git a/src/logging/WriterBackend.cc b/src/logging/WriterBackend.cc
index 0ffedf073c..f4e48ebaef 100644
--- a/src/logging/WriterBackend.cc
+++ b/src/logging/WriterBackend.cc
@@ -1,10 +1,10 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "util.h"
+#include "threading/SerialTypes.h"
 
 #include "WriterBackend.h"
 #include "WriterFrontend.h"
-#include "../threading/SerializationTypes.h"
 
 // Messages sent from backend to frontend (i.e., "OutputMessages").
 
diff --git a/src/logging/WriterFrontend.cc b/src/logging/WriterFrontend.cc
index b0e780f27d..02f1a188d8 100644
--- a/src/logging/WriterFrontend.cc
+++ b/src/logging/WriterFrontend.cc
@@ -1,9 +1,9 @@
 
 #include "Net.h"
+#include "threading/SerialTypes.h"
 
 #include "WriterFrontend.h"
 #include "WriterBackend.h"
-#include "../threading/SerializationTypes.h"
 
 using threading::Value;
 using threading::Field;
diff --git a/src/logging/writers/Ascii.cc b/src/logging/writers/Ascii.cc
index c974877175..0a101feb79 100644
--- a/src/logging/writers/Ascii.cc
+++ b/src/logging/writers/Ascii.cc
@@ -3,10 +3,10 @@
 #include <string>
 #include <errno.h>
 
-#include "../../NetVar.h"
+#include "NetVar.h"
+#include "threading/SerialTypes.h"
 
 #include "Ascii.h"
-#include "../../threading/SerializationTypes.h"
 
 using namespace logging;
 using namespace writer;
diff --git a/src/threading/SerializationTypes.cc b/src/threading/SerialTypes.cc
similarity index 99%
rename from src/threading/SerializationTypes.cc
rename to src/threading/SerialTypes.cc
index f74de6ce57..f35d1fc6b0 100644
--- a/src/threading/SerializationTypes.cc
+++ b/src/threading/SerialTypes.cc
@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
 
-#include "SerializationTypes.h"
+#include "SerialTypes.h"
 #include "../RemoteSerializer.h"
 
 
diff --git a/src/threading/SerializationTypes.h b/src/threading/SerialTypes.h
similarity index 100%
rename from src/threading/SerializationTypes.h
rename to src/threading/SerialTypes.h