diff --git a/net/dccp/Makefile b/net/dccp/Makefile
index 44a867f291848e9ad0ad43a6e4938f3e8f9b5fbd..fb97bb0424553591ebd157e1ba459af124f621aa 100644
--- a/net/dccp/Makefile
+++ b/net/dccp/Makefile
@@ -1,7 +1,7 @@
 obj-$(CONFIG_IP_DCCP) += dccp.o
 
 dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \
-	  timer.o packet_history.o
+	  timer.o
 
 obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o
 
diff --git a/net/dccp/ccids/Makefile b/net/dccp/ccids/Makefile
index 323b68f3b60735197d644a8b083564e5535101e1..29eb1b61fdbde754a8ac5579fc31ab176f1c92d8 100644
--- a/net/dccp/ccids/Makefile
+++ b/net/dccp/ccids/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_IP_DCCP_CCID3) += dccp_ccid3.o
 
-dccp_ccid3-y := ccid3.o lib/loss_interval.o
+dccp_ccid3-y := ccid3.o lib/loss_interval.o lib/packet_history.o
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 7468928b83c6ef38b0fe6d32b8076be7ab80e50b..12548fbde86be3abe8e6272eef41dd3094fc6817 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -37,7 +37,7 @@
 #include <linux/config.h>
 #include "../ccid.h"
 #include "../dccp.h"
-#include "../packet_history.h"
+#include "lib/packet_history.h"
 #include "lib/loss_interval.h"
 #include "ccid3.h"
 
diff --git a/net/dccp/packet_history.c b/net/dccp/ccids/lib/packet_history.c
similarity index 100%
rename from net/dccp/packet_history.c
rename to net/dccp/ccids/lib/packet_history.c
diff --git a/net/dccp/packet_history.h b/net/dccp/ccids/lib/packet_history.h
similarity index 99%
rename from net/dccp/packet_history.h
rename to net/dccp/ccids/lib/packet_history.h
index 2e5ba343e3dd540be4c71a8c5352ce7c8504d5dd..235828d822d9d033ec59b0f2465800eac3069794 100644
--- a/net/dccp/packet_history.h
+++ b/net/dccp/ccids/lib/packet_history.h
@@ -42,7 +42,7 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 
-#include "dccp.h"
+#include "../../dccp.h"
 
 struct dccp_tx_hist_entry {
 	struct list_head dccphtx_node;