diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index a43a4f695cf..5340dfa573c 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -21,7 +21,7 @@ debug_channels (setupapi setupx)
 # 54 stdcall SetupAdjustDiskSpaceListW()                      SetupAdjustDiskSpaceListW
 # 55 stdcall SetupCancelTemporarySourceList()                 SetupCancelTemporarySourceList
 # 56 stdcall SetupCloseFileQueue()                            SetupCloseFileQueue
-# 57 stdcall SetupCloseInfFile()                              SetupCloseInfFile
+57 stdcall SetupCloseInfFile(long)                            SetupCloseInfFile
 # 58 stdcall SetupCommitFileQueue()                           SetupCommitFileQueue
 # 59 stdcall SetupCommitFileQueueA()                          SetupCommitFileQueueA
 # 60 stdcall SetupCommitFileQueueW()                          SetupCommitFileQueueW
@@ -32,7 +32,7 @@ debug_channels (setupapi setupx)
 # 65 stdcall SetupDecompressOrCopyFileA()                     SetupDecompressOrCopyFileA
 # 66 stdcall SetupDecompressOrCopyFileW()                     SetupDecompressOrCopyFileW
 # 67 stdcall SetupDefaultQueueCallback()                      SetupDefaultQueueCallback
-# 68 stdcall SetupDefaultQueueCallbackA()                     SetupDefaultQueueCallbackA
+68 stdcall SetupDefaultQueueCallbackA(ptr long long long)     SetupDefaultQueueCallbackA
 # 69 stdcall SetupDefaultQueueCallbackW()                     SetupDefaultQueueCallbackW
 # 70 stdcall SetupDeleteErrorA()                              SetupDeleteErrorA
 # 71 stdcall SetupDeleteErrorW()                              SetupDeleteErrorW
@@ -121,9 +121,9 @@ debug_channels (setupapi setupx)
 #154 stdcall SetupDiSetSelectedDriverW()                      SetupDiSetSelectedDriverW
 #155 stdcall SetupDuplicateDiskSpaceListA()                   SetupDuplicateDiskSpaceListA
 #156 stdcall SetupDuplicateDiskSpaceListW()                   SetupDuplicateDiskSpaceListW
-#157 stdcall SetupFindFirstLineA()                            SetupFindFirstLineA
+157 stdcall SetupFindFirstLineA(long str str ptr)             SetupFindFirstLineA
 #158 stdcall SetupFindFirstLineW()                            SetupFindFirstLineW
-#159 stdcall SetupFindNextLine()                              SetupFindNextLine
+159 stdcall SetupFindNextLine(long)                           SetupFindNextLine
 #160 stdcall SetupFindNextMatchLineA()                        SetupFindNextMatchLineA
 #161 stdcall SetupFindNextMatchLineW()                        SetupFindNextMatchLineW
 #162 stdcall SetupFreeSourceListA()                           SetupFreeSourceListA
@@ -141,7 +141,7 @@ debug_channels (setupapi setupx)
 #174 stdcall SetupGetLineByIndexW()                           SetupGetLineByIndexW
 #175 stdcall SetupGetLineCountA()                             SetupGetLineCountA
 #176 stdcall SetupGetLineCountW()                             SetupGetLineCountW
-#177 stdcall SetupGetLineTextA()                              SetupGetLineTextA
+177 stdcall SetupGetLineTextA(ptr long str str ptr long ptr)  SetupGetLineTextA
 #178 stdcall SetupGetLineTextW()                              SetupGetLineTextW
 #179 stdcall SetupGetMultiSzFieldA()                          SetupGetMultiSzFieldA
 #180 stdcall SetupGetMultiSzFieldW()                          SetupGetMultiSzFieldW
@@ -151,11 +151,11 @@ debug_channels (setupapi setupx)
 #184 stdcall SetupGetSourceFileSizeW()                        SetupGetSourceFileSizeW
 #185 stdcall SetupGetSourceInfoA()                            SetupGetSourceInfoA
 #186 stdcall SetupGetSourceInfoW()                            SetupGetSourceInfoW
