diff --git a/fwrap.cpp b/fwrap.cpp
index f472d74c..15844d5c 100644
--- a/fwrap.cpp
+++ b/fwrap.cpp
@@ -375,151 +375,151 @@ extern "C" {
 //
 // Intel Fortran compiler 9.1 /iface:cvf
 //
-DLL_EXPORT int  __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len)
+IPQ_DLL_EXPORT int  __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len)
 {
 	return AccumulateLineF(id, line, len);
 }
 // AddError
-DLL_EXPORT int  __stdcall CLEARACCUMULATEDLINES(int *id)
+IPQ_DLL_EXPORT int  __stdcall CLEARACCUMULATEDLINES(int *id)
 {
 	return ClearAccumulatedLinesF(id);
 }
-DLL_EXPORT int  __stdcall CREATEIPHREEQC(void)
+IPQ_DLL_EXPORT int  __stdcall CREATEIPHREEQC(void)
 {
 	return CreateIPhreeqcF();
 }
-DLL_EXPORT int  __stdcall DESTROYIPHREEQC(int *id)
+IPQ_DLL_EXPORT int  __stdcall DESTROYIPHREEQC(int *id)
 {
 	return DestroyIPhreeqcF(id);
 }
-DLL_EXPORT void __stdcall GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length)
+IPQ_DLL_EXPORT void __stdcall GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length)
 {
 	GetComponentF(id, n, line, line_length);
 }
-DLL_EXPORT int  __stdcall GETCOMPONENTCOUNT(int *id)
+IPQ_DLL_EXPORT int  __stdcall GETCOMPONENTCOUNT(int *id)
 {
 	return GetComponentCountF(id);
 }
-DLL_EXPORT int  __stdcall GETDUMPFILEON(int *id)
+IPQ_DLL_EXPORT int  __stdcall GETDUMPFILEON(int *id)
 {
 	return GetDumpFileOnF(id);
 }
 // GetDumpString
-DLL_EXPORT void __stdcall GETDUMPSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
+IPQ_DLL_EXPORT void __stdcall GETDUMPSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
 {
 	GetDumpStringLineF(id, n, line, line_length);
 }
-DLL_EXPORT int  __stdcall GETDUMPSTRINGLINECOUNT(int *id)
+IPQ_DLL_EXPORT int  __stdcall GETDUMPSTRINGLINECOUNT(int *id)
 {
 	return GetDumpStringLineCountF(id);
 }
-DLL_EXPORT int  __stdcall GETDUMPSTRINGON(int *id)
+IPQ_DLL_EXPORT int  __stdcall GETDUMPSTRINGON(int *id)
 {
 	return GetDumpStringOnF(id);
 }
-DLL_EXPORT int  __stdcall GETERRORFILEON(int *id)
+IPQ_DLL_EXPORT int  __stdcall GETERRORFILEON(int *id)
 {
 	return GetErrorFileOnF(id);
 }
 // GetErrorString
-DLL_EXPORT void __stdcall GETERRORSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
+IPQ_DLL_EXPORT void __stdcall GETERRORSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
 {
 	GetErrorStringLineF(id, n, line, line_length);
 }
-DLL_EXPORT int  __stdcall GETERRORSTRINGLINECOUNT(int *id)
+IPQ_DLL_EXPORT int  __stdcall GETERRORSTRINGLINECOUNT(int *id)
 {
 	return GetErrorStringLineCountF(id);
 }
-DLL_EXPORT int  __stdcall GETLOGFILEON(int *id)
+IPQ_DLL_EXPORT int  __stdcall GETLOGFILEON(int *id)
 {
 	return GetLogFileOnF(id);
 }
-DLL_EXPORT int  __stdcall GETOUTPUTFILEON(int *id)
+IPQ_DLL_EXPORT int  __stdcall GETOUTPUTFILEON(int *id)
 {
 	return GetOutputFileOnF(id);
 }
-DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
+IPQ_DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
 {
 	return GetSelectedOutputColumnCountF(id);
 }
-DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTFILEON(int *id)
+IPQ_DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTFILEON(int *id)
 {
 	return GetSelectedOutputFileOnF(id);
 }
-DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTROWCOUNT(int *id)
+IPQ_DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTROWCOUNT(int *id)
 {
 	return GetSelectedOutputRowCountF(id);
 }
-DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
+IPQ_DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
 {
 	return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
 }
 // GetWarningString
