diff --git a/src/Backends/REFPROP/REFPROPMixtureBackend.cpp b/src/Backends/REFPROP/REFPROPMixtureBackend.cpp
index 9e204d90..6d39f51c 100644
--- a/src/Backends/REFPROP/REFPROPMixtureBackend.cpp
+++ b/src/Backends/REFPROP/REFPROPMixtureBackend.cpp
@@ -253,108 +253,108 @@ double setFunctionPointers()
         return -_HUGE;
     }
     // set the pointers, platform independent
-    RPVersion = (RPVersion_POINTER) getFunctionPointer(RPVersion_NAME);
-    ABFL1dll = (ABFL1dll_POINTER) getFunctionPointer(ABFL1dll_NAME);
-    ABFL2dll = (ABFL2dll_POINTER) getFunctionPointer(ABFL2dll_NAME);
-    ACTVYdll = (ACTVYdll_POINTER) getFunctionPointer(ACTVYdll_NAME);
-    AGdll = (AGdll_POINTER) getFunctionPointer(AGdll_NAME);
-    CCRITdll = (CCRITdll_POINTER) getFunctionPointer(CCRITdll_NAME);
-    CP0dll = (CP0dll_POINTER) getFunctionPointer(CP0dll_NAME);
-    CRITPdll = (CRITPdll_POINTER) getFunctionPointer(CRITPdll_NAME);
-    CSATKdll = (CSATKdll_POINTER) getFunctionPointer(CSATKdll_NAME);
-    CV2PKdll = (CV2PKdll_POINTER) getFunctionPointer(CV2PKdll_NAME);
-    CVCPKdll = (CVCPKdll_POINTER) getFunctionPointer(CVCPKdll_NAME);
-    CVCPdll = (CVCPdll_POINTER) getFunctionPointer(CVCPdll_NAME);
-    DBDTdll = (DBDTdll_POINTER) getFunctionPointer(DBDTdll_NAME);
-    DBFL1dll = (DBFL1dll_POINTER) getFunctionPointer(DBFL1dll_NAME);
-    DBFL2dll = (DBFL2dll_POINTER) getFunctionPointer(DBFL2dll_NAME);
-    DDDPdll = (DDDPdll_POINTER) getFunctionPointer(DDDPdll_NAME);
-    DDDTdll = (DDDTdll_POINTER) getFunctionPointer(DDDTdll_NAME);
-    DEFLSHdll = (DEFLSHdll_POINTER) getFunctionPointer(DEFLSHdll_NAME);
-    DHD1dll = (DHD1dll_POINTER) getFunctionPointer(DHD1dll_NAME);
-    DHFLSHdll = (DHFLSHdll_POINTER) getFunctionPointer(DHFLSHdll_NAME);
-    DIELECdll = (DIELECdll_POINTER) getFunctionPointer(DIELECdll_NAME);
-    DOTFILLdll = (DOTFILLdll_POINTER) getFunctionPointer(DOTFILLdll_NAME);
-    DPDD2dll = (DPDD2dll_POINTER) getFunctionPointer(DPDD2dll_NAME);
-    DPDDKdll = (DPDDKdll_POINTER) getFunctionPointer(DPDDKdll_NAME);
-    DPDDdll = (DPDDdll_POINTER) getFunctionPointer(DPDDdll_NAME);
-    DPDTKdll = (DPDTKdll_POINTER) getFunctionPointer(DPDTKdll_NAME);
-    DPDTdll = (DPDTdll_POINTER) getFunctionPointer(DPDTdll_NAME);
-    DPTSATKdll = (DPTSATKdll_POINTER) getFunctionPointer(DPTSATKdll_NAME);
-    DSFLSHdll = (DSFLSHdll_POINTER) getFunctionPointer(DSFLSHdll_NAME);
-    ENTHALdll = (ENTHALdll_POINTER) getFunctionPointer(ENTHALdll_NAME);
-    ENTROdll = (ENTROdll_POINTER) getFunctionPointer(ENTROdll_NAME);
-    ESFLSHdll = (ESFLSHdll_POINTER) getFunctionPointer(ESFLSHdll_NAME);
-    FGCTYdll = (FGCTYdll_POINTER) getFunctionPointer(FGCTYdll_NAME);
-    FPVdll = (FPVdll_POINTER) getFunctionPointer(FPVdll_NAME);
-    FUGCOFdll = (FUGCOFdll_POINTER) getFunctionPointer(FUGCOFdll_NAME);
-    GERG04dll = (GERG04dll_POINTER) getFunctionPointer(GERG04dll_NAME);
-    GETFIJdll = (GETFIJdll_POINTER) getFunctionPointer(GETFIJdll_NAME);
-    GETKTVdll = (GETKTVdll_POINTER) getFunctionPointer(GETKTVdll_NAME);
-    GIBBSdll = (GIBBSdll_POINTER) getFunctionPointer(GIBBSdll_NAME);
-    HSFLSHdll = (HSFLSHdll_POINTER) getFunctionPointer(HSFLSHdll_NAME);
-    INFOdll = (INFOdll_POINTER) getFunctionPointer(INFOdll_NAME);
-    LIMITKdll = (LIMITKdll_POINTER) getFunctionPointer(LIMITKdll_NAME);
-    LIMITSdll = (LIMITSdll_POINTER) getFunctionPointer(LIMITSdll_NAME);
-    LIMITXdll = (LIMITXdll_POINTER) getFunctionPointer(LIMITXdll_NAME);
-    MELTPdll = (MELTPdll_POINTER) getFunctionPointer(MELTPdll_NAME);
-    MELTTdll = (MELTTdll_POINTER) getFunctionPointer(MELTTdll_NAME);
-    MLTH2Odll = (MLTH2Odll_POINTER) getFunctionPointer(MLTH2Odll_NAME);
-    NAMEdll = (NAMEdll_POINTER) getFunctionPointer(NAMEdll_NAME);
-    PASSCMNdll = (PASSCMNdll_POINTER) getFunctionPointer(PASSCMNdll_NAME);
-	PDFL1dll = (PDFL1dll_POINTER) getFunctionPointer(PDFL1dll_NAME);
-    PDFLSHdll = (PDFLSHdll_POINTER) getFunctionPointer(PDFLSHdll_NAME);
-    PEFLSHdll = (PEFLSHdll_POINTER) getFunctionPointer(PEFLSHdll_NAME);
-    PHFL1dll = (PHFL1dll_POINTER) getFunctionPointer(PHFL1dll_NAME);
-    PHFLSHdll = (PHFLSHdll_POINTER) getFunctionPointer(PHFLSHdll_NAME);
-	PHIXdll = (PHIXdll_POINTER) getFunctionPointer(PHIXdll_NAME);
-	PHI0dll = (PHI0dll_POINTER) getFunctionPointer(PHI0dll_NAME);
-    PQFLSHdll = (PQFLSHdll_POINTER) getFunctionPointer(PQFLSHdll_NAME);
-    PREOSdll = (PREOSdll_POINTER) getFunctionPointer(PREOSdll_NAME);
-    PRESSdll = (PRESSdll_POINTER) getFunctionPointer(PRESSdll_NAME);
-    PSFL1dll = (PSFL1dll_POINTER) getFunctionPointer(PSFL1dll_NAME);
-    PSFLSHdll = (PSFLSHdll_POINTER) getFunctionPointer(PSFLSHdll_NAME);
-    PUREFLDdll = (PUREFLDdll_POINTER) getFunctionPointer(PUREFLDdll_NAME);
-    RESIDUALdll = (RESIDUALdll_POINTER) getFunctionPointer(RESIDUALdll_NAME);
-	RMIX2dll = (RMIX2dll_POINTER) getFunctionPointer(RMIX2dll_NAME);
-	REDXdll = (REDXdll_POINTER) getFunctionPointer(REDXdll_NAME);
-    QMASSdll = (QMASSdll_POINTER) getFunctionPointer(QMASSdll_NAME);
-    QMOLEdll = (QMOLEdll_POINTER) getFunctionPointer(QMOLEdll_NAME);
-    SATDdll = (SATDdll_POINTER) getFunctionPointer(SATDdll_NAME);
-    SATEdll = (SATEdll_POINTER) getFunctionPointer(SATEdll_NAME);
-    SATHdll = (SATHdll_POINTER) getFunctionPointer(SATHdll_NAME);
-    SATPdll = (SATPdll_POINTER) getFunctionPointer(SATPdll_NAME);
-    SATSdll = (SATSdll_POINTER) getFunctionPointer(SATSdll_NAME);
-    SATTdll = (SATTdll_POINTER) getFunctionPointer(SATTdll_NAME);
-    SATSPLNdll = (SATSPLNdll_POINTER) getFunctionPointer(SATSPLNdll_NAME);
-    SETAGAdll = (SETAGAdll_POINTER) getFunctionPointer(SETAGAdll_NAME);
-    SETKTVdll = (SETKTVdll_POINTER) getFunctionPointer(SETKTVdll_NAME);
-    SETMIXdll = (SETMIXdll_POINTER) getFunctionPointer(SETMIXdll_NAME);
-    SETMODdll = (SETMODdll_POINTER) getFunctionPointer(SETMODdll_NAME);
-    SETREFdll = (SETREFdll_POINTER) getFunctionPointer(SETREFdll_NAME);
-    SETUPdll = (SETUPdll_POINTER) getFunctionPointer(SETUPdll_NAME);
-//        SPECGRdll = (SPECGRdll_POINTER) getFunctionPointer(SPECGRdll_NAME); // not in library
-    SUBLPdll = (SUBLPdll_POINTER) getFunctionPointer(SUBLPdll_NAME);
-    SUBLTdll = (SUBLTdll_POINTER) getFunctionPointer(SUBLTdll_NAME);
-    SURFTdll = (SURFTdll_POINTER) getFunctionPointer(SURFTdll_NAME);
-    SURTENdll = (SURTENdll_POINTER) getFunctionPointer(SURTENdll_NAME);
-    TDFLSHdll = (TDFLSHdll_POINTER) getFunctionPointer(TDFLSHdll_NAME);
-    TEFLSHdll = (TEFLSHdll_POINTER) getFunctionPointer(TEFLSHdll_NAME);
-    THERM0dll = (THERM0dll_POINTER) getFunctionPointer(THERM0dll_NAME);
-    THERM2dll = (THERM2dll_POINTER) getFunctionPointer(THERM2dll_NAME);
-    THERM3dll = (THERM3dll_POINTER) getFunctionPointer(THERM3dll_NAME);
-    THERMdll = (THERMdll_POINTER) getFunctionPointer(THERMdll_NAME);
-    THFLSHdll = (THFLSHdll_POINTER) getFunctionPointer(THFLSHdll_NAME);
-    TPFLSHdll = (TPFLSHdll_POINTER) getFunctionPointer(TPFLSHdll_NAME);
-    TPRHOdll = (TPRHOdll_POINTER) getFunctionPointer(TPRHOdll_NAME);
-    TQFLSHdll = (TQFLSHdll_POINTER) getFunctionPointer(TQFLSHdll_NAME);
-    TRNPRPdll = (TRNPRPdll_POINTER) getFunctionPointer(TRNPRPdll_NAME);
-    TSFLSHdll = (TSFLSHdll_POINTER) getFunctionPointer(TSFLSHdll_NAME);
-    VIRBdll = (VIRBdll_POINTER) getFunctionPointer(VIRBdll_NAME);
-    VIRCdll = (VIRCdll_POINTER) getFunctionPointer(VIRCdll_NAME);
-    WMOLdll = (WMOLdll_POINTER) getFunctionPointer(WMOLdll_NAME);
-    XMASSdll = (XMASSdll_POINTER) getFunctionPointer(XMASSdll_NAME);
-    XMOLEdll = (XMOLEdll_POINTER) getFunctionPointer(XMOLEdll_NAME);
+    RPVersion = (RPVersion_POINTER) getFunctionPointer(STRINGIFY(RPVersion));
+    ABFL1dll = (ABFL1dll_POINTER) getFunctionPointer(STRINGIFY(ABFL1dll));
+    ABFL2dll = (ABFL2dll_POINTER) getFunctionPointer(STRINGIFY(ABFL2dll));
+    ACTVYdll = (ACTVYdll_POINTER) getFunctionPointer(STRINGIFY(ACTVYdll));
+    AGdll = (AGdll_POINTER) getFunctionPointer(STRINGIFY(AGdll));
+    CCRITdll = (CCRITdll_POINTER) getFunctionPointer(STRINGIFY(CCRITdll));
+    CP0dll = (CP0dll_POINTER) getFunctionPointer(STRINGIFY(CP0dll));
+    CRITPdll = (CRITPdll_POINTER) getFunctionPointer(STRINGIFY(CRITPdll));
+    CSATKdll = (CSATKdll_POINTER) getFunctionPointer(STRINGIFY(CSATKdll));
+    CV2PKdll = (CV2PKdll_POINTER) getFunctionPointer(STRINGIFY(CV2PKdll));
+    CVCPKdll = (CVCPKdll_POINTER) getFunctionPointer(STRINGIFY(CVCPKdll));
+    CVCPdll = (CVCPdll_POINTER) getFunctionPointer(STRINGIFY(CVCPdll));
+    DBDTdll = (DBDTdll_POINTER) getFunctionPointer(STRINGIFY(DBDTdll));
+    DBFL1dll = (DBFL1dll_POINTER) getFunctionPointer(STRINGIFY(DBFL1dll));
+    DBFL2dll = (DBFL2dll_POINTER) getFunctionPointer(STRINGIFY(DBFL2dll));
+    DDDPdll = (DDDPdll_POINTER) getFunctionPointer(STRINGIFY(DDDPdll));
+    DDDTdll = (DDDTdll_POINTER) getFunctionPointer(STRINGIFY(DDDTdll));
+    DEFLSHdll = (DEFLSHdll_POINTER) getFunctionPointer(STRINGIFY(DEFLSHdll));
+    DHD1dll = (DHD1dll_POINTER) getFunctionPointer(STRINGIFY(DHD1dll));
+    DHFLSHdll = (DHFLSHdll_POINTER) getFunctionPointer(STRINGIFY(DHFLSHdll));
+    DIELECdll = (DIELECdll_POINTER) getFunctionPointer(STRINGIFY(DIELECdll));
+    DOTFILLdll = (DOTFILLdll_POINTER) getFunctionPointer(STRINGIFY(DOTFILLdll));
+    DPDD2dll = (DPDD2dll_POINTER) getFunctionPointer(STRINGIFY(DPDD2dll));
+    DPDDKdll = (DPDDKdll_POINTER) getFunctionPointer(STRINGIFY(DPDDKdll));
+    DPDDdll = (DPDDdll_POINTER) getFunctionPointer(STRINGIFY(DPDDdll));
+    DPDTKdll = (DPDTKdll_POINTER) getFunctionPointer(STRINGIFY(DPDTKdll));
+    DPDTdll = (DPDTdll_POINTER) getFunctionPointer(STRINGIFY(DPDTdll));
+    DPTSATKdll = (DPTSATKdll_POINTER) getFunctionPointer(STRINGIFY(DPTSATKdll));
+    DSFLSHdll = (DSFLSHdll_POINTER) getFunctionPointer(STRINGIFY(DSFLSHdll));
+    ENTHALdll = (ENTHALdll_POINTER) getFunctionPointer(STRINGIFY(ENTHALdll));
+    ENTROdll = (ENTROdll_POINTER) getFunctionPointer(STRINGIFY(ENTROdll));
+    ESFLSHdll = (ESFLSHdll_POINTER) getFunctionPointer(STRINGIFY(ESFLSHdll));
+    FGCTYdll = (FGCTYdll_POINTER) getFunctionPointer(STRINGIFY(FGCTYdll));
+    FPVdll = (FPVdll_POINTER) getFunctionPointer(STRINGIFY(FPVdll));
+    FUGCOFdll = (FUGCOFdll_POINTER) getFunctionPointer(STRINGIFY(FUGCOFdll));
+    GERG04dll = (GERG04dll_POINTER) getFunctionPointer(STRINGIFY(GERG04dll));
+    GETFIJdll = (GETFIJdll_POINTER) getFunctionPointer(STRINGIFY(GETFIJdll));
+    GETKTVdll = (GETKTVdll_POINTER) getFunctionPointer(STRINGIFY(GETKTVdll));
+    GIBBSdll = (GIBBSdll_POINTER) getFunctionPointer(STRINGIFY(GIBBSdll));
+    HSFLSHdll = (HSFLSHdll_POINTER) getFunctionPointer(STRINGIFY(HSFLSHdll));
+    INFOdll = (INFOdll_POINTER) getFunctionPointer(STRINGIFY(INFOdll));
+    LIMITKdll = (LIMITKdll_POINTER) getFunctionPointer(STRINGIFY(LIMITKdll));
+    LIMITSdll = (LIMITSdll_POINTER) getFunctionPointer(STRINGIFY(LIMITSdll));
+    LIMITXdll = (LIMITXdll_POINTER) getFunctionPointer(STRINGIFY(LIMITXdll));
+    MELTPdll = (MELTPdll_POINTER) getFunctionPointer(STRINGIFY(MELTPdll));
+    MELTTdll = (MELTTdll_POINTER) getFunctionPointer(STRINGIFY(MELTTdll));
+    MLTH2Odll = (MLTH2Odll_POINTER) getFunctionPointer(STRINGIFY(MLTH2Odll));
+    NAMEdll = (NAMEdll_POINTER) getFunctionPointer(STRINGIFY(NAMEdll));
+    PASSCMNdll = (PASSCMNdll_POINTER) getFunctionPointer(STRINGIFY(PASSCMNdll));
+	PDFL1dll = (PDFL1dll_POINTER) getFunctionPointer(STRINGIFY(PDFL1dll));
+    PDFLSHdll = (PDFLSHdll_POINTER) getFunctionPointer(STRINGIFY(PDFLSHdll));
+    PEFLSHdll = (PEFLSHdll_POINTER) getFunctionPointer(STRINGIFY(PEFLSHdll));
+    PHFL1dll = (PHFL1dll_POINTER) getFunctionPointer(STRINGIFY(PHFL1dll));
+    PHFLSHdll = (PHFLSHdll_POINTER) getFunctionPointer(STRINGIFY(PHFLSHdll));
+	PHIXdll = (PHIXdll_POINTER) getFunctionPointer(STRINGIFY(PHIXdll));
+	PHI0dll = (PHI0dll_POINTER) getFunctionPointer(STRINGIFY(PHI0dll));
+    PQFLSHdll = (PQFLSHdll_POINTER) getFunctionPointer(STRINGIFY(PQFLSHdll));
+    PREOSdll = (PREOSdll_POINTER) getFunctionPointer(STRINGIFY(PREOSdll));
+    PRESSdll = (PRESSdll_POINTER) getFunctionPointer(STRINGIFY(PRESSdll));
+    PSFL1dll = (PSFL1dll_POINTER) getFunctionPointer(STRINGIFY(PSFL1dll));
+    PSFLSHdll = (PSFLSHdll_POINTER) getFunctionPointer(STRINGIFY(PSFLSHdll));
+    PUREFLDdll = (PUREFLDdll_POINTER) getFunctionPointer(STRINGIFY(PUREFLDdll));
+    RESIDUALdll = (RESIDUALdll_POINTER) getFunctionPointer(STRINGIFY(RESIDUALdll));
+	RMIX2dll = (RMIX2dll_POINTER) getFunctionPointer(STRINGIFY(RMIX2dll));
+	REDXdll = (REDXdll_POINTER) getFunctionPointer(STRINGIFY(REDXdll));
+    QMASSdll = (QMASSdll_POINTER) getFunctionPointer(STRINGIFY(QMASSdll));
+    QMOLEdll = (QMOLEdll_POINTER) getFunctionPointer(STRINGIFY(QMOLEdll));
+    SATDdll = (SATDdll_POINTER) getFunctionPointer(STRINGIFY(SATDdll));
+    SATEdll = (SATEdll_POINTER) getFunctionPointer(STRINGIFY(SATEdll));
+    SATHdll = (SATHdll_POINTER) getFunctionPointer(STRINGIFY(SATHdll));
+    SATPdll = (SATPdll_POINTER) getFunctionPointer(STRINGIFY(SATPdll));
+    SATSdll = (SATSdll_POINTER) getFunctionPointer(STRINGIFY(SATSdll));
+    SATTdll = (SATTdll_POINTER) getFunctionPointer(STRINGIFY(SATTdll));
+    SATSPLNdll = (SATSPLNdll_POINTER) getFunctionPointer(STRINGIFY(SATSPLNdll));
+    SETAGAdll = (SETAGAdll_POINTER) getFunctionPointer(STRINGIFY(SETAGAdll));
+    SETKTVdll = (SETKTVdll_POINTER) getFunctionPointer(STRINGIFY(SETKTVdll));
+    SETMIXdll = (SETMIXdll_POINTER) getFunctionPointer(STRINGIFY(SETMIXdll));
+    SETMODdll = (SETMODdll_POINTER) getFunctionPointer(STRINGIFY(SETMODdll));
+    SETREFdll = (SETREFdll_POINTER) getFunctionPointer(STRINGIFY(SETREFdll));
+    SETUPdll = (SETUPdll_POINTER) getFunctionPointer(STRINGIFY(SETUPdll));
+//        SPECGRdll = (SPECGRdll_POINTER) getFunctionPointer(STRINGIFY(SPECGRdll)); // not in library
+    SUBLPdll = (SUBLPdll_POINTER) getFunctionPointer(STRINGIFY(SUBLPdll));
+    SUBLTdll = (SUBLTdll_POINTER) getFunctionPointer(STRINGIFY(SUBLTdll));
+    SURFTdll = (SURFTdll_POINTER) getFunctionPointer(STRINGIFY(SURFTdll));
+    SURTENdll = (SURTENdll_POINTER) getFunctionPointer(STRINGIFY(SURTENdll));
+    TDFLSHdll = (TDFLSHdll_POINTER) getFunctionPointer(STRINGIFY(TDFLSHdll));
+    TEFLSHdll = (TEFLSHdll_POINTER) getFunctionPointer(STRINGIFY(TEFLSHdll));
+    THERM0dll = (THERM0dll_POINTER) getFunctionPointer(STRINGIFY(THERM0dll));
+    THERM2dll = (THERM2dll_POINTER) getFunctionPointer(STRINGIFY(THERM2dll));
+    THERM3dll = (THERM3dll_POINTER) getFunctionPointer(STRINGIFY(THERM3dll));
+    THERMdll = (THERMdll_POINTER) getFunctionPointer(STRINGIFY(THERMdll));
+    THFLSHdll = (THFLSHdll_POINTER) getFunctionPointer(STRINGIFY(THFLSHdll));
+    TPFLSHdll = (TPFLSHdll_POINTER) getFunctionPointer(STRINGIFY(TPFLSHdll));
+    TPRHOdll = (TPRHOdll_POINTER) getFunctionPointer(STRINGIFY(TPRHOdll));
+    TQFLSHdll = (TQFLSHdll_POINTER) getFunctionPointer(STRINGIFY(TQFLSHdll));
+    TRNPRPdll = (TRNPRPdll_POINTER) getFunctionPointer(STRINGIFY(TRNPRPdll));
+    TSFLSHdll = (TSFLSHdll_POINTER) getFunctionPointer(STRINGIFY(TSFLSHdll));
+    VIRBdll = (VIRBdll_POINTER) getFunctionPointer(STRINGIFY(VIRBdll));
+    VIRCdll = (VIRCdll_POINTER) getFunctionPointer(STRINGIFY(VIRCdll));
+    WMOLdll = (WMOLdll_POINTER) getFunctionPointer(STRINGIFY(WMOLdll));
+    XMASSdll = (XMASSdll_POINTER) getFunctionPointer(STRINGIFY(XMASSdll));
+    XMOLEdll = (XMOLEdll_POINTER) getFunctionPointer(STRINGIFY(XMOLEdll));
     return COOLPROP_OK;
 }
 
