diff --git a/cups/libcups2.def b/cups/libcups2.def
index 0516004003..52681e00a0 100644
--- a/cups/libcups2.def
+++ b/cups/libcups2.def
@@ -1,8 +1,6 @@
 LIBRARY libcups2
 VERSION 2.15
 EXPORTS
-_cupsArrayAddStrings
-_cupsArrayNewStrings
 _cupsBufferGet
 _cupsBufferRelease
 _cupsCharmapFlush
@@ -20,6 +18,8 @@ _cupsGetUserDefault
 _cupsGlobalLock
 _cupsGlobalUnlock
 _cupsGlobals
+_cupsJSONAdd
+_cupsJSONDelete
 _cupsLangPrintError
 _cupsLangPrintf
 _cupsLangPuts
@@ -37,7 +37,6 @@ _cupsRasterAddError
 _cupsRasterClearError
 _cupsRasterColorSpaceString
 _cupsRasterDelete
-_cupsRasterErrorString
 _cupsRasterExecPS
 _cupsRasterInitPWGHeader
 _cupsRasterInterpretPPD
@@ -86,15 +85,7 @@ _httpUpdate
 _httpUseCredentials
 _httpWait
 _ippCheckOptions
-_ippFileParse
-_ippFileReadToken
 _ippFindOption
-_ippVarsDeinit
-_ippVarsExpand
-_ippVarsGet
-_ippVarsInit
-_ippVarsPasswordCB
-_ippVarsSet
 _ppdCacheCreateWithFile
 _ppdCacheCreateWithPPD
 _ppdCacheDestroy
@@ -137,6 +128,7 @@ cupsAdminGetServerSettings
 cupsAdminSetServerSettings
 cupsAreCredentialsValidForName
 cupsArrayAdd
+cupsArrayAddStrings
 cupsArrayClear
 cupsArrayCount
 cupsArrayCurrent
@@ -144,14 +136,23 @@ cupsArrayDelete
 cupsArrayDup
 cupsArrayFind
 cupsArrayFirst
+cupsArrayGetCount
+cupsArrayGetCurrent
+cupsArrayGetElement
+cupsArrayGetFirst
 cupsArrayGetIndex
 cupsArrayGetInsert
+cupsArrayGetLast
+cupsArrayGetNext
+cupsArrayGetPrev
+cupsArrayGetUserData
 cupsArrayIndex
 cupsArrayInsert
 cupsArrayLast
 cupsArrayNew
 cupsArrayNew2
 cupsArrayNew3
+cupsArrayNewStrings
 cupsArrayNext
 cupsArrayPrev
 cupsArrayRemove
@@ -251,6 +252,8 @@ cupsFindDestReady
 cupsFindDestSupported
 cupsFinishDestDocument
 cupsFinishDocument
+cupsFormDecode
+cupsFormEncode
 cupsFreeDestInfo
 cupsFreeDests
 cupsFreeJobs
@@ -292,6 +295,7 @@ cupsGetPPD3
 cupsGetPassword
 cupsGetPassword2
 cupsGetPrinters
+cupsGetRand
 cupsGetResponse
 cupsGetServer
 cupsGetServerPPD
@@ -300,6 +304,50 @@ cupsGetUserAgent
 cupsHMACData
 cupsHashData
 cupsHashString
+cupsJSONDelete
+cupsJSONExportFile
+cupsJSONExportString
+cupsJSONFind
+cupsJSONGetChild
+cupsJSONGetCount
+cupsJSONGetKey
+cupsJSONGetNumber
+cupsJSONGetParent
+cupsJSONGetSibling
+cupsJSONGetString
+cupsJSONGetType
+cupsJSONImportFile
+cupsJSONImportString
+cupsJSONImportURL
+cupsJSONNew
+cupsJSONNewKey
+cupsJSONNewNumber
+cupsJSONNewString
+cupsJWTDelete
+cupsJWTExportString
+cupsJWTGetAlgorithm
+cupsJWTGetClaimNumber
+cupsJWTGetClaimString
+cupsJWTGetClaimType
+cupsJWTGetClaimValue
+cupsJWTGetClaims
+cupsJWTGetHeaderNumber
+cupsJWTGetHeaderString
+cupsJWTGetHeaderType
+cupsJWTGetHeaderValue
+cupsJWTGetHeaders
+cupsJWTHasValidSignature
+cupsJWTImportString
+cupsJWTMakePrivateKey
+cupsJWTMakePublicKey
+cupsJWTNew
+cupsJWTSetClaimNumber
+cupsJWTSetClaimString
+cupsJWTSetClaimValue
+cupsJWTSetHeaderNumber
+cupsJWTSetHeaderString
+cupsJWTSetHeaderValue
+cupsJWTSign
 cupsLangDefault
 cupsLangEncoding
 cupsLangFlush
@@ -333,6 +381,8 @@ cupsRasterClose
 cupsRasterClose
 cupsRasterErrorString
 cupsRasterErrorString
