--- a/storage/src/mozStorageAsyncStatementParams.h
+++ b/storage/src/mozStorageAsyncStatementParams.h
@@ -11,16 +11,18 @@
 #include "nsIXPCScriptable.h"
 #include "mozilla/Attributes.h"
 
 class mozIStorageAsyncStatement;
 
 namespace mozilla {
 namespace storage {
 
+class AsyncStatement;
+
 /*
  * Since mozIStorageStatementParams is just a tagging interface we do not have
  * an async variant.
  */
 class AsyncStatementParams final : public mozIStorageStatementParams
                                      , public nsIXPCScriptable
 {
 public:

--- a/storage/src/mozStorageStatementJSHelper.h
+++ b/storage/src/mozStorageStatementJSHelper.h
@@ -3,16 +3,17 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef MOZSTORAGESTATEMENTJSHELPER_H
 #define MOZSTORAGESTATEMENTJSHELPER_H
 
 #include "nsIXPCScriptable.h"
+#include "nsIXPConnect.h"
 
 class Statement;
 
 namespace mozilla {
 namespace storage {
 
 class StatementJSHelper : public nsIXPCScriptable
 {

--- a/storage/src/mozStorageStatementRow.h
+++ b/storage/src/mozStorageStatementRow.h
@@ -9,16 +9,18 @@
 
 #include "mozIStorageStatementRow.h"
 #include "nsIXPCScriptable.h"
 #include "mozilla/Attributes.h"
 
 namespace mozilla {
 namespace storage {
 
+class Statement;
+
 class StatementRow final : public mozIStorageStatementRow
                              , public nsIXPCScriptable
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_MOZISTORAGESTATEMENTROW
   NS_DECL_NSIXPCSCRIPTABLE