diff --git a/src/interfaces/libpq/blibpqdll.def b/src/interfaces/libpq/blibpqdll.def
index 429d14bd73..77a996bfe5 100644
--- a/src/interfaces/libpq/blibpqdll.def
+++ b/src/interfaces/libpq/blibpqdll.def
@@ -1,97 +1,197 @@
+; DEF file for Borland C++ Builder
 LIBRARY BLIBPQ
+DESCRIPTION "PostgreSQL Client Library"
 EXPORTS
-	_PQconnectdb            @ 1
-	_PQsetdbLogin           @ 2
-	_PQconndefaults         @ 3
-	_PQfinish               @ 4
-	_PQreset                @ 5
-	_PQrequestCancel        @ 6
-	_PQdb                   @ 7
-	_PQuser                 @ 8
-	_PQpass                 @ 9
-	_PQhost                 @ 10
-	_PQport                 @ 11
-	_PQtty                  @ 12
-	_PQoptions              @ 13
-	_PQstatus               @ 14
-	_PQerrorMessage         @ 15
-	_PQsocket               @ 16
-	_PQbackendPID           @ 17
-	_PQtrace                @ 18
-	_PQuntrace              @ 19
-	_PQsetNoticeProcessor   @ 20
-	_PQexec                 @ 21
-	_PQnotifies             @ 22
-	_PQsendQuery            @ 23
-	_PQgetResult            @ 24
-	_PQisBusy               @ 25
-	_PQconsumeInput         @ 26
-	_PQgetline              @ 27
-	_PQputline              @ 28
-	_PQgetlineAsync         @ 29
-	_PQputnbytes            @ 30
-	_PQendcopy              @ 31
-	_PQfn                   @ 32
-	_PQresultStatus         @ 33
-	_PQntuples              @ 34
-	_PQnfields              @ 35
-	_PQbinaryTuples         @ 36
-	_PQfname                @ 37
-	_PQfnumber              @ 38
-	_PQftype                @ 39
-	_PQfsize                @ 40
-	_PQfmod                 @ 41
-	_PQcmdStatus            @ 42
-	_PQoidStatus            @ 43
-	_PQcmdTuples            @ 44
-	_PQgetvalue             @ 45
-	_PQgetlength            @ 46
-	_PQgetisnull            @ 47
-	_PQclear                @ 48
-	_PQmakeEmptyPGresult    @ 49
-	_PQprint                @ 50
-	_PQdisplayTuples        @ 51
-	_PQprintTuples          @ 52
-	_lo_open                @ 53
-	_lo_close               @ 54
-	_lo_read                @ 55
-	_lo_write               @ 56
-	_lo_lseek               @ 57
-	_lo_creat               @ 58
-	_lo_tell                @ 59
-	_lo_unlink              @ 60
-	_lo_import              @ 61
-	_lo_export              @ 62
-	_pgresStatus            @ 63
-	_PQmblen                @ 64
-	_PQresultErrorMessage   @ 65
-	_PQresStatus            @ 66
-	_termPQExpBuffer        @ 67
-	_appendPQExpBufferChar  @ 68
-	_initPQExpBuffer        @ 69
-	_resetPQExpBuffer       @ 70
-	_PQoidValue             @ 71
-	_PQclientEncoding       @ 72
-	_PQenv2encoding         @ 73
-	_appendBinaryPQExpBuffer	@ 74
-	_appendPQExpBufferStr   @ 75
-	_destroyPQExpBuffer     @ 76
-	_createPQExpBuffer      @ 77
-	_PQconninfoFree         @ 78
-	_PQconnectPoll          @ 79
-	_PQconnectStart         @ 80
-	_PQflush                @ 81
-	_PQisnonblocking        @ 82
-	_PQresetPoll            @ 83
-	_PQresetStart           @ 84
-	_PQsetClientEncoding    @ 85
-	_PQsetnonblocking       @ 86
-	_PQfreeNotify           @ 87
-	_PQescapeString         @ 88
-	_PQescapeBytea          @ 89
-	_printfPQExpBuffer      @ 90
-	_appendPQExpBuffer      @ 91
-	_pg_encoding_to_char    @ 92
-	_pg_utf_mblen           @ 93
-	_PQunescapeBytea		@ 94
-	_PQfreeMem				@ 95
+    _PQconnectdb             @ 1
+    _PQsetdbLogin            @ 2
+    _PQconndefaults          @ 3
+    _PQfinish                @ 4
+    _PQreset                 @ 5
+    _PQrequestCancel         @ 6
+    _PQdb                    @ 7
+    _PQuser                  @ 8
+    _PQpass                  @ 9
+    _PQhost                  @ 10
+    _PQport                  @ 11
+    _PQtty                   @ 12
+    _PQoptions               @ 13
+    _PQstatus                @ 14
+    _PQerrorMessage          @ 15
+    _PQsocket                @ 16
+    _PQbackendPID            @ 17
+    _PQtrace                 @ 18
+    _PQuntrace               @ 19
+    _PQsetNoticeProcessor    @ 20
+    _PQexec                  @ 21
+    _PQnotifies              @ 22
+    _PQsendQuery             @ 23
+    _PQgetResult             @ 24
+    _PQisBusy                @ 25
+    _PQconsumeInput          @ 26
+    _PQgetline               @ 27
+    _PQputline               @ 28
+    _PQgetlineAsync          @ 29
+    _PQputnbytes             @ 30
+    _PQendcopy               @ 31
+    _PQfn                    @ 32
+    _PQresultStatus          @ 33
+    _PQntuples               @ 34
+    _PQnfields               @ 35
+    _PQbinaryTuples          @ 36
+    _PQfname                 @ 37
+    _PQfnumber               @ 38
+    _PQftype                 @ 39
+    _PQfsize                 @ 40
+    _PQfmod                  @ 41
+    _PQcmdStatus             @ 42
+    _PQoidStatus             @ 43
+    _PQcmdTuples             @ 44
+    _PQgetvalue              @ 45
+    _PQgetlength             @ 46
+    _PQgetisnull             @ 47
+    _PQclear                 @ 48
+    _PQmakeEmptyPGresult     @ 49
+    _PQprint                 @ 50
+    _PQdisplayTuples         @ 51
+    _PQprintTuples           @ 52
+    _lo_open                 @ 53
+    _lo_close                @ 54
+    _lo_read                 @ 55
+    _lo_write                @ 56
+    _lo_lseek                @ 57
+    _lo_creat                @ 58
+    _lo_tell                 @ 59
+    _lo_unlink               @ 60
+    _lo_import               @ 61
+    _lo_export               @ 62
+    _pgresStatus             @ 63
+    _PQmblen                 @ 64
+    _PQresultErrorMessage    @ 65
+    _PQresStatus             @ 66
+    _termPQExpBuffer         @ 67
+    _appendPQExpBufferChar   @ 68
+    _initPQExpBuffer         @ 69
+    _resetPQExpBuffer        @ 70
+    _PQoidValue              @ 71
+    _PQclientEncoding        @ 72
+    _PQenv2encoding          @ 73
+    _appendBinaryPQExpBuffer @ 74
+    _appendPQExpBufferStr    @ 75
+    _destroyPQExpBuffer      @ 76
+    _createPQExpBuffer       @ 77
+    _PQconninfoFree          @ 78
+    _PQconnectPoll           @ 79
+    _PQconnectStart          @ 80
+    _PQflush                 @ 81
+    _PQisnonblocking         @ 82
+    _PQresetPoll             @ 83
+    _PQresetStart            @ 84
+    _PQsetClientEncoding     @ 85
+    _PQsetnonblocking        @ 86
+    _PQfreeNotify            @ 87
+    _PQescapeString          @ 88
+    _PQescapeBytea           @ 89
+    _printfPQExpBuffer       @ 90
+    _appendPQExpBuffer       @ 91
+    _pg_encoding_to_char     @ 92
+    _pg_utf_mblen            @ 93
+    _PQunescapeBytea         @ 94
+    _PQfreeMem               @ 95
+
+; Aliases for MS compatible names
+    PQconnectdb             = _PQconnectdb            
+    PQsetdbLogin            = _PQsetdbLogin           
+    PQconndefaults          = _PQconndefaults         
+    PQfinish                = _PQfinish               
+    PQreset                 = _PQreset                
+    PQrequestCancel         = _PQrequestCancel        
+    PQdb                    = _PQdb                   
+    PQuser                  = _PQuser                 
+    PQpass                  = _PQpass                 
+    PQhost                  = _PQhost                 
+    PQport                  = _PQport                 
+    PQtty                   = _PQtty                  
+    PQoptions               = _PQoptions              
+    PQstatus                = _PQstatus               
+    PQerrorMessage          = _PQerrorMessage         
+    PQsocket                = _PQsocket               
+    PQbackendPID            = _PQbackendPID           
+    PQtrace                 = _PQtrace                
+    PQuntrace               = _PQuntrace              
+    PQsetNoticeProcessor    = _PQsetNoticeProcessor   
+    PQexec                  = _PQexec                 
+    PQnotifies              = _PQnotifies             
+    PQsendQuery             = _PQsendQuery            
+    PQgetResult             = _PQgetResult            
+    PQisBusy                = _PQisBusy               
+    PQconsumeInput          = _PQconsumeInput         
+    PQgetline               = _PQgetline              
+    PQputline               = _PQputline              
+    PQgetlineAsync          = _PQgetlineAsync         
+    PQputnbytes             = _PQputnbytes            
+    PQendcopy               = _PQendcopy              
+    PQfn                    = _PQfn                   
+    PQresultStatus          = _PQresultStatus         
+    PQntuples               = _PQntuples              
+    PQnfields               = _PQnfields              
+    PQbinaryTuples          = _PQbinaryTuples         
+    PQfname                 = _PQfname                
+    PQfnumber               = _PQfnumber              
+    PQftype                 = _PQftype                
+    PQfsize                 = _PQfsize                
+    PQfmod                  = _PQfmod                 
+    PQcmdStatus             = _PQcmdStatus            
+    PQoidStatus             = _PQoidStatus            
+    PQcmdTuples             = _PQcmdTuples            
+    PQgetvalue              = _PQgetvalue             
+    PQgetlength             = _PQgetlength            
+    PQgetisnull             = _PQgetisnull            
+    PQclear                 = _PQclear                
+    PQmakeEmptyPGresult     = _PQmakeEmptyPGresult    
+    PQprint                 = _PQprint                
+    PQdisplayTuples         = _PQdisplayTuples        
+    PQprintTuples           = _PQprintTuples          
+    lo_open                 = _lo_open                
+    lo_close                = _lo_close               
+    lo_read                 = _lo_read                
+    lo_write                = _lo_write               
+    lo_lseek                = _lo_lseek               
+    lo_creat                = _lo_creat               
+    lo_tell                 = _lo_tell                
+    lo_unlink               = _lo_unlink              
+    lo_import               = _lo_import              
+    lo_export               = _lo_export              
+    pgresStatus             = _pgresStatus            
+    PQmblen                 = _PQmblen                
+    PQresultErrorMessage    = _PQresultErrorMessage   
+    PQresStatus             = _PQresStatus            
+    termPQExpBuffer         = _termPQExpBuffer        
+    appendPQExpBufferChar   = _appendPQExpBufferChar  
+    initPQExpBuffer         = _initPQExpBuffer        
+    resetPQExpBuffer        = _resetPQExpBuffer       
+    PQoidValue              = _PQoidValue             
+    PQclientEncoding        = _PQclientEncoding       
+    PQenv2encoding          = _PQenv2encoding         
+    appendBinaryPQExpBuffer = _appendBinaryPQExpBuffer
+    appendPQExpBufferStr    = _appendPQExpBufferStr   
+    destroyPQExpBuffer      = _destroyPQExpBuffer     
+    createPQExpBuffer       = _createPQExpBuffer      
+    PQconninfoFree          = _PQconninfoFree         
+    PQconnectPoll           = _PQconnectPoll          
+    PQconnectStart          = _PQconnectStart         
+    PQflush                 = _PQflush                
+    PQisnonblocking         = _PQisnonblocking        
+    PQresetPoll             = _PQresetPoll            
+    PQresetStart            = _PQresetStart           
+    PQsetClientEncoding     = _PQsetClientEncoding    
+    PQsetnonblocking        = _PQsetnonblocking       
+    PQfreeNotify            = _PQfreeNotify           
+    PQescapeString          = _PQescapeString         
+    PQescapeBytea           = _PQescapeBytea          
+    printfPQExpBuffer       = _printfPQExpBuffer      
+    appendPQExpBuffer       = _appendPQExpBuffer      
+    pg_encoding_to_char     = _pg_encoding_to_char    
+    pg_utf_mblen            = _pg_utf_mblen           
+    PQunescapeBytea         = _PQunescapeBytea        
+    PQfreeMem               = _PQfreeMem              
+
diff --git a/src/interfaces/libpq/libpqdll.def b/src/interfaces/libpq/libpqdll.def
index 335f6d68c7..e48959f086 100644
--- a/src/interfaces/libpq/libpqdll.def
+++ b/src/interfaces/libpq/libpqdll.def
@@ -1,98 +1,100 @@
+; DEF file for MS VC++
 LIBRARY LIBPQ