@@ -523,7 +523,7 @@ bool REFPROPMixtureBackend::REFPROP_supported () {
     // Store result of previous check.
     if (_REFPROP_supported) {
         // Either Refprop is supported or it is the first check.
-        std::string rpv(RPVersion_NAME);
+        std::string rpv(STRINGIFY(RPVersion));
         if (rpv.compare("NOTAVAILABLE")!=0) {
             // Function names were defined in "REFPROP_lib.h",
             // This platform theoretically supports Refprop.
diff --git a/src/Backends/REFPROP/REFPROP_lib.h b/src/Backends/REFPROP/REFPROP_lib.h
index 49fc5786..1bf9f741 100644
--- a/src/Backends/REFPROP/REFPROP_lib.h
+++ b/src/Backends/REFPROP/REFPROP_lib.h
@@ -484,117 +484,7 @@
 #include <string.h>
 #define STR_VALUE(arg)      #arg
 #define FUNCTION_NAME(name) STR_VALUE(name)
-//
-// Prepare the strings to be used by the functions that
-// handle the library later on.
-#define RPVersion_NAME FUNCTION_NAME(RPVersion)
-#define SETPATHdll_NAME FUNCTION_NAME(SETPATHdll)
-#define ABFL1dll_NAME FUNCTION_NAME(ABFL1dll)
-#define ABFL2dll_NAME FUNCTION_NAME(ABFL2dll)
-#define ACTVYdll_NAME FUNCTION_NAME(ACTVYdll)
-#define AGdll_NAME FUNCTION_NAME(AGdll)
-#define CCRITdll_NAME FUNCTION_NAME(CCRITdll)
-#define CP0dll_NAME FUNCTION_NAME(CP0dll)
-#define CRITPdll_NAME FUNCTION_NAME(CRITPdll)
-#define CSATKdll_NAME FUNCTION_NAME(CSATKdll)
-#define CV2PKdll_NAME FUNCTION_NAME(CV2PKdll)
-#define CVCPKdll_NAME FUNCTION_NAME(CVCPKdll)
-#define CVCPdll_NAME FUNCTION_NAME(CVCPdll)
-#define DBDTdll_NAME FUNCTION_NAME(DBDTdll)
-#define DBFL1dll_NAME FUNCTION_NAME(DBFL1dll)
-#define DBFL2dll_NAME FUNCTION_NAME(DBFL2dll)
-#define DDDPdll_NAME FUNCTION_NAME(DDDPdll)
-#define DDDTdll_NAME FUNCTION_NAME(DDDTdll)
-#define DEFLSHdll_NAME FUNCTION_NAME(DEFLSHdll)
-#define DHD1dll_NAME FUNCTION_NAME(DHD1dll)
-#define DHFL1dll_NAME FUNCTION_NAME(DHFL1dll)
-#define DHFL2dll_NAME FUNCTION_NAME(DHFL2dll)
-#define DHFLSHdll_NAME FUNCTION_NAME(DHFLSHdll)
-#define DIELECdll_NAME FUNCTION_NAME(DIELECdll)
-#define DOTFILLdll_NAME FUNCTION_NAME(DOTFILLdll)
-#define DPDD2dll_NAME FUNCTION_NAME(DPDD2dll)
-#define DPDDKdll_NAME FUNCTION_NAME(DPDDKdll)
-#define DPDDdll_NAME FUNCTION_NAME(DPDDdll)
-#define DPDTKdll_NAME FUNCTION_NAME(DPDTKdll)
-#define DPDTdll_NAME FUNCTION_NAME(DPDTdll)
-#define DPTSATKdll_NAME FUNCTION_NAME(DPTSATKdll)
-#define DSFLSHdll_NAME FUNCTION_NAME(DSFLSHdll)
-#define DSFL1dll_NAME FUNCTION_NAME(DSFL1dll)
-#define DSFL2dll_NAME FUNCTION_NAME(DSFL2dll)
-#define ENTHALdll_NAME FUNCTION_NAME(ENTHALdll)
-#define ENTROdll_NAME FUNCTION_NAME(ENTROdll)
-#define ESFLSHdll_NAME FUNCTION_NAME(ESFLSHdll)
-#define FGCTYdll_NAME FUNCTION_NAME(FGCTYdll)
-#define FUGCOFdll_NAME FUNCTION_NAME(FUGCOFdll)
-#define FPVdll_NAME FUNCTION_NAME(FPVdll)
-#define GERG04dll_NAME FUNCTION_NAME(GERG04dll)
-#define GETFIJdll_NAME FUNCTION_NAME(GETFIJdll)
-#define GETKTVdll_NAME FUNCTION_NAME(GETKTVdll)
-#define GIBBSdll_NAME FUNCTION_NAME(GIBBSdll)
-#define HSFLSHdll_NAME FUNCTION_NAME(HSFLSHdll)
-#define INFOdll_NAME FUNCTION_NAME(INFOdll)
-#define LIMITKdll_NAME FUNCTION_NAME(LIMITKdll)
-#define LIMITSdll_NAME FUNCTION_NAME(LIMITSdll)
-#define LIMITXdll_NAME FUNCTION_NAME(LIMITXdll)
-#define MELTPdll_NAME FUNCTION_NAME(MELTPdll)
-#define MELTTdll_NAME FUNCTION_NAME(MELTTdll)
-#define MLTH2Odll_NAME FUNCTION_NAME(MLTH2Odll)
-#define NAMEdll_NAME FUNCTION_NAME(NAMEdll)
-#define PASSCMNdll_NAME FUNCTION_NAME(PASSCMNdll)
-#define PDFL1dll_NAME FUNCTION_NAME(PDFL1dll)
-#define PDFLSHdll_NAME FUNCTION_NAME(PDFLSHdll)
-#define PEFLSHdll_NAME FUNCTION_NAME(PEFLSHdll)
-#define PHFL1dll_NAME FUNCTION_NAME(PHFL1dll)
-#define PHFLSHdll_NAME FUNCTION_NAME(PHFLSHdll)
-#define PHIXdll_NAME FUNCTION_NAME(PHIXdll)
-#define PHI0dll_NAME FUNCTION_NAME(PHI0dll)
-#define PQFLSHdll_NAME FUNCTION_NAME(PQFLSHdll)
-#define PREOSdll_NAME FUNCTION_NAME(PREOSdll)
-#define PRESSdll_NAME FUNCTION_NAME(PRESSdll)
-#define PSFL1dll_NAME FUNCTION_NAME(PSFL1dll)
-#define PSFLSHdll_NAME FUNCTION_NAME(PSFLSHdll)
-#define PUREFLDdll_NAME FUNCTION_NAME(PUREFLDdll)
-#define QMASSdll_NAME FUNCTION_NAME(QMASSdll)
-#define QMOLEdll_NAME FUNCTION_NAME(QMOLEdll)
-#define RESIDUALdll_NAME FUNCTION_NAME(RESIDUALdll)
-#define REDXdll_NAME FUNCTION_NAME(REDXdll)
-#define RMIX2dll_NAME FUNCTION_NAME(RMIX2dll)
-#define SATDdll_NAME FUNCTION_NAME(SATDdll)
-#define SATEdll_NAME FUNCTION_NAME(SATEdll)
-#define SATHdll_NAME FUNCTION_NAME(SATHdll)
-#define SATPdll_NAME FUNCTION_NAME(SATPdll)
-#define SATSdll_NAME FUNCTION_NAME(SATSdll)
-#define SATTdll_NAME FUNCTION_NAME(SATTdll)
-#define SATSPLNdll_NAME FUNCTION_NAME(SATSPLNdll)
-#define SETAGAdll_NAME FUNCTION_NAME(SETAGAdll)
-#define SETKTVdll_NAME FUNCTION_NAME(SETKTVdll)
-#define SETMIXdll_NAME FUNCTION_NAME(SETMIXdll)
-#define SETMODdll_NAME FUNCTION_NAME(SETMODdll)
-#define SETREFdll_NAME FUNCTION_NAME(SETREFdll)
-#define SETUPdll_NAME FUNCTION_NAME(SETUPdll)
-//#define SPECGRdll_NAME FUNCTION_NAME(SPECGRdll) // not found in library
-#define SUBLPdll_NAME FUNCTION_NAME(SUBLPdll)
-#define SUBLTdll_NAME FUNCTION_NAME(SUBLTdll)
-#define SURFTdll_NAME FUNCTION_NAME(SURFTdll)
-#define SURTENdll_NAME FUNCTION_NAME(SURTENdll)
-#define TDFLSHdll_NAME FUNCTION_NAME(TDFLSHdll)
-#define TEFLSHdll_NAME FUNCTION_NAME(TEFLSHdll)
-#define THERM0dll_NAME FUNCTION_NAME(THERM0dll)
-#define THERM2dll_NAME FUNCTION_NAME(THERM2dll)
-#define THERM3dll_NAME FUNCTION_NAME(THERM3dll)
-#define THERMdll_NAME FUNCTION_NAME(THERMdll)
-#define THFLSHdll_NAME FUNCTION_NAME(THFLSHdll)
-#define TPFLSHdll_NAME FUNCTION_NAME(TPFLSHdll)
-#define TPFL2dll_NAME FUNCTION_NAME(TPFL2dll)
-#define TPRHOdll_NAME FUNCTION_NAME(TPRHOdll)
-#define TQFLSHdll_NAME FUNCTION_NAME(TQFLSHdll)
-#define TRNPRPdll_NAME FUNCTION_NAME(TRNPRPdll)
-#define TSFLSHdll_NAME FUNCTION_NAME(TSFLSHdll)
-#define VIRBdll_NAME FUNCTION_NAME(VIRBdll)
-#define VIRCdll_NAME FUNCTION_NAME(VIRCdll)
-#define WMOLdll_NAME FUNCTION_NAME(WMOLdll)
-#define XMASSdll_NAME FUNCTION_NAME(XMASSdll)
-#define XMOLEdll_NAME FUNCTION_NAME(XMOLEdll)
+#define STRINGIFY(name) STR_VALUE(name)
 //
 // I'll try to follow this example from:
 // http://www.gershnik.com/tips/cpp.asp
@@ -607,7 +497,6 @@ extern "C" {
   // For C calling conventions, replaced all "double &" with "double *", and "long &" with "long *"
   typedef void (CALLCONV RPVersion_TYPE)( char* );
   typedef void (CALLCONV SETPATHdll_TYPE)( const char* );
-  //
   typedef void (CALLCONV ABFL1dll_TYPE)(double *,double *,double *,long *,double *,double *,double *,double *,double *,double *,long *,char*,long );
   typedef void (CALLCONV ABFL2dll_TYPE)(double *,double *,double *,long *,long *,double *,double *,double *,double *,double *,double *,double *,double *,double *,double *,double *,double *,double *,double *,double *,double *,long *,char*,long );
   typedef void (CALLCONV ACTVYdll_TYPE)(double *,double *,double *,double *);
@@ -715,109 +604,6 @@ extern "C" {
   typedef void (CALLCONV WMOLdll_TYPE)(double *,double *);
   typedef void (CALLCONV XMASSdll_TYPE)(double *,double *,double *);
   typedef void (CALLCONV XMOLEdll_TYPE)(double *,double *,double *);
-  //
-  // Diabled because we prefer pointers here!
-//  // Declare the functions for direct access,
-//  RPVersion_TYPE RPVersion;
-//  SETPATHdll_TYPE SETPATHdll;
-//  ABFL1dll_TYPE ABFL1dll;
-//  ABFL2dll_TYPE ABFL2dll;
-//  ACTVYdll_TYPE ACTVYdll;
-//  AGdll_TYPE AGdll;
-//  CCRITdll_TYPE CCRITdll;
-//  CP0dll_TYPE CP0dll;
-//  CRITPdll_TYPE CRITPdll;
-//  CSATKdll_TYPE CSATKdll;
-//  CV2PKdll_TYPE CV2PKdll;
-//  CVCPKdll_TYPE CVCPKdll;
-//  CVCPdll_TYPE CVCPdll;
-//  DBDTdll_TYPE DBDTdll;
-//  DBFL1dll_TYPE DBFL1dll;
-//  DBFL2dll_TYPE DBFL2dll;
-//  DDDPdll_TYPE DDDPdll;
-//  DDDTdll_TYPE DDDTdll;
-//  DEFLSHdll_TYPE DEFLSHdll;
-//  DHD1dll_TYPE DHD1dll;
-//  DHFLSHdll_TYPE DHFLSHdll;
-//  DHFL1dll_TYPE DHFL1dll;
-//  DHFL2dll_TYPE DHFL2dll;
-//  DIELECdll_TYPE DIELECdll;
-//  DOTFILLdll_TYPE DOTFILLdll;
-//  DPDD2dll_TYPE DPDD2dll;
-//  DPDDKdll_TYPE DPDDKdll;
-//  DPDDdll_TYPE DPDDdll;
-//  DPDTKdll_TYPE DPDTKdll;
-//  DPDTdll_TYPE DPDTdll;
-//  DPTSATKdll_TYPE DPTSATKdll;
-//  DSFLSHdll_TYPE DSFLSHdll;
-//  DSFL1dll_TYPE DSFL1dll;
-//  DSFL2dll_TYPE DSFL2dll;
-//  ENTHALdll_TYPE ENTHALdll;
-//  ENTROdll_TYPE ENTROdll;
-//  ESFLSHdll_TYPE ESFLSHdll;
-//  FGCTYdll_TYPE FGCTYdll;
-//  FPVdll_TYPE FPVdll;
-//  GERG04dll_TYPE GERG04dll;
-//  GETFIJdll_TYPE GETFIJdll;
-//  GETKTVdll_TYPE GETKTVdll;
-//  GIBBSdll_TYPE GIBBSdll;
-//  HSFLSHdll_TYPE HSFLSHdll;
-//  INFOdll_TYPE INFOdll;
-//  LIMITKdll_TYPE LIMITKdll;
-//  LIMITSdll_TYPE LIMITSdll;
-//  LIMITXdll_TYPE LIMITXdll;
-//  MELTPdll_TYPE MELTPdll;
-//  MELTTdll_TYPE MELTTdll;
-//  MLTH2Odll_TYPE MLTH2Odll;
-//  NAMEdll_TYPE NAMEdll;
-//  PDFL1dll_TYPE PDFL1dll;
-//  PDFLSHdll_TYPE PDFLSHdll;
-//  PEFLSHdll_TYPE PEFLSHdll;
-//  PHFL1dll_TYPE PHFL1dll;
-//  PHFLSHdll_TYPE PHFLSHdll;
-//  PQFLSHdll_TYPE PQFLSHdll;
-//  PREOSdll_TYPE PREOSdll;
-//  PRESSdll_TYPE PRESSdll;
-//  PSFL1dll_TYPE PSFL1dll;
-//  PSFLSHdll_TYPE PSFLSHdll;
-//  PUREFLDdll_TYPE PUREFLDdll;
-//  QMASSdll_TYPE QMASSdll;
-//  QMOLEdll_TYPE QMOLEdll;
-//  SATDdll_TYPE SATDdll;
-//  SATEdll_TYPE SATEdll;
-//  SATHdll_TYPE SATHdll;
-//  SATPdll_TYPE SATPdll;
-//  SATSdll_TYPE SATSdll;
-//  SATTdll_TYPE SATTdll;
-//  SETAGAdll_TYPE SETAGAdll;
-//  SETKTVdll_TYPE SETKTVdll;
-//  SETMIXdll_TYPE SETMIXdll;
-//  SETMODdll_TYPE SETMODdll;
-//  SETREFdll_TYPE SETREFdll;
-//  SETUPdll_TYPE SETUPdll;
-////  SPECGRdll_TYPE SPECGRdll; // not found in library
-//  SUBLPdll_TYPE SUBLPdll;
-//  SUBLTdll_TYPE SUBLTdll;
-//  SURFTdll_TYPE SURFTdll;
-//  SURTENdll_TYPE SURTENdll;
-//  TDFLSHdll_TYPE TDFLSHdll;
-//  TEFLSHdll_TYPE TEFLSHdll;
-//  THERM0dll_TYPE THERM0dll;
-//  THERM2dll_TYPE THERM2dll;
-//  THERM3dll_TYPE THERM3dll;
-//  THERMdll_TYPE THERMdll;
-//  THFLSHdll_TYPE THFLSHdll;
-//  TPFLSHdll_TYPE TPFLSHdll;
-//  TPFL2dll_TYPE TPFL2dll;
-//  TPRHOdll_TYPE TPRHOdll;
-//  TQFLSHdll_TYPE TQFLSHdll;
-//  TRNPRPdll_TYPE TRNPRPdll;
-//  TSFLSHdll_TYPE TSFLSHdll;
-//  VIRBdll_TYPE VIRBdll;
-//  VIRCdll_TYPE VIRCdll;
-//  WMOLdll_TYPE WMOLdll;
-//  XMASSdll_TYPE XMASSdll;
-//  XMOLEdll_TYPE XMOLEdll;
   //
   // Define explicit function pointers
   typedef RPVersion_TYPE * RPVersion_POINTER;