-DLL_EXPORT void __stdcall GETWARNINGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
+IPQ_DLL_EXPORT void __stdcall GETWARNINGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
 {
 	GetWarningStringLineF(id, n, line, line_length);
 }
-DLL_EXPORT int  __stdcall GETWARNINGSTRINGLINECOUNT(int *id)
+IPQ_DLL_EXPORT int  __stdcall GETWARNINGSTRINGLINECOUNT(int *id)
 {
 	return GetWarningStringLineCountF(id);
 }
-DLL_EXPORT int  __stdcall LOADDATABASE(int *id, char *filename, unsigned int len)
+IPQ_DLL_EXPORT int  __stdcall LOADDATABASE(int *id, char *filename, unsigned int len)
 {
 	return LoadDatabaseF(id, filename, len);
 }
-DLL_EXPORT int  __stdcall LOADDATABASESTRING(int *id, char *input, unsigned int len)
+IPQ_DLL_EXPORT int  __stdcall LOADDATABASESTRING(int *id, char *input, unsigned int len)
 {
 	return LoadDatabaseStringF(id, input, len);
 }
-DLL_EXPORT void __stdcall OUTPUTACCUMULATEDLINES(int *id)
+IPQ_DLL_EXPORT void __stdcall OUTPUTACCUMULATEDLINES(int *id)
 {
 	OutputAccumulatedLinesF(id);
 }
-DLL_EXPORT void __stdcall OUTPUTERRORSTRING(int *id)
+IPQ_DLL_EXPORT void __stdcall OUTPUTERRORSTRING(int *id)
 {
 	OutputErrorStringF(id);
 }
-DLL_EXPORT void __stdcall OUTPUTWARNINGSTRING(int *id)
+IPQ_DLL_EXPORT void __stdcall OUTPUTWARNINGSTRING(int *id)
 {
 	OutputWarningStringF(id);
 }
-DLL_EXPORT int  __stdcall RUNACCUMULATED(int *id)
+IPQ_DLL_EXPORT int  __stdcall RUNACCUMULATED(int *id)
 {
 	return RunAccumulatedF(id);
 }
-DLL_EXPORT int  __stdcall RUNFILE(int *id, char *filename, unsigned int len)
+IPQ_DLL_EXPORT int  __stdcall RUNFILE(int *id, char *filename, unsigned int len)
 {
 	return RunFileF(id, filename, len);
 }
-DLL_EXPORT int  __stdcall RUNSTRING(int *id, char *input, unsigned int len)
+IPQ_DLL_EXPORT int  __stdcall RUNSTRING(int *id, char *input, unsigned int len)
 {
 	return RunStringF(id, input, len);
 }
-DLL_EXPORT void __stdcall SETDUMPFILEON(int *id, int *dump_on)
+IPQ_DLL_EXPORT void __stdcall SETDUMPFILEON(int *id, int *dump_on)
 {
 	SetDumpFileOnF(id, dump_on);
 }
-DLL_EXPORT void __stdcall SETDUMPSTRINGON(int *id, int *dump_string_on)
+IPQ_DLL_EXPORT void __stdcall SETDUMPSTRINGON(int *id, int *dump_string_on)
 {
 	SetDumpStringOnF(id, dump_string_on);
 }
-DLL_EXPORT void __stdcall SETERRORFILEON(int *id, int *error_on)
+IPQ_DLL_EXPORT void __stdcall SETERRORFILEON(int *id, int *error_on)
 {
 	SetErrorFileOnF(id, error_on);
 }
-DLL_EXPORT void __stdcall SETLOGFILEON(int *id, int *log_on)
+IPQ_DLL_EXPORT void __stdcall SETLOGFILEON(int *id, int *log_on)
 {
 	SetLogFileOnF(id, log_on);
 }
-DLL_EXPORT void __stdcall SETOUTPUTFILEON(int *id, int *output_on)
+IPQ_DLL_EXPORT void __stdcall SETOUTPUTFILEON(int *id, int *output_on)
 {
 	SetOutputFileOnF(id, output_on);
 }
-DLL_EXPORT void __stdcall SETSELECTEDOUTPUTFILEON(int *id, int *selected_on)
+IPQ_DLL_EXPORT void __stdcall SETSELECTEDOUTPUTFILEON(int *id, int *selected_on)
 {
 	SetSelOutFileOnF(id, selected_on);
 }
-DLL_EXPORT int  __stdcall UNLOADDATABASE(int *id)
+IPQ_DLL_EXPORT int  __stdcall UNLOADDATABASE(int *id)
 {
 	return UnLoadDatabaseF(id);
 }
