Index: reactos/base/setup/usetup/inffile.c
===================================================================
--- reactos/base/setup/usetup/inffile.c	(revision 45655)
+++ reactos/base/setup/usetup/inffile.c	(working copy)
@@ -39,12 +39,6 @@
 
 #ifdef __REACTOS__
 
-VOID WINAPI
-InfpCloseInfFile(
-	IN HINF InfHandle)
-{
-	InfCloseFile(InfHandle);
-}
 
 BOOL WINAPI
 InfpFindFirstLineW(
@@ -65,25 +59,7 @@
 	return TRUE;
 }
 
-BOOL WINAPI
-InfpFindNextLine(
-	IN PINFCONTEXT ContextIn,
-	OUT PINFCONTEXT ContextOut)
-{
-	return InfFindNextLine(ContextIn, ContextOut);
-}
 
-BOOL WINAPI
-InfpGetBinaryField(
-	IN PINFCONTEXT Context,
-    IN ULONG FieldIndex,
-	IN OUT BYTE* ReturnBuffer,
-	IN ULONG ReturnBufferSize,
-	OUT PULONG RequiredSize)
-{
-	return InfGetBinaryField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize);
-}
-
 DWORD WINAPI
 InfpGetFieldCount(
 	IN PINFCONTEXT Context)
@@ -105,28 +81,7 @@
 	return ret;
 }
 
-BOOL WINAPI
-InfpGetMultiSzFieldW(
-	IN PINFCONTEXT Context,
-	IN ULONG FieldIndex,
-	IN OUT PWSTR ReturnBuffer,
-	IN ULONG ReturnBufferSize,
-	OUT PULONG RequiredSize)
-{
-	return InfGetMultiSzField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize);
-}
 
-BOOL WINAPI
-InfpGetStringFieldW(
-	IN PINFCONTEXT Context,
-	IN ULONG FieldIndex,
-	IN OUT PWSTR ReturnBuffer,
-	IN ULONG ReturnBufferSize,
-	OUT PULONG RequiredSize)
-{
-	return InfGetStringField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize);
-}
-
 HINF WINAPI
 InfpOpenInfFileW(
 	IN PCWSTR FileName,
@@ -274,12 +229,5 @@
 #endif /* !__REACTOS__ */
 }
 
-VOID INF_SetHeap(
-	IN PVOID Heap)
-{
-#ifdef __REACTOS__
-	InfSetHeap(Heap);
-#endif
-}
 
 /* EOF */
Index: reactos/base/setup/usetup/inffile.h
===================================================================
--- reactos/base/setup/usetup/inffile.h	(revision 45655)
+++ reactos/base/setup/usetup/inffile.h	(working copy)
@@ -35,14 +35,9 @@
 
 #include <infcommon.h>
 
-#define SetupCloseInfFile InfpCloseInfFile
 #define SetupFindFirstLineW InfpFindFirstLineW
-#define SetupFindNextLine InfpFindNextLine
-#define SetupGetBinaryField InfpGetBinaryField
 #define SetupGetFieldCount InfpGetFieldCount
 #define SetupGetIntField InfpGetIntField
-#define SetupGetMultiSzFieldW InfpGetMultiSzFieldW
-#define SetupGetStringFieldW InfpGetStringFieldW
 #define SetupOpenInfFileW InfpOpenInfFileW
 
 #define INF_STYLE_WIN4 0x00000002
@@ -56,9 +51,6 @@
 	PVOID Line;
 } INFCONTEXT;
 
-VOID WINAPI
-InfpCloseInfFile(
-	IN HINF InfHandle);
 
 BOOL WINAPI
 InfpFindFirstLineW(
@@ -67,18 +59,7 @@
 	IN PCWSTR Key,
 	IN OUT PINFCONTEXT Context);
 
-BOOL WINAPI
-InfpFindNextLine(
-	IN PINFCONTEXT ContextIn,
-	OUT PINFCONTEXT ContextOut);
 
-BOOL WINAPI
-InfpGetBinaryField(
-	IN PINFCONTEXT Context,
-	IN ULONG FieldIndex,
-	IN OUT BYTE* ReturnBuffer,
-	IN ULONG ReturnBufferSize,
-	OUT PULONG RequiredSize);
 
 DWORD WINAPI
 InfpGetFieldCount(
@@ -90,22 +71,7 @@
 	IN DWORD FieldIndex,
 	OUT PINT IntegerValue);
 
-BOOL WINAPI
-InfpGetMultiSzFieldW(
-	IN PINFCONTEXT Context,
-	IN ULONG FieldIndex,
-	IN OUT PWSTR ReturnBuffer,
-	IN ULONG ReturnBufferSize,
-	OUT PULONG RequiredSize);
 
-BOOL WINAPI
-InfpGetStringFieldW(
-	IN PINFCONTEXT Context,
-	IN ULONG FieldIndex,
-	IN OUT PWSTR ReturnBuffer,
-	IN ULONG ReturnBufferSize,
-	OUT PULONG RequiredSize);
-
 HINF WINAPI
 InfpOpenInfFileW(
 	IN PCWSTR FileName,
@@ -135,9 +101,8 @@
 	IN DWORD InfStyle,
 	OUT PUINT ErrorLine);
 
