diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index b1208d722caf..7fb1d52feb09 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -461,8 +461,8 @@ NPP_Shutdown(void)
 NPError
 NPP_New(NPMIMEType pluginType,
     NPP instance,
-    uint16 mode,
-    int16 /*argc*/,
+    uint16_t mode,
+    int16_t /*argc*/,
     char* /*argn*/[],
     char* /*argv*/[],
     NPSavedData* /*saved*/)
@@ -654,7 +654,7 @@ NPP_NewStream(NPP instance,
           NPMIMEType /*type*/,
           NPStream* /*stream*/,
           NPBool /*seekable*/,
-          uint16 *stype)
+          uint16_t *stype)
 {
     if (instance == NULL)
         return NPERR_INVALID_INSTANCE_ERROR;
diff --git a/extensions/source/nsplugin/source/npshell.hxx b/extensions/source/nsplugin/source/npshell.hxx
index 8af8bc687535..c5821a0a10d4 100644
--- a/extensions/source/nsplugin/source/npshell.hxx
+++ b/extensions/source/nsplugin/source/npshell.hxx
@@ -37,7 +37,7 @@
 
 typedef struct _PluginInstance
 {
-    uint16 mode;
+    uint16_t mode;
 #ifdef MOZ_X11
     Window window;
     Display *display;
@@ -79,7 +79,7 @@ typedef struct _MimeTypeElement
 typedef struct _PluginInstance
 {
     NPWindow*            fWindow;
-    uint16                fMode;
+    uint16_t                fMode;
 
     HWND                fhWnd;
     WNDPROC                fDefaultWindowProc;