diff --git a/fwrap.h b/fwrap.h
index 6ae4e771..2f2ad23f 100644
--- a/fwrap.h
+++ b/fwrap.h
@@ -2,9 +2,9 @@
 #define __FWRAP__H
 
 #if defined(_WINDLL)
-#define DLL_EXPORT __declspec(dllexport)
+#define IPQ_DLL_EXPORT __declspec(dllexport)
 #else
-#define DLL_EXPORT
+#define IPQ_DLL_EXPORT
 #endif
 
 #if defined(FC_FUNC)
diff --git a/fwrap2.cpp b/fwrap2.cpp
index 1a195978..f3f6fe00 100644
--- a/fwrap2.cpp
+++ b/fwrap2.cpp
@@ -11,149 +11,149 @@ extern "C" {
 //
 // Intel Fortran compiler 9.1 /iface:cvf
 //
-DLL_EXPORT int  ACCUMULATELINE(int *id, char *line, unsigned int len)
+IPQ_DLL_EXPORT int  ACCUMULATELINE(int *id, char *line, unsigned int len)
 {
 	return AccumulateLineF(id, line, len);
 }
 // AddError
-DLL_EXPORT int  CLEARACCUMULATEDLINES(int *id)
+IPQ_DLL_EXPORT int  CLEARACCUMULATEDLINES(int *id)
 {
 	return ClearAccumulatedLinesF(id);
 }
-DLL_EXPORT int  CREATEIPHREEQC(void)
+IPQ_DLL_EXPORT int  CREATEIPHREEQC(void)
 {
 	return CreateIPhreeqcF();
 }
-DLL_EXPORT int  DESTROYIPHREEQC(int *id)
+IPQ_DLL_EXPORT int  DESTROYIPHREEQC(int *id)
 {
 	return DestroyIPhreeqcF(id);
 }
-DLL_EXPORT void GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length)
+IPQ_DLL_EXPORT void GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length)
 {
 	GetComponentF(id, n, line, line_length);
 }
-DLL_EXPORT int  GETCOMPONENTCOUNT(int *id)
+IPQ_DLL_EXPORT int  GETCOMPONENTCOUNT(int *id)
 {
 	return GetComponentCountF(id);
 }
-DLL_EXPORT int  GETDUMPFILEON(int *id)
+IPQ_DLL_EXPORT int  GETDUMPFILEON(int *id)
 {
 	return GetDumpFileOnF(id);
 }
 // GetDumpString
-DLL_EXPORT void GETDUMPSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
+IPQ_DLL_EXPORT void GETDUMPSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
 {
 	GetDumpStringLineF(id, n, line, line_length);
 }
-DLL_EXPORT int  GETDUMPSTRINGLINECOUNT(int *id)
+IPQ_DLL_EXPORT int  GETDUMPSTRINGLINECOUNT(int *id)
 {
 	return GetDumpStringLineCountF(id);
 }
-DLL_EXPORT int  GETDUMPSTRINGON(int *id)
+IPQ_DLL_EXPORT int  GETDUMPSTRINGON(int *id)
 {
 	return GetDumpStringOnF(id);
 }
-DLL_EXPORT int  GETERRORFILEON(int *id)
+IPQ_DLL_EXPORT int  GETERRORFILEON(int *id)
 {
 	return GetErrorFileOnF(id);
 }
-DLL_EXPORT void GETERRORSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
+IPQ_DLL_EXPORT void GETERRORSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
 {
 	GetErrorStringLineF(id, n, line, line_length);
 }
-DLL_EXPORT int  GETERRORSTRINGLINECOUNT(int *id)
+IPQ_DLL_EXPORT int  GETERRORSTRINGLINECOUNT(int *id)
 {
 	return GetErrorStringLineCountF(id);
 }
-DLL_EXPORT int  GETLOGFILEON(int *id)
+IPQ_DLL_EXPORT int  GETLOGFILEON(int *id)
 {
 	return GetLogFileOnF(id);
 }
-DLL_EXPORT int  GETOUTPUTFILEON(int *id)
+IPQ_DLL_EXPORT int  GETOUTPUTFILEON(int *id)
 {
 	return GetOutputFileOnF(id);
 }
-DLL_EXPORT int  GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
+IPQ_DLL_EXPORT int  GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
 {
 	return GetSelectedOutputColumnCountF(id);
 }
