diff --git a/reactos/lib/setupapi/De.rc b/reactos/lib/setupapi/De.rc
index f8e1e3e36ec..0fd9555a97f 100644
--- a/reactos/lib/setupapi/De.rc
+++ b/reactos/lib/setupapi/De.rc
@@ -1,7 +1,7 @@
 /*
  * German resources for SETUPAPI
  *
- * Copyright 2004 Michael Wirth
+ * Copyright 2004 Henning Gerhardt
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,15 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "Kopiere Dateien..."
-FONT 8, "MS Sans Serif"
+CAPTION "Dateien kopieren..."
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Abbrechen", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	LTEXT "Quelltext:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "Quelle:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
 	LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
 	LTEXT "Ziel:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
 	LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
diff --git a/reactos/lib/setupapi/En.rc b/reactos/lib/setupapi/En.rc
index 088f6aaa035..aa504ca13d8 100644
--- a/reactos/lib/setupapi/En.rc
+++ b/reactos/lib/setupapi/En.rc
@@ -23,7 +23,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Copying Files..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 	LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
diff --git a/reactos/lib/setupapi/Es.rc b/reactos/lib/setupapi/Es.rc
index efa01ea412c..f09e276ddd6 100644
--- a/reactos/lib/setupapi/Es.rc
+++ b/reactos/lib/setupapi/Es.rc
@@ -23,7 +23,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Copiando archivos..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 	LTEXT "Origen:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
diff --git a/reactos/lib/setupapi/Fr.rc b/reactos/lib/setupapi/Fr.rc
index 1821aac661b..40f01716a23 100644
--- a/reactos/lib/setupapi/Fr.rc
+++ b/reactos/lib/setupapi/Fr.rc
@@ -24,7 +24,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Copie de fichiers..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Annuler", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 	LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
diff --git a/reactos/lib/setupapi/It.rc b/reactos/lib/setupapi/It.rc
index 816aa47067c..dc7b679e315 100644
--- a/reactos/lib/setupapi/It.rc
+++ b/reactos/lib/setupapi/It.rc
@@ -2,7 +2,7 @@
  * Italian resources for SETUPAPI
  *
  * Copyright 2001 Andreas Mohr
- * Copyright 2003 Ivan Leo Murray-Smith
+ * Copyright 2003 Ivan Leo Puoti
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Copia dei file in corso..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Anulla", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 	LTEXT "Origine:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
diff --git a/reactos/lib/setupapi/Nl.rc b/reactos/lib/setupapi/Nl.rc
index a60d3528bfa..76dc7ed1da4 100644
--- a/reactos/lib/setupapi/Nl.rc
+++ b/reactos/lib/setupapi/Nl.rc
@@ -23,7 +23,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Bestanden worden gekopiëerd..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Annuleren", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 	LTEXT "Bron:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
diff --git a/reactos/lib/setupapi/Pt.rc b/reactos/lib/setupapi/Pt.rc
index ab1f3b78988..69bede2e379 100644
--- a/reactos/lib/setupapi/Pt.rc
+++ b/reactos/lib/setupapi/Pt.rc
@@ -23,7 +23,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Copiando arquivos..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Cancelar", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 	LTEXT "Origem:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
diff --git a/reactos/lib/setupapi/Ru.rc b/reactos/lib/setupapi/Ru.rc
index dc8523a8c4c..3efa2424097 100644
--- a/reactos/lib/setupapi/Ru.rc
+++ b/reactos/lib/setupapi/Ru.rc
@@ -23,7 +23,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Êîïèðîâàíèå ôàéëîâ..."
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	PUSHBUTTON "Îòìåíà", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 	LTEXT "Îòêóäà:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
diff --git a/reactos/lib/setupapi/devinst16.c b/reactos/lib/setupapi/devinst16.c
index 54e5e10c5b1..f0c51544218 100644
--- a/reactos/lib/setupapi/devinst16.c
+++ b/reactos/lib/setupapi/devinst16.c
@@ -68,7 +68,7 @@ RETERR16 WINAPI DiBuildClassDrvList16(LPDEVICE_INFO16 lpdi)
 /***********************************************************************
  *		DiCallClassInstaller (SETUPX.308)
  */
-RETERR16 WINAPI DiCallClassInstaller16(/*DI_FUNCTIONS*/WORD diFctn, LPDEVICE_INFO16 lpdi)
+RETERR16 WINAPI DiCallClassInstaller16(DI_FUNCTION16 diFctn, LPDEVICE_INFO16 lpdi)
 {
     FIXME("(%x, %p): stub\n", diFctn, lpdi);
     return FALSE;
diff --git a/reactos/lib/setupapi/setupapi.rc b/reactos/lib/setupapi/setupapi.rc
index c9da163f63c..ed5d6428e26 100644
--- a/reactos/lib/setupapi/setupapi.rc
+++ b/reactos/lib/setupapi/setupapi.rc
@@ -24,11 +24,13 @@
 #include "winnls.h"
 #include "setupapi_private.h"
 
-#include "En.rc"
+#include "Cs.rc"
 #include "De.rc"
+#include "En.rc"
 #include "Es.rc"
 #include "Fr.rc"
 #include "It.rc"
+#include "Ja.rc"
 #include "Nl.rc"
 #include "Pt.rc"
 #include "Ru.rc"