Bug 903794 - Cleanup PluginModuleParent.h includes; r=johns

dom/plugins/ipc/PluginModuleParent.cpp

@@ -18,6 +18,7 @@
 #include "mozilla/dom/PCrashReporterParent.h"
 #include "mozilla/ipc/SyncChannel.h"
 #include "mozilla/plugins/BrowserStreamParent.h"
+#include "mozilla/plugins/PluginInstanceParent.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "mozilla/unused.h"

dom/plugins/ipc/PluginModuleParent.h

@@ -4,31 +4,19 @@
  * 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 dom_plugins_PluginModuleParent_h
-#define dom_plugins_PluginModuleParent_h 1
-
-#include <cstring>
-
-#include "base/basictypes.h"
-
-#include "prlink.h"
-
-#include "npapi.h"
-#include "npfunctions.h"
-
-#include "base/string_util.h"
+#ifndef mozilla_plugins_PluginModuleParent_h
+#define mozilla_plugins_PluginModuleParent_h
 
+#include "base/process.h"
 #include "mozilla/FileUtils.h"
 #include "mozilla/PluginLibrary.h"
-#include "mozilla/plugins/PPluginModuleParent.h"
-#include "mozilla/plugins/PluginInstanceParent.h"
 #include "mozilla/plugins/PluginProcessParent.h"
-#include "mozilla/plugins/PluginIdentifierParent.h"
-
+#include "mozilla/plugins/PPluginModuleParent.h"
+#include "npapi.h"
+#include "npfunctions.h"
 #include "nsAutoPtr.h"
 #include "nsDataHashtable.h"
 #include "nsHashKeys.h"
-#include "nsIFileStreams.h"
 
 #ifdef MOZ_CRASHREPORTER
 #include "nsExceptionHandler.h"
@@ -44,6 +32,8 @@ namespace plugins {
 //-----------------------------------------------------------------------------
 
 class BrowserStreamParent;
+class PluginIdentifierParent;
+class PluginInstanceParent;
 
 #ifdef XP_WIN
 class PluginHangUIParent;
@@ -370,4 +360,4 @@ private:
 } // namespace plugins
 } // namespace mozilla
 
-#endif  // ifndef dom_plugins_PluginModuleParent_h
+#endif // mozilla_plugins_PluginModuleParent_h

dom/plugins/ipc/PluginScriptableObjectParent.cpp

@@ -4,14 +4,14 @@
  * 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/. */
 
-#include "mozilla/DebugOnly.h"
-
 #include "PluginScriptableObjectParent.h"
-#include "PluginScriptableObjectUtils.h"
 
-#include "nsNPAPIPlugin.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/plugins/PluginIdentifierParent.h"
 #include "mozilla/unused.h"
 #include "nsCxPusher.h"
+#include "nsNPAPIPlugin.h"
+#include "PluginScriptableObjectUtils.h"
 
 using namespace mozilla::plugins;
 using namespace mozilla::plugins::parent;