diff --git a/include/amqpcpp.h b/include/amqpcpp.h
index 3c5de03..ebb064e 100644
--- a/include/amqpcpp.h
+++ b/include/amqpcpp.h
@@ -41,7 +41,7 @@
 #include "amqpcpp/endian.h"
 #include "amqpcpp/buffer.h"
 #include "amqpcpp/bytebuffer.h"
-#include "amqpcpp/receivedframe.h"
+#include "amqpcpp/inbuffer.h"
 #include "amqpcpp/outbuffer.h"
 #include "amqpcpp/watchable.h"
 #include "amqpcpp/monitor.h"
diff --git a/include/amqpcpp/classes.h b/include/amqpcpp/classes.h
index 0cbaafb..5c764ad 100644
--- a/include/amqpcpp/classes.h
+++ b/include/amqpcpp/classes.h
@@ -37,7 +37,7 @@ class Frame;
 class Login;
 class Monitor;
 class OutBuffer;
-class ReceivedFrame;
+class InBuffer;
 class Table;
 
 /**
diff --git a/src/extframe.h b/src/extframe.h
index 513c674..8f48afd 100644
--- a/src/extframe.h
+++ b/src/extframe.h
@@ -8,7 +8,7 @@
  *  The ExtFrame is the base class for all other frames, apart from the
  *  protocol-header-frame
  *
- *  @copyright 2014 Copernica BV
+ *  @copyright 2014 - 2020 Copernica BV
  */
 
 /**
@@ -20,7 +20,7 @@
  *  Dependencies
  */
 #include "amqpcpp/frame.h"
-#include "amqpcpp/receivedframe.h"
+#include "receivedframe.h"
 
 /**
  *  Set up namespace
diff --git a/src/includes.h b/src/includes.h
index 3e8bd18..9451588 100644
--- a/src/includes.h
+++ b/src/includes.h
@@ -42,7 +42,6 @@
 #include "amqpcpp/buffer.h"
 #include "amqpcpp/bytebuffer.h"
 #include "amqpcpp/inbuffer.h"
-#include "amqpcpp/receivedframe.h"
 #include "amqpcpp/outbuffer.h"
 #include "amqpcpp/copiedbuffer.h"
 #include "amqpcpp/watchable.h"
diff --git a/include/amqpcpp/receivedframe.h b/src/receivedframe.h
similarity index 99%
rename from include/amqpcpp/receivedframe.h
rename to src/receivedframe.h
index a413d93..c1d270a 100644
--- a/include/amqpcpp/receivedframe.h
+++ b/src/receivedframe.h
@@ -29,7 +29,6 @@ namespace AMQP {
 /**
  *  Forward declarations
  */
-class Buffer;
 class ConnectionImpl;
 
 /**