-#187 stdcall SetupGetStringFieldA()                           SetupGetStringFieldA
+187 stdcall SetupGetStringFieldA(ptr long str long ptr)       SetupGetStringFieldA
 #188 stdcall SetupGetStringFieldW()                           SetupGetStringFieldW
 #189 stdcall SetupGetTargetPathA()                            SetupGetTargetPathA
 #190 stdcall SetupGetTargetPathW()                            SetupGetTargetPathW
-#191 stdcall SetupInitDefaultQueueCallback()                  SetupInitDefaultQueueCallback
+191 stdcall SetupInitDefaultQueueCallback(long)               SetupInitDefaultQueueCallback
 #192 stdcall SetupInitDefaultQueueCallbackEx()                SetupInitDefaultQueueCallbackEx
 #193 stdcall SetupInitializeFileLogA()                        SetupInitializeFileLogA
 #194 stdcall SetupInitializeFileLogW()                        SetupInitializeFileLogW
@@ -165,7 +165,7 @@ debug_channels (setupapi setupx)
 #198 stdcall SetupInstallFileW()                              SetupInstallFileW
 #199 stdcall SetupInstallFilesFromInfSectionA()               SetupInstallFilesFromInfSectionA
 #200 stdcall SetupInstallFilesFromInfSectionW()               SetupInstallFilesFromInfSectionW
-#201 stdcall SetupInstallFromInfSectionA()                    SetupInstallFromInfSectionA
+201 stdcall SetupInstallFromInfSectionA(long long str long long str long ptr ptr long ptr)    SetupInstallFromInfSectionA
 #202 stdcall SetupInstallFromInfSectionW()                    SetupInstallFromInfSectionW
 #203 stdcall SetupInstallServicesFromInfSectionA()            SetupInstallServicesFromInfSectionA
 #204 stdcall SetupInstallServicesFromInfSectionW()            SetupInstallServicesFromInfSectionW
@@ -176,7 +176,7 @@ debug_channels (setupapi setupx)
 #209 stdcall SetupOpenAppendInfFileA()                        SetupOpenAppendInfFileA
 #210 stdcall SetupOpenAppendInfFileW()                        SetupOpenAppendInfFileW
 #211 stdcall SetupOpenFileQueue()                             SetupOpenFileQueue
-#212 stdcall SetupOpenInfFileA()                              SetupOpenInfFileA
+212 stdcall SetupOpenInfFileA(ptr ptr long ptr)               SetupOpenInfFileA
 #213 stdcall SetupOpenInfFileW()                              SetupOpenInfFileW
 #214 stdcall SetupOpenMasterInf()                             SetupOpenMasterInf
 #215 stdcall SetupPromptForDiskA()                            SetupPromptForDiskA
diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c
index 677a8a54192..8b6201b31c5 100644
--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c
@@ -5,6 +5,8 @@
 
 #include "debugtools.h"
 #include "windef.h"
+#include "setupapi.h"
+
 
 DEFAULT_DEBUG_CHANNEL(setupapi);
 
@@ -34,3 +36,103 @@ BOOL WINAPI SetupIterateCabinetW(PWSTR CabinetFile, DWORD Reserved,
 	FIXME("not implemented (setupapi.dll) \n");
 	return 0;
 }
