diff --git a/src/ripple/app/misc/AmendmentTableImpl.cpp b/src/ripple/app/misc/AmendmentTableImpl.cpp
index e0a0f8476..ba7f66dbf 100644
--- a/src/ripple/app/misc/AmendmentTableImpl.cpp
+++ b/src/ripple/app/misc/AmendmentTableImpl.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
+#include <ripple/app/main/Application.h>
 #include <ripple/app/misc/AmendmentTable.h>
 #include <ripple/app/misc/Validations.h>
 #include <ripple/app/data/DatabaseCon.h>
diff --git a/src/ripple/app/misc/tests/AmendmentTable.test.cpp b/src/ripple/app/misc/tests/AmendmentTable.test.cpp
index 7e9e0ac8a..68da0d2c3 100644
--- a/src/ripple/app/misc/tests/AmendmentTable.test.cpp
+++ b/src/ripple/app/misc/tests/AmendmentTable.test.cpp
@@ -20,6 +20,8 @@
 #include <BeastConfig.h>
 
 #include <ripple/app/misc/AmendmentTable.h>
+#include <ripple/basics/BasicConfig.h>
+#include <ripple/basics/seconds_clock.h>
 #include <ripple/core/ConfigSections.h>
 #include <beast/unit_test/suite.h>
 
diff --git a/src/ripple/app/transactors/CreateOffer.cpp b/src/ripple/app/transactors/CreateOffer.cpp
index d9e75e2b6..5d4455694 100644
--- a/src/ripple/app/transactors/CreateOffer.cpp
+++ b/src/ripple/app/transactors/CreateOffer.cpp
@@ -23,6 +23,7 @@
 #include <ripple/app/book/Types.h>
 #include <ripple/app/book/Amounts.h>
 #include <ripple/app/book/Quality.h>
+#include <ripple/app/transactors/Transactor.h>
 #include <ripple/basics/Log.h>
 #include <ripple/json/to_string.h>
 
diff --git a/src/ripple/app/websocket/WSDoor.h b/src/ripple/app/websocket/WSDoor.h
index d93810acf..636d14c1f 100644
--- a/src/ripple/app/websocket/WSDoor.h
+++ b/src/ripple/app/websocket/WSDoor.h
@@ -20,6 +20,7 @@
 #ifndef RIPPLE_WSDOOR_H_INCLUDED
 #define RIPPLE_WSDOOR_H_INCLUDED
 
+#include <ripple/app/main/CollectorManager.h>
 #include <ripple/net/InfoSub.h>
 #include <ripple/resource/Manager.h>
 #include <ripple/server/Port.h>
diff --git a/src/ripple/app/websocket/WSServerHandler.h b/src/ripple/app/websocket/WSServerHandler.h
index 2e4df6f2e..9d0ff208d 100644
--- a/src/ripple/app/websocket/WSServerHandler.h
+++ b/src/ripple/app/websocket/WSServerHandler.h
@@ -21,6 +21,7 @@
 #define RIPPLE_WSSERVERHANDLER_H_INCLUDED
 
 #include <ripple/app/main/Application.h>
+#include <ripple/app/main/CollectorManager.h>
 #include <ripple/app/websocket/WSConnection.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/server/Port.h>
diff --git a/src/ripple/peerfinder/impl/Logic.h b/src/ripple/peerfinder/impl/Logic.h
index f0b3e67bb..56bc76760 100644
--- a/src/ripple/peerfinder/impl/Logic.h
+++ b/src/ripple/peerfinder/impl/Logic.h
@@ -31,6 +31,7 @@
 #include <ripple/peerfinder/impl/SlotImp.h>
 #include <ripple/peerfinder/impl/Source.h>
 #include <ripple/peerfinder/impl/Store.h>
+#include <beast/asio/IPAddressConversion.h>
 #include <beast/container/aged_container_utility.h>
 #include <beast/smart_ptr/SharedPtr.h>
 #include <functional>