-VOID INF_SetHeap(
-	IN PVOID Heap);
 
+
 #endif /* __INFFILE_H__*/
 
 /* EOF */
Index: reactos/base/setup/usetup/interface/usetup.c
===================================================================
--- reactos/base/setup/usetup/interface/usetup.c	(revision 45655)
+++ reactos/base/setup/usetup/interface/usetup.c	(working copy)
@@ -3858,7 +3858,7 @@
     RtlNormalizeProcessParams(Peb->ProcessParameters);
 
     ProcessHeap = Peb->ProcessHeap;
-    INF_SetHeap(ProcessHeap);
+    InfSetHeap(ProcessHeap);
     RunUSetup();
 }
 #endif /* __REACTOS__ */
Index: reactos/base/setup/usetup/registry.c
===================================================================
--- reactos/base/setup/usetup/registry.c	(revision 45655)
+++ reactos/base/setup/usetup/registry.c	(working copy)
@@ -644,7 +644,7 @@
       DPRINT1("registry_callback() failed\n");
     }
 
-  SetupCloseInfFile (hInf);
+  InfCloseFile (hInf);
 
   return TRUE;
 }
Index: reactos/base/setup/usetup/usetup.h
===================================================================
--- reactos/base/setup/usetup/usetup.h	(revision 45655)
+++ reactos/base/setup/usetup/usetup.h	(working copy)
@@ -77,7 +77,32 @@
 extern UNICODE_STRING SourcePath;
 extern BOOLEAN IsUnattendedSetup;
 extern PWCHAR SelectedLanguageId;
-
+#ifdef __REACTOS__
+extern VOID InfSetHeap(PVOID Heap);
+extern VOID InfCloseFile(HINF InfHandle);
+extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn,
+                               PINFCONTEXT ContextOut);
+extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context,
+                                 ULONG FieldIndex,
+                                 PUCHAR ReturnBuffer,
+                                 ULONG ReturnBufferSize,
+                                 PULONG RequiredSize);
+extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context,
+                                  ULONG FieldIndex,
+                                  PWSTR ReturnBuffer,
+                                  ULONG ReturnBufferSize,
+                                  PULONG RequiredSize);
+extern BOOLEAN InfGetStringField(PINFCONTEXT Context,
+                                 ULONG FieldIndex,
+                                 PWSTR ReturnBuffer,
+                                 ULONG ReturnBufferSize,
+                                 PULONG RequiredSize);
+#define SetupCloseInfFile InfCloseFile
+#define SetupFindNextLine InfFindNextLine
+#define SetupGetBinaryField InfGetBinaryField
+#define SetupGetMultiSzFieldW InfGetMultiSzField
+#define SetupGetStringFieldW InfGetStringField
+#endif
 typedef enum _PAGE_NUMBER
 {
   START_PAGE,
Index: reactos/lib/inflib/infros.h
===================================================================
--- reactos/lib/inflib/infros.h	(revision 45655)
+++ reactos/lib/inflib/infros.h	(working copy)
@@ -15,7 +15,7 @@
 
 #include <infcommon.h>
 
-extern VOID InfSetHeap(PVOID Heap);
+
 extern NTSTATUS InfOpenBufferedFile(PHINF InfHandle,
                                     PVOID Buffer,
                                     ULONG BufferSize,
@@ -26,13 +26,12 @@
 extern NTSTATUS InfWriteFile(HINF InfHandle,
                              PUNICODE_STRING FileName,
                              PUNICODE_STRING HeaderComment);
-extern VOID InfCloseFile(HINF InfHandle);
+
 extern BOOLEAN InfFindFirstLine(HINF InfHandle,
                                 PCWSTR Section,
                                 PCWSTR Key,
                                 PINFCONTEXT *Context);
-extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn,
-                               PINFCONTEXT ContextOut);
+
 extern BOOLEAN InfFindFirstMatchLine(PINFCONTEXT ContextIn,
                                      PCWSTR Key,
                                      PINFCONTEXT ContextOut);
@@ -42,24 +41,11 @@
 extern LONG InfGetLineCount(HINF InfHandle,
                             PCWSTR Section);
 extern LONG InfGetFieldCount(PINFCONTEXT Context);
-extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context,
-                                 ULONG FieldIndex,
-                                 PUCHAR ReturnBuffer,
-                                 ULONG ReturnBufferSize,
-                                 PULONG RequiredSize);
+
 extern BOOLEAN InfGetIntField(PINFCONTEXT Context,
                               ULONG FieldIndex,
                               PLONG IntegerValue);
-extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context,
-                                  ULONG FieldIndex,
-                                  PWSTR ReturnBuffer,
-                                  ULONG ReturnBufferSize,
-                                  PULONG RequiredSize);
-extern BOOLEAN InfGetStringField(PINFCONTEXT Context,
-                                 ULONG FieldIndex,
-                                 PWSTR ReturnBuffer,
-                                 ULONG ReturnBufferSize,
-                                 PULONG RequiredSize);
+
 extern BOOLEAN InfGetData(PINFCONTEXT Context,
                           PWCHAR *Key,
                           PWCHAR *Data);