+cupsRasterGetErrorString
+cupsRasterInitHeader
 cupsRasterInitPWGHeader
 cupsRasterInitPWGHeader
 cupsRasterInterpretPPD
@@ -520,6 +570,7 @@ ippAddBoolean
 ippAddBooleans
 ippAddCollection
 ippAddCollections
+ippAddCredentialsString
 ippAddDate
 ippAddInteger
 ippAddIntegers
@@ -539,6 +590,7 @@ ippContainsInteger
 ippContainsString
 ippCopyAttribute
 ippCopyAttributes
+ippCopyCredentialsString
 ippCreateRequestedArray
 ippDateToTime
 ippDelete
@@ -548,6 +600,29 @@ ippEnumString
 ippEnumValue
 ippErrorString
 ippErrorValue
+ippFileClose
+ippFileDelete
+ippFileExpandVars
+ippFileGetAttribute
+ippFileGetAttributes
+ippFileGetFilename
+ippFileGetLineNumber
+ippFileGetVar
+ippFileNew
+ippFileOpen
+ippFileRead
+ippFileReadCollection
+ippFileReadToken
+ippFileRestorePosition
+ippFileSavePosition
+ippFileSetAttributes
+ippFileSetGroupTag
+ippFileSetVar
+ippFileSetVarf
+ippFileWriteAttributes
+ippFileWriteComment
+ippFileWriteToken
+ippFileWriteTokenf
 ippFindAttribute
 ippFindNextAttribute
 ippFirstAttribute
@@ -555,11 +630,15 @@ ippGetBoolean
 ippGetCollection
 ippGetCount
 ippGetDate
+ippGetFirstAttribute
 ippGetGroupTag
 ippGetInteger
+ippGetLength
 ippGetName
+ippGetNextAttribute
 ippGetOctetString
 ippGetOperation
+ippGetPort
 ippGetRange
 ippGetRequestId
 ippGetResolution
@@ -579,6 +658,8 @@ ippPort
 ippRead
 ippReadFile
 ippReadIO
+ippRestore
+ippSave
 ippSetBoolean
 ippSetCollection
 ippSetDate
diff --git a/vcnet/libcups2.vcxproj b/vcnet/libcups2.vcxproj
index 805247aa4d..befefc7040 100644
--- a/vcnet/libcups2.vcxproj
+++ b/vcnet/libcups2.vcxproj
@@ -121,6 +121,7 @@
     <ClCompile Include="..\cups\dnssd.c" />
     <ClCompile Include="..\cups\encode.c" />
     <ClCompile Include="..\cups\file.c" />
+    <ClCompile Include="..\cups\form.c" />
     <ClCompile Include="..\cups\getdevices.c" />
     <ClCompile Include="..\cups\getputfile.c" />
     <ClCompile Include="..\cups\globals.c" />
@@ -133,6 +134,8 @@
     <ClCompile Include="..\cups\ipp-support.c" />
     <ClCompile Include="..\cups\ipp-vars.c" />
     <ClCompile Include="..\cups\ipp.c" />
+    <ClCompile Include="..\cups\json.c" />
+    <ClCompile Include="..\cups\jwt.c" />
     <ClCompile Include="..\cups\langprintf.c" />
     <ClCompile Include="..\cups\language.c" />
     <ClCompile Include="..\cups\md5.c" />
@@ -150,6 +153,7 @@
     <ClCompile Include="..\cups\ppd-util.c" />
     <ClCompile Include="..\cups\ppd.c" />
     <ClCompile Include="..\cups\pwg-media.c" />
+    <ClCompile Include="..\cups\rand.c" />
     <ClCompile Include="..\cups\raster-error.c" />
     <ClCompile Include="..\cups\raster-interpret.c" />
     <ClCompile Include="..\cups\raster-interstub.c" />
@@ -180,11 +184,15 @@
     <ClInclude Include="..\cups\dnssd.h" />
     <ClInclude Include="..\cups\file-private.h" />
     <ClInclude Include="..\cups\file.h" />
+    <ClInclude Include="..\cups\form.h" />
     <ClInclude Include="..\cups\globals.h" />
     <ClInclude Include="..\cups\http-private.h" />
     <ClInclude Include="..\cups\http.h" />
     <ClInclude Include="..\cups\ipp-private.h" />
     <ClInclude Include="..\cups\ipp.h" />
+    <ClInclude Include="..\cups\json.h" />
+    <ClInclude Include="..\cups\json-private.h" />
+    <ClInclude Include="..\cups\jwt.h" />
     <ClInclude Include="..\cups\language-private.h" />
     <ClInclude Include="..\cups\language.h" />
     <ClInclude Include="..\cups\md5-private.h" />
@@ -193,6 +201,7 @@
     <ClInclude Include="..\cups\pwg-private.h" />
     <ClInclude Include="..\cups\pwg.h" />
     <ClInclude Include="..\cups\raster-private.h" />
+    <ClInclude Include="..\cups\raster-testpage.h" />
     <ClInclude Include="..\cups\raster.h" />
     <ClInclude Include="..\cups\string-private.h" />
     <ClInclude Include="..\cups\thread.h" />