Bug 918651 - part 5 - qualify all IPDL using statements with required header; r=ehsan

dom/bluetooth/ipc/PBluetooth.ipdl

@@ -12,7 +12,7 @@ include BluetoothTypes;
 
 include "mozilla/dom/bluetooth/ipc/BluetoothMessageUtils.h";
 
-using mozilla::dom::bluetooth::BluetoothObjectType;
+using mozilla::dom::bluetooth::BluetoothObjectType from "mozilla/dom/bluetooth/BluetoothCommon.h";
 
 namespace mozilla {
 namespace dom {

dom/fmradio/ipc/PFMRadio.ipdl

@@ -7,7 +7,7 @@ include "mozilla/HalTypes.h";
 include protocol PContent;
 include protocol PFMRadioRequest;
 
-using mozilla::hal::FMRadioSeekDirection;
+using mozilla::hal::FMRadioSeekDirection from "mozilla/HalTypes.h";
 
 namespace mozilla {
 namespace dom {

dom/indexedDB/ipc/IndexedDBParams.ipdlh

@@ -4,11 +4,11 @@
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
 
-using mozilla::dom::indexedDB::Key;
-using mozilla::dom::indexedDB::IDBCursor::Direction;
-using mozilla::dom::indexedDB::SerializedStructuredCloneReadInfo;
+using class mozilla::dom::indexedDB::Key from "mozilla/dom/indexedDB/Key.h";
+using mozilla::dom::indexedDB::IDBCursor::Direction from "mozilla/dom/indexedDB/IDBCursor.h";
+using struct mozilla::dom::indexedDB::SerializedStructuredCloneReadInfo from "mozilla/dom/indexedDB/IndexedDatabase.h";
 
-using mozilla::void_t;
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
 
 namespace mozilla {
 namespace dom {

dom/indexedDB/ipc/PIndexedDB.ipdl

@@ -9,7 +9,7 @@ include protocol PIndexedDBDeleteDatabaseRequest;
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
 
-using mozilla::dom::quota::PersistenceType;
+using mozilla::dom::quota::PersistenceType from "mozilla/dom/quota/PersistenceType.h";
 
 namespace mozilla {
 namespace dom {

dom/indexedDB/ipc/PIndexedDBCursor.ipdl

@@ -8,10 +8,10 @@ include protocol PIndexedDBRequest;
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
 
-using mozilla::dom::indexedDB::Key;
-using mozilla::dom::indexedDB::IDBCursor::Direction;
+using class mozilla::dom::indexedDB::Key from "mozilla/dom/indexedDB/Key.h";
+using mozilla::dom::indexedDB::IDBCursor::Direction from "mozilla/dom/indexedDB/IDBCursor.h";
 
-using mozilla::void_t;
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
 
 namespace mozilla {
 namespace dom {

dom/indexedDB/ipc/PIndexedDBDatabase.ipdl

@@ -7,9 +7,9 @@ include protocol PIndexedDBTransaction;
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
 
-using mozilla::dom::indexedDB::DatabaseInfoGuts;
-using mozilla::dom::indexedDB::ObjectStoreInfoGuts;
-using mozilla::dom::indexedDB::IDBTransaction::Mode;
+using struct mozilla::dom::indexedDB::DatabaseInfoGuts from "mozilla/dom/indexedDB/DatabaseInfo.h";
+using struct mozilla::dom::indexedDB::ObjectStoreInfoGuts from "mozilla/dom/indexedDB/DatabaseInfo.h";
+using mozilla::dom::indexedDB::IDBTransaction::Mode from "mozilla/dom/indexedDB/IDBTransaction.h";
 
 namespace mozilla {
 namespace dom {

dom/indexedDB/ipc/PIndexedDBObjectStore.ipdl

@@ -10,9 +10,9 @@ include protocol PIndexedDBTransaction;
 
 include IndexedDBParams;
 
-using mozilla::dom::indexedDB::IndexInfo;
-using mozilla::dom::indexedDB::IndexUpdateInfo;
-using mozilla::dom::indexedDB::SerializedStructuredCloneWriteInfo;
+using struct mozilla::dom::indexedDB::IndexInfo from "mozilla/dom/indexedDB/DatabaseInfo.h";
+using struct mozilla::dom::indexedDB::IndexUpdateInfo from "mozilla/dom/indexedDB/DatabaseInfo.h";
+using struct mozilla::dom::indexedDB::SerializedStructuredCloneWriteInfo from "mozilla/dom/indexedDB/IndexedDatabase.h";
 
 namespace mozilla {
 namespace dom {

dom/indexedDB/ipc/PIndexedDBRequest.ipdl

@@ -9,10 +9,10 @@ include protocol PIndexedDBObjectStore;
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
 
-using mozilla::dom::indexedDB::Key;
-using mozilla::dom::indexedDB::SerializedStructuredCloneReadInfo;
+using class mozilla::dom::indexedDB::Key from "mozilla/dom/indexedDB/Key.h";
+using struct mozilla::dom::indexedDB::SerializedStructuredCloneReadInfo from "mozilla/dom/indexedDB/IndexedDatabase.h";
 
-using mozilla::void_t;
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
 
 namespace mozilla {
 namespace dom {

dom/indexedDB/ipc/PIndexedDBTransaction.ipdl

@@ -7,7 +7,7 @@ include protocol PIndexedDBObjectStore;
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
 
-using mozilla::dom::indexedDB::ObjectStoreInfoGuts;
+using struct mozilla::dom::indexedDB::ObjectStoreInfoGuts from "mozilla/dom/indexedDB/DatabaseInfo.h";
 
 namespace mozilla {
 namespace dom {

dom/ipc/DOMTypes.ipdlh

@@ -7,7 +7,7 @@
 include protocol PBlob;
 include InputStreamParams;
 
-using mozilla::SerializedStructuredCloneBuffer;
+using struct mozilla::SerializedStructuredCloneBuffer from "ipc/IPCMessageUtils.h";
 
 namespace mozilla {
 namespace dom {

dom/ipc/PBrowser.ipdl

@@ -26,33 +26,34 @@ include "mozilla/dom/PermissionMessageUtils.h";
 include "mozilla/layout/RenderFrameUtils.h";
 include "mozilla/layers/CompositorTypes.h";
 
-using IPC::Principal;
-using gfxMatrix;
-using gfxSize;
-using CSSRect;
-using mozilla::layers::FrameMetrics;
-using FrameMetrics::ViewID;
-using mozilla::layout::ScrollingBehavior;
-using mozilla::void_t;
-using mozilla::WindowsHandle;
-using nscolor;
-using mozilla::WidgetCompositionEvent;
-using nsIMEUpdatePreference;
-using nsIntPoint;
-using nsIntRect;
-using nsIntSize;
-using mozilla::WidgetKeyboardEvent;
-using mozilla::WidgetMouseEvent;
-using mozilla::WidgetWheelEvent;
-using nsRect;
-using mozilla::WidgetSelectionEvent;
-using mozilla::WidgetTextEvent;
-using mozilla::WidgetTouchEvent;
-using RemoteDOMEvent;
-using mozilla::dom::ScreenOrientation;
-using mozilla::layers::TextureFactoryIdentifier;
-using mozilla::CSSIntPoint;
-using mozilla::CSSToScreenScale;
+using class IPC::Principal from "mozilla/dom/PermissionMessageUtils.h";
+using struct gfxMatrix from "gfxMatrix.h";
+using struct gfxSize from "gfxPoint.h";
+using CSSRect from "Units.h";
+using struct mozilla::layers::FrameMetrics from "FrameMetrics.h";
+using FrameMetrics::ViewID from "FrameMetrics.h";
+using mozilla::layout::ScrollingBehavior from "mozilla/layout/RenderFrameUtils.h";
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using mozilla::WindowsHandle from "ipc/IPCMessageUtils.h";
+using nscolor from "nsColor.h";
+using class mozilla::WidgetCompositionEvent from "ipc/nsGUIEventIPC.h";
+using struct nsIMEUpdatePreference from "nsIWidget.h";
+using struct nsIntPoint from "nsPoint.h";
+using struct nsIntRect from "nsRect.h";
+using struct nsIntSize from "nsSize.h";
+using class mozilla::WidgetKeyboardEvent from "ipc/nsGUIEventIPC.h";
+using class mozilla::WidgetMouseEvent from "ipc/nsGUIEventIPC.h";
+using class mozilla::WidgetWheelEvent from "ipc/nsGUIEventIPC.h";
+using struct nsRect from "nsRect.h";
+using class mozilla::WidgetSelectionEvent from "ipc/nsGUIEventIPC.h";
+using class mozilla::WidgetTextEvent from "ipc/nsGUIEventIPC.h";
+using class mozilla::WidgetTouchEvent from "ipc/nsGUIEventIPC.h";
+using struct mozilla::dom::RemoteDOMEvent from "mozilla/dom/TabMessageUtils.h";
+using mozilla::dom::ScreenOrientation from "mozilla/dom/ScreenOrientation.h";
+using struct mozilla::layers::TextureFactoryIdentifier from "mozilla/layers/CompositorTypes.h";
+using mozilla::CSSIntPoint from "Units.h";
+using mozilla::CSSToScreenScale from "Units.h";
+
 namespace mozilla {
 namespace dom {
 

dom/ipc/PContent.ipdl

@@ -39,21 +39,21 @@ include "mozilla/net/NeckoMessageUtils.h";
 include "nsGeoPositionIPCSerialiser.h";
 include "gfxPoint.h";
 
-using GeoPosition;
+using GeoPosition from "nsGeoPositionIPCSerialiser.h";
 
-using ChromePackage;
-using ResourceMapping;
-using OverrideMapping;
-using base::ChildPrivileges;
-using IPC::Permission;
-using IPC::Principal;
-using mozilla::null_t;
-using mozilla::void_t;
-using mozilla::dom::AudioChannelType;
-using mozilla::dom::AudioChannelState;
-using mozilla::dom::NativeThreadId;
-using mozilla::hal::ProcessPriority;
-using gfxIntSize;
+using struct ChromePackage from "mozilla/chrome/RegistryMessageUtils.h";
+using struct ResourceMapping from "mozilla/chrome/RegistryMessageUtils.h";
+using struct OverrideMapping from "mozilla/chrome/RegistryMessageUtils.h";
+using base::ChildPrivileges from "base/process_util.h";
+using struct IPC::Permission from "mozilla/net/NeckoMessageUtils.h";
+using class IPC::Principal from "mozilla/dom/PermissionMessageUtils.h";
+using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using mozilla::dom::AudioChannelType from "AudioChannelCommon.h";
+using mozilla::dom::AudioChannelState from "AudioChannelCommon.h";
+using mozilla::dom::NativeThreadId from "mozilla/dom/TabMessageUtils.h";
+using mozilla::hal::ProcessPriority from "mozilla/HalTypes.h";
+using gfxIntSize from "nsSize.h";
 
 namespace mozilla {
 namespace dom {

dom/ipc/PDocumentRenderer.ipdl

@@ -7,7 +7,7 @@ include protocol PBrowser;
 
 include "mozilla/GfxMessageUtils.h";
 
-using nsIntSize;
+using struct nsIntSize from "nsSize.h";
 
 namespace mozilla {
 namespace ipc {

dom/ipc/PTabContext.ipdlh

@@ -8,7 +8,7 @@ include protocol PBrowser;
 
 include "mozilla/layout/RenderFrameUtils.h";
 
-using mozilla::layout::ScrollingBehavior;
+using mozilla::layout::ScrollingBehavior from "mozilla/layout/RenderFrameUtils.h";
 
 namespace mozilla {
 namespace dom {

dom/mobilemessage/src/ipc/SmsTypes.ipdlh

@@ -7,11 +7,11 @@
 include "mozilla/dom/mobilemessage/Types.h";
 include protocol PBlob;
 
-using DeliveryState;
-using DeliveryStatus;
-using MessageClass;
-using ReadState;
-using MessageType;
+using DeliveryState from "mozilla/dom/mobilemessage/Types.h";
+using DeliveryStatus from "mozilla/dom/mobilemessage/Types.h";
+using MessageClass from "mozilla/dom/mobilemessage/Types.h";
+using ReadState from "mozilla/dom/mobilemessage/Types.h";
+using MessageType from "mozilla/dom/mobilemessage/Types.h";
 
 namespace mozilla {
 namespace dom {

dom/network/src/PTCPSocket.ipdl

@@ -9,7 +9,7 @@ include protocol PNecko;
 
 include "mozilla/net/NeckoMessageUtils.h";
 
-using mozilla::void_t;
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
 
 struct TCPError {
   nsString name;

dom/plugins/ipc/PBrowserStream.ipdl

@@ -7,11 +7,11 @@ include protocol PPluginInstance;
 
 include "mozilla/plugins/PluginMessageUtils.h";
 
-using mozilla::plugins::Buffer;
-using mozilla::plugins::IPCByteRanges;
+using mozilla::plugins::Buffer from "mozilla/plugins/PluginMessageUtils.h";
+using mozilla::plugins::IPCByteRanges from "mozilla/plugins/PluginMessageUtils.h";
 
-using NPError;
-using NPReason;
+using NPError from "npapi.h";
+using NPReason from "npapi.h";
 
 namespace mozilla {
 namespace plugins {

dom/plugins/ipc/PPluginInstance.ipdl

@@ -15,23 +15,23 @@ include "mozilla/plugins/PluginMessageUtils.h";
 include "ipc/nsGUIEventIPC.h";
 include "gfxTypes.h";
 
-using NPError;
-using NPRemoteWindow;
-using NPRemoteEvent;
-using NPRect;
-using NPImageFormat;
-using NPNURLVariable;
-using NPCoordinateSpace;
-using NPNVariable;
-using mozilla::plugins::NativeWindowHandle;
-using gfxSurfaceType;
-using gfxIntSize;
-using mozilla::null_t;
-using mozilla::plugins::WindowsSharedMemoryHandle;
-using mozilla::plugins::DXGISharedSurfaceHandle;
-using mozilla::CrossProcessMutexHandle;
-using SurfaceDescriptorX11;
-using nsIntRect;
+using NPError from "npapi.h";
+using struct mozilla::plugins::NPRemoteWindow from "mozilla/plugins/PluginMessageUtils.h";
+using struct mozilla::plugins::NPRemoteEvent from "mozilla/plugins/PluginMessageUtils.h";
+using NPRect from "npapi.h";
+using NPImageFormat from "npapi.h";
+using NPNURLVariable from "npapi.h";
+using NPCoordinateSpace from "npapi.h";
+using NPNVariable from "npapi.h";
+using mozilla::plugins::NativeWindowHandle from "mozilla/plugins/PluginMessageUtils.h";
+using gfxSurfaceType from "gfxTypes.h";
+using gfxIntSize from "nsSize.h";
+using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
+using mozilla::plugins::WindowsSharedMemoryHandle from "mozilla/plugins/PluginMessageUtils.h";
+using mozilla::plugins::DXGISharedSurfaceHandle from "mozilla/plugins/PluginMessageUtils.h";
+using mozilla::CrossProcessMutexHandle from "mozilla/ipc/CrossProcessMutex.h";
+using struct SurfaceDescriptorX11 from "gfxipc/ShadowLayerUtils.h";
+using struct nsIntRect from "nsRect.h";
 
 namespace mozilla {
 namespace plugins {

dom/plugins/ipc/PPluginModule.ipdl

@@ -12,11 +12,11 @@ include "npapi.h";
 include "mozilla/plugins/PluginMessageUtils.h";
 include "mozilla/dom/TabMessageUtils.h";
 
-using NPError;
-using NPNVariable;
-using mozilla::dom::NativeThreadId;
-using mac_plugin_interposing::NSCursorInfo;
-using nsID;
+using NPError from "npapi.h";
+using NPNVariable from "npapi.h";
+using mozilla::dom::NativeThreadId from "mozilla/dom/TabMessageUtils.h";
+using class mac_plugin_interposing::NSCursorInfo from "mozilla/plugins/PluginMessageUtils.h";
+using struct nsID from "nsID.h";
 
 namespace mozilla {
 namespace plugins {

dom/plugins/ipc/PPluginScriptableObject.ipdl

@@ -10,8 +10,8 @@ include "npapi.h";
 include "npruntime.h";
 include "mozilla/plugins/PluginMessageUtils.h";
 
-using mozilla::void_t;
-using mozilla::null_t;
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
 
 namespace mozilla {
 namespace plugins {

dom/plugins/ipc/PPluginStream.ipdl

@@ -7,9 +7,9 @@ include protocol PPluginInstance;
 
 include "mozilla/plugins/PluginMessageUtils.h";
 
-using mozilla::plugins::Buffer;
-using NPError;
-using NPReason;
+using mozilla::plugins::Buffer from "mozilla/plugins/PluginMessageUtils.h";
+using NPError from "npapi.h";
+using NPReason from "npapi.h";
 
 namespace mozilla {
 namespace plugins {

dom/plugins/ipc/PStreamNotify.ipdl

@@ -8,7 +8,7 @@ include protocol PPluginInstance;
 
 include "npapi.h";
 
-using NPReason;
+using NPReason from "npapi.h";
 
 namespace mozilla {
 namespace plugins {

gfx/layers/ipc/LayersMessages.ipdlh

@@ -21,21 +21,21 @@ include "mozilla/GfxMessageUtils.h";
 include "ImageLayers.h";
 include "mozilla/layers/CompositorTypes.h";
 
-using gfxPoint3D;
-using nscoord;
-using nsRect;
-using nsPoint;
-using mozilla::TimeDuration;
-using mozilla::TimeStamp;
-using mozilla::ScreenRotation;
-using nsCSSProperty;
-using mozilla::dom::ScreenOrientation;
-using mozilla::layers::TextureInfo;
-using mozilla::LayerMargin;
-using mozilla::LayerPoint;
-using mozilla::LayerRect;
-using mozilla::layers::ScaleMode;
-using mozilla::layers::DiagnosticTypes;
+using struct gfxPoint3D from "gfxPoint3D.h";
+using nscoord from "nsCoord.h";
+using struct nsRect from "nsRect.h";
+using struct nsPoint from "nsPoint.h";
+using class mozilla::TimeDuration from "mozilla/TimeStamp.h";
+using class mozilla::TimeStamp from "mozilla/TimeStamp.h";
+using mozilla::ScreenRotation from "mozilla/WidgetUtils.h";
+using nsCSSProperty from "nsCSSProperty.h";
+using mozilla::dom::ScreenOrientation from "mozilla/dom/ScreenOrientation.h";
+using struct mozilla::layers::TextureInfo from "mozilla/layers/CompositorTypes.h";
+using mozilla::LayerMargin from "Units.h";
+using mozilla::LayerPoint from "Units.h";
+using mozilla::LayerRect from "Units.h";
+using mozilla::layers::ScaleMode from "mozilla/layers/LayersTypes.h";
+using mozilla::layers::DiagnosticTypes from "mozilla/layers/CompositorTypes.h";
 
 namespace mozilla {
 namespace layers {

gfx/layers/ipc/LayersSurfaces.ipdlh

@@ -8,25 +8,25 @@ include "gfxipc/ShadowLayerUtils.h";
 include "mozilla/gfx/Types.h";
 include "nsRegion.h";
 
-using gfx3DMatrix;
-using gfxIntSize;
-using gfxPoint;
-using gfxRGBA;
-using nsIntPoint;
-using nsIntRect;
-using nsIntRegion;
-using nsIntSize;
-using mozilla::GraphicsFilterType;
-using mozilla::layers::FrameMetrics;
-using mozilla::layers::MagicGrallocBufferHandle;
-using mozilla::layers::SurfaceDescriptorX11;
-using mozilla::null_t;
-using mozilla::WindowsHandle;
-using mozilla::gl::SharedTextureHandle;
-using mozilla::gl::SharedTextureShareType;
-using mozilla::gfx::SurfaceStreamHandle;
-using mozilla::gfx::SurfaceFormat;
-using mozilla::gfx::IntSize;
+using class gfx3DMatrix from "gfx3DMatrix.h";
+using gfxIntSize from "nsSize.h";
+using struct gfxPoint from "gfxPoint.h";
+using struct gfxRGBA from "gfxColor.h";
+using struct nsIntPoint from "nsPoint.h";
+using struct nsIntRect from "nsRect.h";
+using nsIntRegion from "nsRegion.h";
+using struct nsIntSize from "nsSize.h";
+using mozilla::GraphicsFilterType from "mozilla/GfxMessageUtils.h";
+using struct mozilla::layers::FrameMetrics from "FrameMetrics.h";
+using struct mozilla::layers::MagicGrallocBufferHandle from "gfxipc/ShadowLayerUtils.h";
+using struct mozilla::layers::SurfaceDescriptorX11 from "gfxipc/ShadowLayerUtils.h";
+using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
+using mozilla::WindowsHandle from "ipc/IPCMessageUtils.h";
+using mozilla::gl::SharedTextureHandle from "GLContextTypes.h";
+using mozilla::gl::SharedTextureShareType from "GLContextTypes.h";
+using mozilla::gfx::SurfaceStreamHandle from "SurfaceTypes.h";
+using mozilla::gfx::SurfaceFormat from "mozilla/gfx/Types.h";
+using mozilla::gfx::IntSize from "mozilla/gfx/Point.h";
 
 namespace mozilla {
 namespace layers {

gfx/layers/ipc/PCompositor.ipdl

@@ -11,9 +11,9 @@ include protocol PLayerTransaction;
 include "mozilla/layers/CompositorTypes.h";
 include "mozilla/GfxMessageUtils.h";
 
-using mozilla::null_t;
-using mozilla::layers::TextureFactoryIdentifier;
-using mozilla::layers::LayersBackend;
+using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::layers::TextureFactoryIdentifier from "mozilla/layers/CompositorTypes.h";
+using mozilla::layers::LayersBackend from "mozilla/layers/LayersTypes.h";
 
 namespace mozilla {
 namespace layers {

gfx/layers/ipc/PImageBridge.ipdl

@@ -12,7 +12,7 @@ include ProtocolTypes;
 include "mozilla/layers/CompositorTypes.h";
 include "mozilla/GfxMessageUtils.h";
 
-using mozilla::layers::TextureInfo;
+using struct mozilla::layers::TextureInfo from "mozilla/layers/CompositorTypes.h";
 
 namespace mozilla {
 namespace layers {

gfx/layers/ipc/PLayerTransaction.ipdl

@@ -19,7 +19,7 @@ include "nsCSSProperty.h";
 include "gfxipc/ShadowLayerUtils.h";
 include "mozilla/GfxMessageUtils.h";
 
-using mozilla::layers::TextureInfo;
+using struct mozilla::layers::TextureInfo from "mozilla/layers/CompositorTypes.h";
 
 /**
  * The layers protocol is spoken between thread contexts that manage

hal/sandbox/PHal.ipdl

@@ -12,21 +12,21 @@ include "mozilla/HalTypes.h";
 include "mozilla/dom/ScreenOrientation.h";
 include "nsRect.h";
 
-using mozilla::dom::ScreenOrientation;
-using mozilla::hal::FlashMode;
-using mozilla::hal::LightType;
-using mozilla::hal::LightMode;
-using mozilla::hal::SensorType;
-using mozilla::hal::SensorAccuracyType;
-using mozilla::hal::WakeLockControl;
-using mozilla::hal::SwitchState;
-using mozilla::hal::SwitchDevice;
-using mozilla::hal::ProcessPriority;
-using nsIntRect;
-using PRTime;
-using mozilla::hal::FMRadioCountry;
-using mozilla::hal::FMRadioOperation;
-using mozilla::hal::FMRadioOperationStatus;
+using mozilla::dom::ScreenOrientation from "mozilla/dom/ScreenOrientation.h";
+using mozilla::hal::FlashMode from "mozilla/HalTypes.h";
+using mozilla::hal::LightType from "mozilla/HalTypes.h";
+using mozilla::hal::LightMode from "mozilla/HalTypes.h";
+using mozilla::hal::SensorType from "mozilla/HalSensor.h";
+using mozilla::hal::SensorAccuracyType from "mozilla/HalSensor.h";
+using mozilla::hal::WakeLockControl from "mozilla/HalTypes.h";
+using mozilla::hal::SwitchState from "mozilla/HalTypes.h";
+using mozilla::hal::SwitchDevice from "mozilla/HalTypes.h";
+using mozilla::hal::ProcessPriority from "mozilla/HalTypes.h";
+using struct nsIntRect from "nsRect.h";
+using PRTime from "prtime.h";
+using mozilla::hal::FMRadioCountry from "mozilla/HalTypes.h";
+using mozilla::hal::FMRadioOperation from "mozilla/HalTypes.h";
+using mozilla::hal::FMRadioOperationStatus from "mozilla/HalTypes.h";
 
 namespace mozilla {
 

ipc/glue/InputStreamParams.ipdlh

@@ -4,7 +4,7 @@
 
 include "ipc/IPCMessageUtils.h";
 
-using mozilla::void_t;
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
 include protocol PBlob;
 
 namespace mozilla {

ipc/glue/URIParams.ipdlh

@@ -4,7 +4,7 @@
 
 include "ipc/IPCMessageUtils.h";
 
-using mozilla::void_t;
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
 
 namespace mozilla {
 namespace ipc {

ipc/ipdl/test/cxx/PTestDataStructuresCommon.ipdlh

@@ -1,7 +1,7 @@
 include protocol PTestDataStructuresSub;
 
-using mozilla::null_t;
-using nsIntRegion;
+using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
+using nsIntRegion from "nsRegion.h";
 
 namespace mozilla {
 namespace _foo {

ipc/ipdl/test/cxx/PTestJSON.ipdl

@@ -1,7 +1,7 @@
 include protocol PTestHandle;
 
-using mozilla::void_t;
-using mozilla::null_t;
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
 
 namespace mozilla {
 namespace _ipdltest {

ipc/ipdl/test/ipdl/error/shmem.ipdl

@@ -1,4 +1,4 @@
-using mozilla::ipc::Shmem;      // redeclaration
+using class mozilla::ipc::Shmem from "mozilla/ipc/Shmem.h";      // redeclaration
 
 protocol shmem {
 child: Msg(Shmem s);

ipc/ipdl/test/ipdl/ok/header.ipdlh

@@ -1,7 +1,7 @@
 include "foo.h";
 
-using foo;
-using bar::baz;
+using foo from "foo.h";
+using bar::baz from "foo.h";
 
 struct Outer { };
 

ipc/ipdl/test/ipdl/ok/multipleUsingCxxTypes.ipdl

@@ -1,5 +1,5 @@
-using mozilla::void_t;
-using mozilla::void_t;
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
 
 protocol multipleUsingCxxTypes {
 child:

js/ipc/JavaScriptTypes.ipdlh

@@ -7,7 +7,7 @@
 
 include DOMTypes;
 
-using mozilla::void_t;
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
 
 namespace mozilla {
 namespace jsipc {

js/ipc/PJavaScript.ipdl

@@ -9,7 +9,7 @@ include protocol PContent;
 include DOMTypes;
 include JavaScriptTypes;
 
-using mozilla::void_t;
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
 
 namespace mozilla {
 namespace jsipc {

layout/ipc/PRenderFrame.ipdl

@@ -10,7 +10,7 @@ include protocol PLayerTransaction;
 
 include "nsRegion.h";
 
-using nsRegion;
+using class nsRegion from "nsRegion.h";
 
 namespace mozilla {
 namespace layout {

netwerk/cookie/PCookieService.ipdl

@@ -10,7 +10,7 @@ include URIParams;
 
 include "SerializedLoadContext.h";
 
-using IPC::SerializedLoadContext;
+using class IPC::SerializedLoadContext from "SerializedLoadContext.h";
 
 namespace mozilla {
 namespace net {

netwerk/ipc/NeckoChannelParams.ipdlh

@@ -9,9 +9,9 @@ include URIParams;
 include InputStreamParams;
 include "mozilla/net/PHttpChannelParams.h";
 
-using mozilla::void_t;
-using RequestHeaderTuples;
-using nsHttpAtom;
+using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using RequestHeaderTuples from "mozilla/net/PHttpChannelParams.h";
+using struct nsHttpAtom from "nsHttp.h";
 
 namespace mozilla {
 namespace net {

netwerk/ipc/PNecko.ipdl

@@ -24,7 +24,7 @@ include NeckoChannelParams;
 
 include "SerializedLoadContext.h";
 
-using IPC::SerializedLoadContext;
+using class IPC::SerializedLoadContext from "SerializedLoadContext.h";
 
 namespace mozilla {
 namespace net {

netwerk/protocol/ftp/PFTPChannel.ipdl

@@ -15,7 +15,7 @@ include protocol PBlob; //FIXME: bug #792908
 
 include "SerializedLoadContext.h";
 
-using PRTime;
+using PRTime from "prtime.h";
 
 namespace mozilla {
 namespace net {

netwerk/protocol/http/PHttpChannel.ipdl

@@ -16,11 +16,11 @@ include "mozilla/net/NeckoMessageUtils.h";
 include "mozilla/net/DNS.h";
 include "prio.h";
 
-using RequestHeaderTuples;
-using nsHttpHeaderArray;
-using nsHttpResponseHead;
-using nsHttpAtom;
-using mozilla::net::NetAddr;
+using RequestHeaderTuples from "mozilla/net/PHttpChannelParams.h";
+using class nsHttpHeaderArray from "nsHttpHeaderArray.h";
+using class nsHttpResponseHead from "nsHttpResponseHead.h";
+using struct nsHttpAtom from "nsHttp.h";
+using mozilla::net::NetAddr from "mozilla/net/DNS.h";
 
 namespace mozilla {
 namespace net {

netwerk/protocol/websocket/PWebSocket.ipdl

@@ -13,7 +13,7 @@ include URIParams;
 include protocol PBlob; //FIXME: bug #792908
 
 include "SerializedLoadContext.h";
-using IPC::SerializedLoadContext;
+using class IPC::SerializedLoadContext from "SerializedLoadContext.h";
 
 namespace mozilla {
 namespace net {

netwerk/protocol/wyciwyg/PWyciwygChannel.ipdl

@@ -8,7 +8,7 @@ include URIParams;
 
 include "SerializedLoadContext.h";
 
-using IPC::SerializedLoadContext;
+using class IPC::SerializedLoadContext from "SerializedLoadContext.h";
 
 namespace mozilla {
 namespace net {