+DESCRIPTION "PostgreSQL Client Library"
 EXPORTS
-	PQconnectdb 			@ 1
-	PQsetdbLogin 			@ 2
-	PQconndefaults 			@ 3
-	PQfinish 				@ 4
-	PQreset					@ 5
-	PQrequestCancel			@ 6
-	PQdb					@ 7
-	PQuser					@ 8
-	PQpass					@ 9
-	PQhost					@ 10
-	PQport					@ 11
-	PQtty					@ 12
-	PQoptions				@ 13
-	PQstatus				@ 14
-	PQerrorMessage			@ 15
-	PQsocket				@ 16
-	PQbackendPID			@ 17
-	PQtrace					@ 18
-	PQuntrace				@ 19
-	PQsetNoticeProcessor	@ 20
-	PQexec					@ 21
-	PQnotifies				@ 22
-	PQsendQuery				@ 23
-	PQgetResult				@ 24
-	PQisBusy				@ 25
-	PQconsumeInput			@ 26
-	PQgetline				@ 27
-	PQputline				@ 28
-	PQgetlineAsync			@ 29
-	PQputnbytes				@ 30
-	PQendcopy				@ 31
-	PQfn					@ 32
-	PQresultStatus			@ 33
-	PQntuples				@ 34
-	PQnfields				@ 35
-	PQbinaryTuples			@ 36
-	PQfname					@ 37
-	PQfnumber				@ 38
-	PQftype					@ 39
-	PQfsize					@ 40
-	PQfmod					@ 41
-	PQcmdStatus				@ 42
-	PQoidStatus				@ 43
-	PQcmdTuples				@ 44
-	PQgetvalue				@ 45
-	PQgetlength				@ 46
-	PQgetisnull				@ 47
-	PQclear					@ 48
-	PQmakeEmptyPGresult		@ 49
-	PQprint					@ 50
-	PQdisplayTuples			@ 51
-	PQprintTuples			@ 52
-	lo_open					@ 53
-	lo_close				@ 54
-	lo_read					@ 55
-	lo_write				@ 56
-	lo_lseek				@ 57
-	lo_creat				@ 58
-	lo_tell					@ 59
-	lo_unlink				@ 60
-	lo_import				@ 61
-	lo_export				@ 62
-	pgresStatus				@ 63
-	PQmblen					@ 64
-	PQresultErrorMessage	@ 65
-	PQresStatus				@ 66
- 	termPQExpBuffer			@ 67
-	appendPQExpBufferChar	@ 68
-	initPQExpBuffer			@ 69
-	resetPQExpBuffer		@ 70
-	PQoidValue				@ 71
-	PQclientEncoding		@ 72
-	PQenv2encoding			@ 73
-	appendBinaryPQExpBuffer	@ 74
-	appendPQExpBufferStr	@ 75
-	destroyPQExpBuffer		@ 76
-	createPQExpBuffer		@ 77
-	PQconninfoFree			@ 78
-	PQconnectPoll			@ 79
-	PQconnectStart			@ 80
-	PQflush					@ 81
-	PQisnonblocking			@ 82
-	PQresetPoll				@ 83
-	PQresetStart			@ 84
-	PQsetClientEncoding		@ 85
-	PQsetnonblocking		@ 86
-	PQfreeNotify			@ 87
-	PQescapeString			@ 88
-	PQescapeBytea			@ 89
-	printfPQExpBuffer		@ 90
-	appendPQExpBuffer		@ 91
-	pg_encoding_to_char		@ 92
-	pg_utf_mblen			@ 93
-	PQunescapeBytea			@ 94
-	PQfreeMem				@ 95
+    PQconnectdb             @ 1
+    PQsetdbLogin            @ 2
+    PQconndefaults          @ 3
+    PQfinish                @ 4
+    PQreset                 @ 5
+    PQrequestCancel         @ 6
+    PQdb                    @ 7
+    PQuser                  @ 8
+    PQpass                  @ 9
+    PQhost                  @ 10
+    PQport                  @ 11
+    PQtty                   @ 12
+    PQoptions               @ 13
+    PQstatus                @ 14
+    PQerrorMessage          @ 15
+    PQsocket                @ 16
+    PQbackendPID            @ 17
+    PQtrace                 @ 18
+    PQuntrace               @ 19
+    PQsetNoticeProcessor    @ 20
+    PQexec                  @ 21
+    PQnotifies              @ 22
+    PQsendQuery             @ 23
+    PQgetResult             @ 24
+    PQisBusy                @ 25
+    PQconsumeInput          @ 26
+    PQgetline               @ 27
+    PQputline               @ 28
+    PQgetlineAsync          @ 29
+    PQputnbytes             @ 30
+    PQendcopy               @ 31
+    PQfn                    @ 32
+    PQresultStatus          @ 33
+    PQntuples               @ 34
+    PQnfields               @ 35
+    PQbinaryTuples          @ 36
+    PQfname                 @ 37
+    PQfnumber               @ 38
+    PQftype                 @ 39
+    PQfsize                 @ 40
+    PQfmod                  @ 41
+    PQcmdStatus             @ 42
+    PQoidStatus             @ 43
+    PQcmdTuples             @ 44
+    PQgetvalue              @ 45
+    PQgetlength             @ 46
+    PQgetisnull             @ 47
+    PQclear                 @ 48
+    PQmakeEmptyPGresult     @ 49
+    PQprint                 @ 50
+    PQdisplayTuples         @ 51
+    PQprintTuples           @ 52
+    lo_open                 @ 53
+    lo_close                @ 54
+    lo_read                 @ 55
+    lo_write                @ 56
+    lo_lseek                @ 57
+    lo_creat                @ 58
+    lo_tell                 @ 59
+    lo_unlink               @ 60
+    lo_import               @ 61
+    lo_export               @ 62
+    pgresStatus             @ 63
+    PQmblen                 @ 64
+    PQresultErrorMessage    @ 65
+    PQresStatus             @ 66
+    termPQExpBuffer         @ 67
+    appendPQExpBufferChar   @ 68
+    initPQExpBuffer         @ 69
+    resetPQExpBuffer        @ 70
+    PQoidValue              @ 71
+    PQclientEncoding        @ 72
+    PQenv2encoding          @ 73
+    appendBinaryPQExpBuffer @ 74
+    appendPQExpBufferStr    @ 75
+    destroyPQExpBuffer      @ 76
+    createPQExpBuffer       @ 77
+    PQconninfoFree          @ 78
+    PQconnectPoll           @ 79
+    PQconnectStart          @ 80
+    PQflush                 @ 81
+    PQisnonblocking         @ 82
+    PQresetPoll             @ 83
+    PQresetStart            @ 84
+    PQsetClientEncoding     @ 85
+    PQsetnonblocking        @ 86
+    PQfreeNotify            @ 87
+    PQescapeString          @ 88
+    PQescapeBytea           @ 89
+    printfPQExpBuffer       @ 90
+    appendPQExpBuffer       @ 91
+    pg_encoding_to_char     @ 92
+    pg_utf_mblen            @ 93
+    PQunescapeBytea         @ 94
+    PQfreeMem               @ 95