+
+
+/***********************************************************************
+ *		SetupGetStringFieldA
+ */
+BOOL WINAPI SetupGetStringFieldA(PINFCONTEXT Context, DWORD FieldIndex, 
+                                 LPSTR ReturnBuffer, DWORD ReturnBufferSize,
+                                 PDWORD RequiredSize)
+{
+	FIXME("not implemented (setupapi.dll) \n");
+	return 0;
+}
+
+
+/***********************************************************************
+ *		SetupFindNextLine
+ */
+BOOL WINAPI SetupFindNextLine (PINFCONTEXT ContextIn, PINFCONTEXT ContextOut)
+{
+	FIXME("not implemented (setupapi.dll) \n");
+	return 0;
+}
+
+
+/***********************************************************************
+ *		SetupInitDefaultQueueCallback
+ */
+PVOID WINAPI SetupInitDefaultQueueCallback(HWND OwnerWindow)
+{
+	FIXME("not implemented (setupapi.dll) \n");
+	return 0;
+}
+
+
+/***********************************************************************
+ *		SetupGetLineTextA
+ */
+BOOL WINAPI SetupGetLineTextA (PINFCONTEXT Context, HINF InfHandle,
+                        PCSTR Section, PCSTR Key, LPSTR ReturnBuffer,
+                        DWORD ReturnBufferSize, PDWORD RequiredSize)
+{
+	FIXME("not implemented (setupapi.dll) \n");
+	return 0;
+}
+
+
+/***********************************************************************
+ *		SetupCloseInfFile
+ */
+VOID WINAPI SetupCloseInfFile (HINF InfHandle)
+{
+	FIXME("not implemented (setupapi.dll) \n");
+}
+
+
+/***********************************************************************
+ *		SetupDefaultQueueCallbackA
+ */
+UINT WINAPI SetupDefaultQueueCallbackA (PVOID Context, UINT Notification,
+                                        UINT Param1, UINT Param2)
+{
+	FIXME("not implemented (setupapi.dll) \n");
+	return 0;
+}
+
+
+/***********************************************************************
+ *		SetupFindFirstLineA
+ */
+BOOL WINAPI SetupFindFirstLineA (HINF InfHandle, PCSTR Section, PCSTR Key,
+                                 PINFCONTEXT Context)
+{
+	FIXME("not implemented (setupapi.dll) \n");
+	return 0;
+}
+
+
+/***********************************************************************
+ *		SetupInstallFromInfSectionA
+ */
+BOOL WINAPI SetupInstallFromInfSectionA (HWND Owner, HINF InfHandle, PCSTR SectionName,
+                                         UINT Flags, HKEY RelativeKeyRoot, PCSTR SourceRootPath,
+                                         UINT CopyFlags, PSP_FILE_CALLBACK_A MsgHandler,
+                                         PVOID Context, HDEVINFO DeviceInfoSet,
+                                         PSP_DEVINFO_DATA DeviceInfoData)
+{
+	FIXME("not implemented (setupapi.dll) \n");
+	return 0;
+}
+
+
+/***********************************************************************
+ *		SetupOpenInfFileA
+ */
+HINF WINAPI SetupOpenInfFileA (PCSTR FileName, PCSTR InfClass, DWORD InfStyle,
+                               PUINT ErrorLine)
+{
+	FIXME("not implemented (setupapi.dll) \n");
+	return 0;
+}
diff --git a/include/Makefile.in b/include/Makefile.in
index 113a4762ad3..35161949fc0 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -61,6 +61,7 @@ INSTALLED_INCLUDES = \
 	richedit.h \
 	rpc.h \
 	servprov.h \
+	setupapi.h \
 	shellapi.h \
 	shlguid.h \
 	shlobj.h \
diff --git a/include/setupapi.h b/include/setupapi.h
new file mode 100644
index 00000000000..bd749a7f47e
--- /dev/null
+++ b/include/setupapi.h
@@ -0,0 +1,34 @@
+/* Initial setupapi.h.  
+
+   FIXME: Missing A LOT of definitions / declarations! 
+*/
+
+#ifndef __SETUPAPI__
+#define __SETUPAPI__
+
+/* Define type for handle to a loaded inf file */
+typedef PVOID HINF;
+
+/* Define type for handle to a device information set */
+typedef PVOID HDEVINFO;
+
+/* inf structure. */
+typedef struct _INFCONTEXT
+{
+   PVOID Inf;
+   PVOID CurrentInf;
+   UINT  Section;
+   UINT  Line;
+} INFCONTEXT, *PINFCONTEXT;
+
+/* Device Information structure (references a device instance that is a member
+   of a device information set) */
+typedef struct _SP_DEVINFO_DATA
+{
+   DWORD cbSize;
+   GUID  ClassGuid;
+   DWORD DevInst;   /* DEVINST handle */
+   DWORD Reserved;
+} SP_DEVINFO_DATA, *PSP_DEVINFO_DATA;
+
+#endif