-DLL_EXPORT int  GETSELECTEDOUTPUTFILEON(int *id)
+IPQ_DLL_EXPORT int  GETSELECTEDOUTPUTFILEON(int *id)
 {
 	return GetSelectedOutputFileOnF(id);
 }
-DLL_EXPORT int  GETSELECTEDOUTPUTROWCOUNT(int *id)
+IPQ_DLL_EXPORT int  GETSELECTEDOUTPUTROWCOUNT(int *id)
 {
 	return GetSelectedOutputRowCountF(id);
 }
-DLL_EXPORT int  GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
+IPQ_DLL_EXPORT int  GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
 {
 	return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
 }
-DLL_EXPORT void GETWARNINGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
+IPQ_DLL_EXPORT void GETWARNINGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
 {
 	GetWarningStringLineF(id, n, line, line_length);
 }
-DLL_EXPORT int  GETWARNINGSTRINGLINECOUNT(int *id)
+IPQ_DLL_EXPORT int  GETWARNINGSTRINGLINECOUNT(int *id)
 {
 	return GetWarningStringLineCountF(id);
 }
-DLL_EXPORT int  LOADDATABASE(int *id, char *filename, unsigned int len)
+IPQ_DLL_EXPORT int  LOADDATABASE(int *id, char *filename, unsigned int len)
 {
 	return LoadDatabaseF(id, filename, len);
 }
-DLL_EXPORT int  LOADDATABASESTRING(int *id, char *input, unsigned int len)
+IPQ_DLL_EXPORT int  LOADDATABASESTRING(int *id, char *input, unsigned int len)
 {
 	return LoadDatabaseStringF(id, input, len);
 }
-DLL_EXPORT void OUTPUTACCUMULATEDLINES(int *id)
+IPQ_DLL_EXPORT void OUTPUTACCUMULATEDLINES(int *id)
 {
 	OutputAccumulatedLinesF(id);
 }
-DLL_EXPORT void OUTPUTERRORSTRING(int *id)
+IPQ_DLL_EXPORT void OUTPUTERRORSTRING(int *id)
 {
 	OutputErrorStringF(id);
 }
-DLL_EXPORT void OUTPUTWARNINGSTRING(int *id)
+IPQ_DLL_EXPORT void OUTPUTWARNINGSTRING(int *id)
 {
 	OutputWarningStringF(id);
 }
-DLL_EXPORT int  RUNACCUMULATED(int *id)
+IPQ_DLL_EXPORT int  RUNACCUMULATED(int *id)
 {
 	return RunAccumulatedF(id);
 }
-DLL_EXPORT int  RUNFILE(int *id, char *filename, unsigned int len)
+IPQ_DLL_EXPORT int  RUNFILE(int *id, char *filename, unsigned int len)
 {
 	return RunFileF(id, filename, len);
 }
-DLL_EXPORT int  RUNSTRING(int *id, char *input, unsigned int len)
+IPQ_DLL_EXPORT int  RUNSTRING(int *id, char *input, unsigned int len)
 {
 	return RunStringF(id, input, len);
 }
-DLL_EXPORT void SETDUMPFILEON(int *id, int *dump_on)
+IPQ_DLL_EXPORT void SETDUMPFILEON(int *id, int *dump_on)
 {
 	SetDumpFileOnF(id, dump_on);
 }
-DLL_EXPORT void SETDUMPSTRINGON(int *id, int *dump_string_on)
+IPQ_DLL_EXPORT void SETDUMPSTRINGON(int *id, int *dump_string_on)
 {
 	SetDumpStringOnF(id, dump_string_on);
 }
-DLL_EXPORT void SETERRORFILEON(int *id, int *error_on)
+IPQ_DLL_EXPORT void SETERRORFILEON(int *id, int *error_on)
 {
 	SetErrorFileOnF(id, error_on);
 }
-DLL_EXPORT void SETLOGFILEON(int *id, int *log_on)
+IPQ_DLL_EXPORT void SETLOGFILEON(int *id, int *log_on)
 {
 	SetLogFileOnF(id, log_on);
 }
-DLL_EXPORT void SETOUTPUTFILEON(int *id, int *output_on)
+IPQ_DLL_EXPORT void SETOUTPUTFILEON(int *id, int *output_on)
 {
 	SetOutputFileOnF(id, output_on);
 }
-DLL_EXPORT void SETSELECTEDOUTPUTFILEON(int *id, int *selected_on)
+IPQ_DLL_EXPORT void SETSELECTEDOUTPUTFILEON(int *id, int *selected_on)
 {
 	SetSelOutFileOnF(id, selected_on);
 }
-DLL_EXPORT int  UNLOADDATABASE(int *id)
+IPQ_DLL_EXPORT int  UNLOADDATABASE(int *id)
 {
 	return UnLoadDatabaseF(id);
 }
diff --git a/fwrap3.cpp b/fwrap3.cpp
index 7417aa1f..62b6ccfd 100644
--- a/fwrap3.cpp
+++ b/fwrap3.cpp
@@ -10,151 +10,151 @@ extern "C" {
 //
 // Intel Fortran compiler 9.1 /iface:cref /assume:underscore
 //
-DLL_EXPORT int  accumulateline_(int *id, char *line, unsigned int len)
+IPQ_DLL_EXPORT int  accumulateline_(int *id, char *line, unsigned int len)
 {
 	return AccumulateLineF(id, line, len);
 }
 // AddError
-DLL_EXPORT int  clearaccumulatedlines_(int *id)
+IPQ_DLL_EXPORT int  clearaccumulatedlines_(int *id)
 {
 	return ClearAccumulatedLinesF(id);
 }
-DLL_EXPORT int  createiphreeqc_(void)
+IPQ_DLL_EXPORT int  createiphreeqc_(void)
 {
 	return CreateIPhreeqcF();
 }
-DLL_EXPORT int  destroyiphreeqc_(int *id)
+IPQ_DLL_EXPORT int  destroyiphreeqc_(int *id)
 {
 	return DestroyIPhreeqcF(id);
 }
-DLL_EXPORT void getcomponent_(int *id, int *n, char* line, unsigned int line_length)
+IPQ_DLL_EXPORT void getcomponent_(int *id, int *n, char* line, unsigned int line_length)
 {
 	GetComponentF(id, n, line, line_length);
 }
-DLL_EXPORT int  getcomponentcount_(int *id)
+IPQ_DLL_EXPORT int  getcomponentcount_(int *id)
 {
 	return GetComponentCountF(id);
 }
-DLL_EXPORT int  getdumpfileon_(int *id)
+IPQ_DLL_EXPORT int  getdumpfileon_(int *id)
 {
 	return GetDumpFileOnF(id);
 }
 // GetDumpString
-DLL_EXPORT void getdumpstringline_(int *id, int *n, char* line, unsigned int line_length)
+IPQ_DLL_EXPORT void getdumpstringline_(int *id, int *n, char* line, unsigned int line_length)
 {
 	GetDumpStringLineF(id, n, line, line_length);
 }
-DLL_EXPORT int  getdumpstringlinecount_(int *id)
+IPQ_DLL_EXPORT int  getdumpstringlinecount_(int *id)
 {
 	return GetDumpStringLineCountF(id);
 }
-DLL_EXPORT int  getdumpstringon_(int *id)
+IPQ_DLL_EXPORT int  getdumpstringon_(int *id)
 {
 	return GetDumpStringOnF(id);
 }
-DLL_EXPORT int  geterrorfileon_(int *id)
+IPQ_DLL_EXPORT int  geterrorfileon_(int *id)
 {
 	return GetErrorFileOnF(id);
 }
 // GetErrorString
-DLL_EXPORT void geterrorstringline_(int *id, int *n, char* line, unsigned int line_length)
+IPQ_DLL_EXPORT void geterrorstringline_(int *id, int *n, char* line, unsigned int line_length)
 {
 	GetErrorStringLineF(id, n, line, line_length);
 }
-DLL_EXPORT int  geterrorstringlinecount_(int *id)
+IPQ_DLL_EXPORT int  geterrorstringlinecount_(int *id)
 {
 	return GetErrorStringLineCountF(id);
 }
-DLL_EXPORT int  getlogfileon_(int *id)
+IPQ_DLL_EXPORT int  getlogfileon_(int *id)
 {
 	return GetLogFileOnF(id);
 }
-DLL_EXPORT int  getoutputfileon_(int *id)
+IPQ_DLL_EXPORT int  getoutputfileon_(int *id)
 {
 	return GetOutputFileOnF(id);
 }
-DLL_EXPORT int  getselectedoutputcolumncount_(int *id)
+IPQ_DLL_EXPORT int  getselectedoutputcolumncount_(int *id)
 {
 	return GetSelectedOutputColumnCountF(id);
 }
-DLL_EXPORT int  getselectedoutputfileon_(int *id)
+IPQ_DLL_EXPORT int  getselectedoutputfileon_(int *id)
 {
 	return GetSelectedOutputFileOnF(id);
 }
-DLL_EXPORT int  getselectedoutputrowcount_(int *id)
+IPQ_DLL_EXPORT int  getselectedoutputrowcount_(int *id)
 {
 	return GetSelectedOutputRowCountF(id);
 }
-DLL_EXPORT int  getselectedoutputvalue_(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
+IPQ_DLL_EXPORT int  getselectedoutputvalue_(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
 {
 	return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
 }
 // GetWarningString
-DLL_EXPORT void getwarningstringline_(int *id, int *n, char* line, unsigned int line_length)
+IPQ_DLL_EXPORT void getwarningstringline_(int *id, int *n, char* line, unsigned int line_length)
 {
 	GetWarningStringLineF(id, n, line, line_length);
 }
-DLL_EXPORT int  getwarningstringlinecount_(int *id)
+IPQ_DLL_EXPORT int  getwarningstringlinecount_(int *id)
 {
 	return GetWarningStringLineCountF(id);
 }
-DLL_EXPORT int  loaddatabase_(int *id, char *filename, unsigned int len)
+IPQ_DLL_EXPORT int  loaddatabase_(int *id, char *filename, unsigned int len)
 {
 	return LoadDatabaseF(id, filename, len);
 }
-DLL_EXPORT int  loaddatabasestring_(int *id, char *input, unsigned int len)
+IPQ_DLL_EXPORT int  loaddatabasestring_(int *id, char *input, unsigned int len)
 {
 	return LoadDatabaseStringF(id, input, len);
 }
-DLL_EXPORT void outputaccumulatedlines_(int *id)
+IPQ_DLL_EXPORT void outputaccumulatedlines_(int *id)
 {
 	OutputAccumulatedLinesF(id);
 }
-DLL_EXPORT void outputerrorstring_(int *id)
+IPQ_DLL_EXPORT void outputerrorstring_(int *id)
 {
 	OutputErrorStringF(id);
 }
-DLL_EXPORT void outputwarningstring_(int *id)
+IPQ_DLL_EXPORT void outputwarningstring_(int *id)
 {
 	OutputWarningStringF(id);
 }
-DLL_EXPORT int  runaccumulated_(int *id)
+IPQ_DLL_EXPORT int  runaccumulated_(int *id)
 {
 	return RunAccumulatedF(id);
 }
-DLL_EXPORT int  runfile_(int *id, char *filename, unsigned int len)
+IPQ_DLL_EXPORT int  runfile_(int *id, char *filename, unsigned int len)
 {
 	return RunFileF(id, filename, len);
 }
-DLL_EXPORT int  runstring_(int *id, char *input, unsigned int len)
+IPQ_DLL_EXPORT int  runstring_(int *id, char *input, unsigned int len)
 {
 	return RunStringF(id, input, len);
 }
-DLL_EXPORT void setdumpfileon_(int *id, int *dump_on)
+IPQ_DLL_EXPORT void setdumpfileon_(int *id, int *dump_on)
 {
 	SetDumpFileOnF(id, dump_on);
 }
-DLL_EXPORT void setdumpstringon_(int *id, int *dump_string_on)
+IPQ_DLL_EXPORT void setdumpstringon_(int *id, int *dump_string_on)
 {
 	SetDumpStringOnF(id, dump_string_on);
 }
-DLL_EXPORT void seterrorfileon_(int *id, int *error_on)
+IPQ_DLL_EXPORT void seterrorfileon_(int *id, int *error_on)
 {
 	SetErrorFileOnF(id, error_on);
 }
-DLL_EXPORT void setlogfileon_(int *id, int *log_on)
+IPQ_DLL_EXPORT void setlogfileon_(int *id, int *log_on)
 {
 	SetLogFileOnF(id, log_on);
 }
-DLL_EXPORT void setoutputfileon_(int *id, int *output_on)
+IPQ_DLL_EXPORT void setoutputfileon_(int *id, int *output_on)
 {
 	SetOutputFileOnF(id, output_on);
 }
-DLL_EXPORT void setselectedoutputfileon_(int *id, int *selected_on)
+IPQ_DLL_EXPORT void setselectedoutputfileon_(int *id, int *selected_on)
 {
 	SetSelOutFileOnF(id, selected_on);
 }
-DLL_EXPORT int  unloaddatabase_(int *id)
+IPQ_DLL_EXPORT int  unloaddatabase_(int *id)
 {
 	return UnLoadDatabaseF(id);
 }