diff --git a/IPhreeqc.vcproj b/IPhreeqc.vcproj
index a2d9db2a..60fa739b 100644
--- a/IPhreeqc.vcproj
+++ b/IPhreeqc.vcproj
@@ -662,6 +662,26 @@
 				RelativePath=".\src\fwrap3.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\fwrap4.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\fwrap5.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\fwrap6.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\fwrap7.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\fwrap8.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\src\IPhreeqc.cpp"
 				>
diff --git a/src/fwrap4.cpp b/src/fwrap4.cpp
new file mode 100644
index 00000000..265cd89e
--- /dev/null
+++ b/src/fwrap4.cpp
@@ -0,0 +1,268 @@
+#include "IPhreeqc.h"
+#include "fwrap.h"
+
+#if defined(_WIN32)
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+//
+// Intel Fortran compiler 9.1 /iface:default /names:lowercase
+//
+IPQ_DLL_EXPORT int  accumulateline(int *id, char *line, unsigned int len)
+{
+	return AccumulateLineF(id, line, len);
+}
+IPQ_DLL_EXPORT int  adderror(int *id, char *error_msg, unsigned int len)
+{
+	return AddErrorF(id, error_msg, len);
+}
+IPQ_DLL_EXPORT int  addwarning(int *id, char *warn_msg, unsigned int len)
+{
+	return AddWarningF(id, warn_msg, len);
+}
+IPQ_DLL_EXPORT int  clearaccumulatedlines(int *id)
+{
+	return ClearAccumulatedLinesF(id);
+}
+IPQ_DLL_EXPORT int  createiphreeqc(void)
+{
+	return CreateIPhreeqcF();
+}
+IPQ_DLL_EXPORT int  destroyiphreeqc(int *id)
+{
+	return DestroyIPhreeqcF(id);
+}
+IPQ_DLL_EXPORT void getcomponent(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetComponentF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  getcomponentcount(int *id)
+{
+	return GetComponentCountF(id);
+}
+IPQ_DLL_EXPORT void getdumpfilename(int *id, char *filename, unsigned int len)
+{
+	GetDumpFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  getdumpfileon(int *id)
+{
+	return GetDumpFileOnF(id);
+}
+// GetDumpString
+IPQ_DLL_EXPORT void getdumpstringline(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetDumpStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  getdumpstringlinecount(int *id)
+{
+	return GetDumpStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  getdumpstringon(int *id)
+{
+	return GetDumpStringOnF(id);
+}
+IPQ_DLL_EXPORT void geterrorfilename(int *id, char *filename, unsigned int len)
+{
+	GetErrorFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  geterrorfileon(int *id)
+{
+	return GetErrorFileOnF(id);
+}
+// GetErrorString
+IPQ_DLL_EXPORT void geterrorstringline(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetErrorStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  geterrorstringlinecount(int *id)
+{
+	return GetErrorStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  geterrorstringon(int *id)
+{
+	return GetErrorStringOnF(id);
+}
+IPQ_DLL_EXPORT void getlogfilename(int *id, char *filename, unsigned int len)
+{
+	GetLogFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  getlogfileon(int *id)
+{
+	return GetLogFileOnF(id);
+}
+IPQ_DLL_EXPORT int  getlogstringon(int *id)
+{
+	return GetLogStringOnF(id);
+}
+// GetLogString
+IPQ_DLL_EXPORT void getlogstringline(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetLogStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  getlogstringlinecount(int *id)
+{
+	return GetLogStringLineCountF(id);
+}
+IPQ_DLL_EXPORT void getoutputfilename(int *id, char *filename, unsigned int len)
+{
+	GetOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  getoutputfileon(int *id)
+{
+	return GetOutputFileOnF(id);
+}
+// GetOutputString
+IPQ_DLL_EXPORT void getoutputstringline(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetOutputStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  getoutputstringlinecount(int *id)
+{
+	return GetOutputStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  getoutputstringon(int *id)
+{
+	return GetOutputStringOnF(id);
+}
+IPQ_DLL_EXPORT int  getselectedoutputcolumncount(int *id)
+{
+	return GetSelectedOutputColumnCountF(id);
+}
+IPQ_DLL_EXPORT void getselectedoutputfilename(int *id, char *filename, unsigned int len)
+{
+	GetSelectedOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  getselectedoutputfileon(int *id)
+{
+	return GetSelectedOutputFileOnF(id);
+}
+IPQ_DLL_EXPORT int  getselectedoutputrowcount(int *id)
+{
+	return GetSelectedOutputRowCountF(id);
+}
+// GetSelectedOutputString
+IPQ_DLL_EXPORT void getselectedoutputstringline(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetSelectedOutputStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  getselectedoutputstringlinecount(int *id)
+{
+	return GetSelectedOutputStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  getselectedoutputstringon(int *id)
+{
+	return GetSelectedOutputStringOnF(id);
+}
+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
+IPQ_DLL_EXPORT void getwarningstringline(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetWarningStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  getwarningstringlinecount(int *id)
+{
+	return GetWarningStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  loaddatabase(int *id, char *filename, unsigned int len)
+{
+	return LoadDatabaseF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  loaddatabasestring(int *id, char *input, unsigned int len)
+{
+	return LoadDatabaseStringF(id, input, len);
+}
+IPQ_DLL_EXPORT void outputaccumulatedlines(int *id)
+{
+	OutputAccumulatedLinesF(id);
+}
+IPQ_DLL_EXPORT void outputerrorstring(int *id)
+{
+	OutputErrorStringF(id);
+}
+IPQ_DLL_EXPORT void outputwarningstring(int *id)
+{
+	OutputWarningStringF(id);
+}
+IPQ_DLL_EXPORT int  runaccumulated(int *id)
+{
+	return RunAccumulatedF(id);
+}
+IPQ_DLL_EXPORT int  runfile(int *id, char *filename, unsigned int len)
+{
+	return RunFileF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  runstring(int *id, char *input, unsigned int len)
+{
+	return RunStringF(id, input, len);
+}
+IPQ_DLL_EXPORT int  setdumpfilename(int *id, char *filename, unsigned int len)
+{
+	return SetDumpFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  setdumpfileon(int *id, int *dump_on)
+{
+	return SetDumpFileOnF(id, dump_on);
+}
+IPQ_DLL_EXPORT int  setdumpstringon(int *id, int *dump_string_on)
+{
+	return SetDumpStringOnF(id, dump_string_on);
+}
+IPQ_DLL_EXPORT int  seterrorfilename(int *id, char *filename, unsigned int len)
+{
+	return SetErrorFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  seterrorfileon(int *id, int *error_on)
+{
+	return SetErrorFileOnF(id, error_on);
+}
+IPQ_DLL_EXPORT int  seterrorstringon(int *id, int *error_string_on)
+{
+	return SetErrorStringOnF(id, error_string_on);
+}
+IPQ_DLL_EXPORT int  setlogfilename(int *id, char *filename, unsigned int len)
+{
+	return SetLogFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  setlogfileon(int *id, int *log_on)
+{
+	return SetLogFileOnF(id, log_on);
+}
+IPQ_DLL_EXPORT int  setlogstringon(int *id, int *log_on)
+{
+	return SetLogStringOnF(id, log_on);
+}
+IPQ_DLL_EXPORT int  setoutputfilename(int *id, char *filename, unsigned int len)
+{
+	return SetOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  setoutputfileon(int *id, int *output_on)
+{
+	return SetOutputFileOnF(id, output_on);
+}
+IPQ_DLL_EXPORT int  setoutputstringon(int *id, int *output_on)
+{
+	return SetOutputStringOnF(id, output_on);
+}
+IPQ_DLL_EXPORT int  setselectedoutputfilename(int *id, char *filename, unsigned int len)
+{
+	return SetSelectedOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  setselectedoutputfileon(int *id, int *selout_file_on)
+{
+	return SetSelectedOutputFileOnF(id, selout_file_on);
+}
+IPQ_DLL_EXPORT int  setselectedoutputstringon(int *id, int *selout_string_on)
+{
+	return SetSelectedOutputStringOnF(id, selout_string_on);
+}
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif
diff --git a/src/fwrap5.cpp b/src/fwrap5.cpp
new file mode 100644
index 00000000..afdff374
--- /dev/null
+++ b/src/fwrap5.cpp
@@ -0,0 +1,268 @@
+#include "IPhreeqc.h"
+#include "fwrap.h"
+
+#if defined(_WIN32)
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+//
+// Intel Fortran compiler 9.1 /iface:default /names:default /assume:underscore
+//
+IPQ_DLL_EXPORT int  ACCUMULATELINE_(int *id, char *line, unsigned int len)
+{
+	return AccumulateLineF(id, line, len);
+}
+IPQ_DLL_EXPORT int  ADDERROR_(int *id, char *error_msg, unsigned int len)
+{
+	return AddErrorF(id, error_msg, len);
+}
+IPQ_DLL_EXPORT int  ADDWARNING_(int *id, char *warn_msg, unsigned int len)
+{
+	return AddWarningF(id, warn_msg, len);
+}
+IPQ_DLL_EXPORT int  CLEARACCUMULATEDLINES_(int *id)
+{
+	return ClearAccumulatedLinesF(id);
+}
+IPQ_DLL_EXPORT int  CREATEIPHREEQC_(void)
+{
+	return CreateIPhreeqcF();
+}
+IPQ_DLL_EXPORT int  DESTROYIPHREEQC_(int *id)
+{
+	return DestroyIPhreeqcF(id);
+}
+IPQ_DLL_EXPORT void GETCOMPONENT_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetComponentF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  GETCOMPONENTCOUNT_(int *id)
+{
+	return GetComponentCountF(id);
+}
+IPQ_DLL_EXPORT void GETDUMPFILENAME_(int *id, char *filename, unsigned int len)
+{
+	GetDumpFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  GETDUMPFILEON_(int *id)
+{
+	return GetDumpFileOnF(id);
+}
+// GetDumpString
+IPQ_DLL_EXPORT void GETDUMPSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetDumpStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  GETDUMPSTRINGLINECOUNT_(int *id)
+{
+	return GetDumpStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  GETDUMPSTRINGON_(int *id)
+{
+	return GetDumpStringOnF(id);
+}
+IPQ_DLL_EXPORT void GETERRORFILENAME_(int *id, char *filename, unsigned int len)
+{
+	GetErrorFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  GETERRORFILEON_(int *id)
+{
+	return GetErrorFileOnF(id);
+}
+// GetErrorString
+IPQ_DLL_EXPORT void GETERRORSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetErrorStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  GETERRORSTRINGLINECOUNT_(int *id)
+{
+	return GetErrorStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  GETERRORSTRINGON_(int *id)
+{
+	return GetErrorStringOnF(id);
+}
+IPQ_DLL_EXPORT void GETLOGFILENAM_E(int *id, char *filename, unsigned int len)
+{
+	GetLogFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  GETLOGFILEON_(int *id)
+{
+	return GetLogFileOnF(id);
+}
+IPQ_DLL_EXPORT int  GETLOGSTRINGON_(int *id)
+{
+	return GetLogStringOnF(id);
+}
+// GetLogString
+IPQ_DLL_EXPORT void GETLOGSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetLogStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  GETLOGSTRINGLINECOUNT_(int *id)
+{
+	return GetLogStringLineCountF(id);
+}
+IPQ_DLL_EXPORT void GETOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
+{
+	GetOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  GETOUTPUTFILEON_(int *id)
+{
+	return GetOutputFileOnF(id);
+}
+// GetOutputString
+IPQ_DLL_EXPORT void GETOUTPUTSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetOutputStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  GETOUTPUTSTRINGLINECOUNT_(int *id)
+{
+	return GetOutputStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  GETOUTPUTSTRINGON_(int *id)
+{
+	return GetOutputStringOnF(id);
+}
+IPQ_DLL_EXPORT int  GETSELECTEDOUTPUTCOLUMNCOUNT_(int *id)
+{
+	return GetSelectedOutputColumnCountF(id);
+}
+IPQ_DLL_EXPORT void GETSELECTEDOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
+{
+	GetSelectedOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  GETSELECTEDOUTPUTFILEO_N(int *id)
+{
+	return GetSelectedOutputFileOnF(id);
+}
+IPQ_DLL_EXPORT int  GETSELECTEDOUTPUTROWCOUNT_(int *id)
+{
+	return GetSelectedOutputRowCountF(id);
+}
+// GetSelectedOutputString
+IPQ_DLL_EXPORT void GETSELECTEDOUTPUTSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetSelectedOutputStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  GETSELECTEDOUTPUTSTRINGLINECOUNT_(int *id)
+{
+	return GetSelectedOutputStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  GETSELECTEDOUTPUTSTRINGON_(int *id)
+{
+	return GetSelectedOutputStringOnF(id);
+}
+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
+IPQ_DLL_EXPORT void GETWARNINGSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetWarningStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  GETWARNINGSTRINGLINECOUNT_(int *id)
+{
+	return GetWarningStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  LOADDATABASE_(int *id, char *filename, unsigned int len)
+{
+	return LoadDatabaseF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  LOADDATABASESTRING_(int *id, char *input, unsigned int len)
+{
+	return LoadDatabaseStringF(id, input, len);
+}
+IPQ_DLL_EXPORT void OUTPUTACCUMULATEDLINES_(int *id)
+{
+	OutputAccumulatedLinesF(id);
+}
+IPQ_DLL_EXPORT void OUTPUTERRORSTRING_(int *id)
+{
+	OutputErrorStringF(id);
+}
+IPQ_DLL_EXPORT void OUTPUTWARNINGSTRING_(int *id)
+{
+	OutputWarningStringF(id);
+}
+IPQ_DLL_EXPORT int  RUNACCUMULATED_(int *id)
+{
+	return RunAccumulatedF(id);
+}
+IPQ_DLL_EXPORT int  RUNFILE_(int *id, char *filename, unsigned int len)
+{
+	return RunFileF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  RUNSTRING_(int *id, char *input, unsigned int len)
+{
+	return RunStringF(id, input, len);
+}
+IPQ_DLL_EXPORT int  SETDUMPFILENAME_(int *id, char *filename, unsigned int len)
+{
+	return SetDumpFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  SETDUMPFILEON_(int *id, int *dump_on)
+{
+	return SetDumpFileOnF(id, dump_on);
+}
+IPQ_DLL_EXPORT int  SETDUMPSTRINGON_(int *id, int *dump_string_on)
+{
+	return SetDumpStringOnF(id, dump_string_on);
+}
+IPQ_DLL_EXPORT int  SETERRORFILENAME_(int *id, char *filename, unsigned int len)
+{
+	return SetErrorFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  SETERRORFILEON_(int *id, int *error_on)
+{
+	return SetErrorFileOnF(id, error_on);
+}
+IPQ_DLL_EXPORT int  SETERRORSTRINGON_(int *id, int *error_string_on)
+{
+	return SetErrorStringOnF(id, error_string_on);
+}
+IPQ_DLL_EXPORT int  SETLOGFILENAME_(int *id, char *filename, unsigned int len)
+{
+	return SetLogFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  SETLOGFILEON_(int *id, int *log_on)
+{
+	return SetLogFileOnF(id, log_on);
+}
+IPQ_DLL_EXPORT int  SETLOGSTRINGON_(int *id, int *log_on)
+{
+	return SetLogStringOnF(id, log_on);
+}
+IPQ_DLL_EXPORT int  SETOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
+{
+	return SetOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  SETOUTPUTFILEON_(int *id, int *output_on)
+{
+	return SetOutputFileOnF(id, output_on);
+}
+IPQ_DLL_EXPORT int  SETOUTPUTSTRINGON_(int *id, int *output_on)
+{
+	return SetOutputStringOnF(id, output_on);
+}
+IPQ_DLL_EXPORT int  SETSELECTEDOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
+{
+	return SetSelectedOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  SETSELECTEDOUTPUTFILEON_(int *id, int *selout_file_on)
+{
+	return SetSelectedOutputFileOnF(id, selout_file_on);
+}
+IPQ_DLL_EXPORT int  SETSELECTEDOUTPUTSTRINGON_(int *id, int *selout_string_on)
+{
+	return SetSelectedOutputStringOnF(id, selout_string_on);
+}
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif
diff --git a/src/fwrap6.cpp b/src/fwrap6.cpp
new file mode 100644
index 00000000..4c4e99d5
--- /dev/null
+++ b/src/fwrap6.cpp
@@ -0,0 +1,269 @@
+#include "IPhreeqc.h"
+#include "fwrap.h"
+
+#if defined(_WIN32) && !defined(_M_AMD64)
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+//
+// Intel Fortran compiler 9.1 /iface:cvf
+// Intel Fortran compiler 9.1 /iface:stdref /names:uppercase /assume:underscore
+//
+IPQ_DLL_EXPORT int  __stdcall ACCUMULATELINE_(int *id, char *line, unsigned int len)
+{
+	return AccumulateLineF(id, line, len);
+}
+IPQ_DLL_EXPORT int  __stdcall ADDERROR_(int *id, char *error_msg, unsigned int len)
+{
+	return AddErrorF(id, error_msg, len);
+}
+IPQ_DLL_EXPORT int  __stdcall ADDWARNING_(int *id, char *warn_msg, unsigned int len)
+{
+	return AddWarningF(id, warn_msg, len);
+}
+IPQ_DLL_EXPORT int  __stdcall CLEARACCUMULATEDLINES_(int *id)
+{
+	return ClearAccumulatedLinesF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall CREATEIPHREEQC_(void)
+{
+	return CreateIPhreeqcF();
+}
+IPQ_DLL_EXPORT int  __stdcall DESTROYIPHREEQC_(int *id)
+{
+	return DestroyIPhreeqcF(id);
+}
+IPQ_DLL_EXPORT void __stdcall GETCOMPONENT_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetComponentF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall GETCOMPONENTCOUNT_(int *id)
+{
+	return GetComponentCountF(id);
+}
+IPQ_DLL_EXPORT void __stdcall GETDUMPFILENAME_(int *id, char *filename, unsigned int len)
+{
+	GetDumpFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall GETDUMPFILEON_(int *id)
+{
+	return GetDumpFileOnF(id);
+}
+// GetDumpString
+IPQ_DLL_EXPORT void __stdcall GETDUMPSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetDumpStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall GETDUMPSTRINGLINECOUNT_(int *id)
+{
+	return GetDumpStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall GETDUMPSTRINGON_(int *id)
+{
+	return GetDumpStringOnF(id);
+}
+IPQ_DLL_EXPORT void __stdcall GETERRORFILENAME_(int *id, char *filename, unsigned int len)
+{
+	GetErrorFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall GETERRORFILEON_(int *id)
+{
+	return GetErrorFileOnF(id);
+}
+// GetErrorString
+IPQ_DLL_EXPORT void __stdcall GETERRORSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetErrorStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall GETERRORSTRINGLINECOUNT_(int *id)
+{
+	return GetErrorStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall GETERRORSTRINGON_(int *id)
+{
+	return GetErrorStringOnF(id);
+}
+IPQ_DLL_EXPORT void __stdcall GETLOGFILENAME_(int *id, char *filename, unsigned int len)
+{
+	GetLogFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall GETLOGFILEON_(int *id)
+{
+	return GetLogFileOnF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall GETLOGSTRINGON_(int *id)
+{
+	return GetLogStringOnF(id);
+}
+// GetLogString
+IPQ_DLL_EXPORT void __stdcall GETLOGSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetLogStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall GETLOGSTRINGLINECOUNT_(int *id)
+{
+	return GetLogStringLineCountF(id);
+}
+IPQ_DLL_EXPORT void __stdcall GETOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
+{
+	GetOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall GETOUTPUTFILEON_(int *id)
+{
+	return GetOutputFileOnF(id);
+}
+// GetOutputString
+IPQ_DLL_EXPORT void __stdcall GETOUTPUTSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetOutputStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall GETOUTPUTSTRINGLINECOUNT_(int *id)
+{
+	return GetOutputStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall GETOUTPUTSTRINGON_(int *id)
+{
+	return GetOutputStringOnF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT_(int *id)
+{
+	return GetSelectedOutputColumnCountF(id);
+}
+IPQ_DLL_EXPORT void __stdcall GETSELECTEDOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
+{
+	GetSelectedOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTFILEON_(int *id)
+{
+	return GetSelectedOutputFileOnF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTROWCOUNT_(int *id)
+{
+	return GetSelectedOutputRowCountF(id);
+}
+// GetSelectedOutputString
+IPQ_DLL_EXPORT void __stdcall GETSELECTEDOUTPUTSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetSelectedOutputStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTSTRINGLINECOUNT_(int *id)
+{
+	return GetSelectedOutputStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall GETSELECTEDOUTPUTSTRINGON_(int *id)
+{
+	return GetSelectedOutputStringOnF(id);
+}
+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
+IPQ_DLL_EXPORT void __stdcall GETWARNINGSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetWarningStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall GETWARNINGSTRINGLINECOUNT_(int *id)
+{
+	return GetWarningStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall LOADDATABASE_(int *id, char *filename, unsigned int len)
+{
+	return LoadDatabaseF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall LOADDATABASESTRING_(int *id, char *input, unsigned int len)
+{
+	return LoadDatabaseStringF(id, input, len);
+}
+IPQ_DLL_EXPORT void __stdcall OUTPUTACCUMULATEDLINES_(int *id)
+{
+	OutputAccumulatedLinesF(id);
+}
+IPQ_DLL_EXPORT void __stdcall OUTPUTERRORSTRING_(int *id)
+{
+	OutputErrorStringF(id);
+}
+IPQ_DLL_EXPORT void __stdcall OUTPUTWARNINGSTRING_(int *id)
+{
+	OutputWarningStringF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall RUNACCUMULATED_(int *id)
+{
+	return RunAccumulatedF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall RUNFILE_(int *id, char *filename, unsigned int len)
+{
+	return RunFileF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall RUNSTRING_(int *id, char *input, unsigned int len)
+{
+	return RunStringF(id, input, len);
+}
+IPQ_DLL_EXPORT int  __stdcall SETDUMPFILENAME_(int *id, char *filename, unsigned int len)
+{
+	return SetDumpFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall SETDUMPFILEON_(int *id, int *dump_on)
+{
+	return SetDumpFileOnF(id, dump_on);
+}
+IPQ_DLL_EXPORT int  __stdcall SETDUMPSTRINGON_(int *id, int *dump_string_on)
+{
+	return SetDumpStringOnF(id, dump_string_on);
+}
+IPQ_DLL_EXPORT int  __stdcall SETERRORFILENAME_(int *id, char *filename, unsigned int len)
+{
+	return SetErrorFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall SETERRORFILEON_(int *id, int *error_on)
+{
+	return SetErrorFileOnF(id, error_on);
+}
+IPQ_DLL_EXPORT int  __stdcall SETERRORSTRINGON_(int *id, int *error_string_on)
+{
+	return SetErrorStringOnF(id, error_string_on);
+}
+IPQ_DLL_EXPORT int  __stdcall SETLOGFILENAME_(int *id, char *filename, unsigned int len)
+{
+	return SetLogFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall SETLOGFILEON_(int *id, int *log_on)
+{
+	return SetLogFileOnF(id, log_on);
+}
+IPQ_DLL_EXPORT int  __stdcall SETLOGSTRINGON_(int *id, int *log_on)
+{
+	return SetLogStringOnF(id, log_on);
+}
+IPQ_DLL_EXPORT int  __stdcall SETOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
+{
+	return SetOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall SETOUTPUTFILEON_(int *id, int *output_on)
+{
+	return SetOutputFileOnF(id, output_on);
+}
+IPQ_DLL_EXPORT int  __stdcall SETOUTPUTSTRINGON_(int *id, int *output_on)
+{
+	return SetOutputStringOnF(id, output_on);
+}
+IPQ_DLL_EXPORT int  __stdcall SETSELECTEDOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
+{
+	return SetSelectedOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall SETSELECTEDOUTPUTFILEON_(int *id, int *selout_file_on)
+{
+	return SetSelectedOutputFileOnF(id, selout_file_on);
+}
+IPQ_DLL_EXPORT int  __stdcall SETSELECTEDOUTPUTSTRINGON_(int *id, int *selout_string_on)
+{
+	return SetSelectedOutputStringOnF(id, selout_string_on);
+}
+#if defined(__cplusplus)
+}
+#endif
+
+#endif // _WIN32
+
diff --git a/src/fwrap7.cpp b/src/fwrap7.cpp
new file mode 100644
index 00000000..81af4724
--- /dev/null
+++ b/src/fwrap7.cpp
@@ -0,0 +1,268 @@
+#include "IPhreeqc.h"
+#include "fwrap.h"
+
+#if defined(_WIN32) && !defined(_M_AMD64)
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+//
+// Intel Fortran compiler 9.1 /iface:stdref /names:lowercase /assume:underscore
+//
+IPQ_DLL_EXPORT int  __stdcall accumulateline_(int *id, char *line, unsigned int len)
+{
+	return AccumulateLineF(id, line, len);
+}
+IPQ_DLL_EXPORT int  __stdcall adderror_(int *id, char *error_msg, unsigned int len)
+{
+	return AddErrorF(id, error_msg, len);
+}
+IPQ_DLL_EXPORT int  __stdcall addwarning_(int *id, char *warn_msg, unsigned int len)
+{
+	return AddWarningF(id, warn_msg, len);
+}
+IPQ_DLL_EXPORT int  __stdcall clearaccumulatedlines_(int *id)
+{
+	return ClearAccumulatedLinesF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall createiphreeqc_(void)
+{
+	return CreateIPhreeqcF();
+}
+IPQ_DLL_EXPORT int  __stdcall destroyiphreeqc_(int *id)
+{
+	return DestroyIPhreeqcF(id);
+}
+IPQ_DLL_EXPORT void __stdcall getcomponent_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetComponentF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall getcomponentcount_(int *id)
+{
+	return GetComponentCountF(id);
+}
+IPQ_DLL_EXPORT void __stdcall getdumpfilename_(int *id, char *filename, unsigned int len)
+{
+	GetDumpFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall getdumpfileon_(int *id)
+{
+	return GetDumpFileOnF(id);
+}
+// GetDumpString
+IPQ_DLL_EXPORT void __stdcall getdumpstringline_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetDumpStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall getdumpstringlinecount_(int *id)
+{
+	return GetDumpStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall getdumpstringon_(int *id)
+{
+	return GetDumpStringOnF(id);
+}
+IPQ_DLL_EXPORT void __stdcall geterrorfilename_(int *id, char *filename, unsigned int len)
+{
+	GetErrorFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall geterrorfileon_(int *id)
+{
+	return GetErrorFileOnF(id);
+}
+// GetErrorString
+IPQ_DLL_EXPORT void __stdcall geterrorstringline_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetErrorStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall geterrorstringlinecount_(int *id)
+{
+	return GetErrorStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall geterrorstringon_(int *id)
+{
+	return GetErrorStringOnF(id);
+}
+IPQ_DLL_EXPORT void __stdcall getlogfilename_(int *id, char *filename, unsigned int len)
+{
+	GetLogFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall getlogfileon_(int *id)
+{
+	return GetLogFileOnF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall getlogstringon_(int *id)
+{
+	return GetLogStringOnF(id);
+}
+// GetLogString
+IPQ_DLL_EXPORT void __stdcall getlogstringline_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetLogStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall getlogstringlinecount_(int *id)
+{
+	return GetLogStringLineCountF(id);
+}
+IPQ_DLL_EXPORT void __stdcall getoutputfilename_(int *id, char *filename, unsigned int len)
+{
+	GetOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall getoutputfileon_(int *id)
+{
+	return GetOutputFileOnF(id);
+}
+// GetOutputString
+IPQ_DLL_EXPORT void __stdcall getoutputstringline_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetOutputStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall getoutputstringlinecount_(int *id)
+{
+	return GetOutputStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall getoutputstringon_(int *id)
+{
+	return GetOutputStringOnF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall getselectedoutputcolumncount_(int *id)
+{
+	return GetSelectedOutputColumnCountF(id);
+}
+IPQ_DLL_EXPORT void __stdcall getselectedoutputfilename_(int *id, char *filename, unsigned int len)
+{
+	GetSelectedOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall getselectedoutputfileon_(int *id)
+{
+	return GetSelectedOutputFileOnF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall getselectedoutputrowcount_(int *id)
+{
+	return GetSelectedOutputRowCountF(id);
+}
+// GetSelectedOutputString
+IPQ_DLL_EXPORT void __stdcall getselectedoutputstringline_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetSelectedOutputStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall getselectedoutputstringlinecount_(int *id)
+{
+	return GetSelectedOutputStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall getselectedoutputstringon_(int *id)
+{
+	return GetSelectedOutputStringOnF(id);
+}
+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
+IPQ_DLL_EXPORT void __stdcall getwarningstringline_(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetWarningStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall getwarningstringlinecount_(int *id)
+{
+	return GetWarningStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall loaddatabase_(int *id, char *filename, unsigned int len)
+{
+	return LoadDatabaseF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall loaddatabasestring_(int *id, char *input, unsigned int len)
+{
+	return LoadDatabaseStringF(id, input, len);
+}
+IPQ_DLL_EXPORT void __stdcall outputaccumulatedlines_(int *id)
+{
+	OutputAccumulatedLinesF(id);
+}
+IPQ_DLL_EXPORT void __stdcall outputerrorstring_(int *id)
+{
+	OutputErrorStringF(id);
+}
+IPQ_DLL_EXPORT void __stdcall outputwarningstring_(int *id)
+{
+	OutputWarningStringF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall runaccumulated_(int *id)
+{
+	return RunAccumulatedF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall runfile_(int *id, char *filename, unsigned int len)
+{
+	return RunFileF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall runstring_(int *id, char *input, unsigned int len)
+{
+	return RunStringF(id, input, len);
+}
+IPQ_DLL_EXPORT int  __stdcall setdumpfilename_(int *id, char *filename, unsigned int len)
+{
+	return SetDumpFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall setdumpfileon_(int *id, int *dump_on)
+{
+	return SetDumpFileOnF(id, dump_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setdumpstringon_(int *id, int *dump_string_on)
+{
+	return SetDumpStringOnF(id, dump_string_on);
+}
+IPQ_DLL_EXPORT int  __stdcall seterrorfilename_(int *id, char *filename, unsigned int len)
+{
+	return SetErrorFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall seterrorfileon_(int *id, int *error_on)
+{
+	return SetErrorFileOnF(id, error_on);
+}
+IPQ_DLL_EXPORT int  __stdcall seterrorstringon_(int *id, int *error_string_on)
+{
+	return SetErrorStringOnF(id, error_string_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setlogfilename_(int *id, char *filename, unsigned int len)
+{
+	return SetLogFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall setlogfileon_(int *id, int *log_on)
+{
+	return SetLogFileOnF(id, log_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setlogstringon_(int *id, int *log_on)
+{
+	return SetLogStringOnF(id, log_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setoutputfilename_(int *id, char *filename, unsigned int len)
+{
+	return SetOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall setoutputfileon_(int *id, int *output_on)
+{
+	return SetOutputFileOnF(id, output_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setoutputstringon_(int *id, int *output_on)
+{
+	return SetOutputStringOnF(id, output_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setselectedoutputfilename_(int *id, char *filename, unsigned int len)
+{
+	return SetSelectedOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall setselectedoutputfileon_(int *id, int *selout_file_on)
+{
+	return SetSelectedOutputFileOnF(id, selout_file_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setselectedoutputstringon_(int *id, int *selout_string_on)
+{
+	return SetSelectedOutputStringOnF(id, selout_string_on);
+}
+#if defined(__cplusplus)
+}
+#endif
+
+#endif // _WIN32
+
diff --git a/src/fwrap8.cpp b/src/fwrap8.cpp
new file mode 100644
index 00000000..f08100e2
--- /dev/null
+++ b/src/fwrap8.cpp
@@ -0,0 +1,268 @@
+#include "IPhreeqc.h"
+#include "fwrap.h"
+
+#if defined(_WIN32) && !defined(_M_AMD64)
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+//
+// Intel Fortran compiler 9.1 /iface:stdref /names:lowercase
+//
+IPQ_DLL_EXPORT int  __stdcall accumulateline(int *id, char *line, unsigned int len)
+{
+	return AccumulateLineF(id, line, len);
+}
+IPQ_DLL_EXPORT int  __stdcall adderror(int *id, char *error_msg, unsigned int len)
+{
+	return AddErrorF(id, error_msg, len);
+}
+IPQ_DLL_EXPORT int  __stdcall addwarning(int *id, char *warn_msg, unsigned int len)
+{
+	return AddWarningF(id, warn_msg, len);
+}
+IPQ_DLL_EXPORT int  __stdcall clearaccumulatedlines(int *id)
+{
+	return ClearAccumulatedLinesF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall createiphreeqc(void)
+{
+	return CreateIPhreeqcF();
+}
+IPQ_DLL_EXPORT int  __stdcall destroyiphreeqc(int *id)
+{
+	return DestroyIPhreeqcF(id);
+}
+IPQ_DLL_EXPORT void __stdcall getcomponent(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetComponentF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall getcomponentcount(int *id)
+{
+	return GetComponentCountF(id);
+}
+IPQ_DLL_EXPORT void __stdcall getdumpfilename(int *id, char *filename, unsigned int len)
+{
+	GetDumpFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall getdumpfileon(int *id)
+{
+	return GetDumpFileOnF(id);
+}
+// GetDumpString
+IPQ_DLL_EXPORT void __stdcall getdumpstringline(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetDumpStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall getdumpstringlinecount(int *id)
+{
+	return GetDumpStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall getdumpstringon(int *id)
+{
+	return GetDumpStringOnF(id);
+}
+IPQ_DLL_EXPORT void __stdcall geterrorfilename(int *id, char *filename, unsigned int len)
+{
+	GetErrorFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall geterrorfileon(int *id)
+{
+	return GetErrorFileOnF(id);
+}
+// GetErrorString
+IPQ_DLL_EXPORT void __stdcall geterrorstringline(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetErrorStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall geterrorstringlinecount(int *id)
+{
+	return GetErrorStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall geterrorstringon(int *id)
+{
+	return GetErrorStringOnF(id);
+}
+IPQ_DLL_EXPORT void __stdcall getlogfilename(int *id, char *filename, unsigned int len)
+{
+	GetLogFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall getlogfileon(int *id)
+{
+	return GetLogFileOnF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall getlogstringon(int *id)
+{
+	return GetLogStringOnF(id);
+}
+// GetLogString
+IPQ_DLL_EXPORT void __stdcall getlogstringline(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetLogStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall getlogstringlinecount(int *id)
+{
+	return GetLogStringLineCountF(id);
+}
+IPQ_DLL_EXPORT void __stdcall getoutputfilename(int *id, char *filename, unsigned int len)
+{
+	GetOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall getoutputfileon(int *id)
+{
+	return GetOutputFileOnF(id);
+}
+// GetOutputString
+IPQ_DLL_EXPORT void __stdcall getoutputstringline(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetOutputStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall getoutputstringlinecount(int *id)
+{
+	return GetOutputStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall getoutputstringon(int *id)
+{
+	return GetOutputStringOnF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall getselectedoutputcolumncount(int *id)
+{
+	return GetSelectedOutputColumnCountF(id);
+}
+IPQ_DLL_EXPORT void __stdcall getselectedoutputfilename(int *id, char *filename, unsigned int len)
+{
+	GetSelectedOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall getselectedoutputfileon(int *id)
+{
+	return GetSelectedOutputFileOnF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall getselectedoutputrowcount(int *id)
+{
+	return GetSelectedOutputRowCountF(id);
+}
+// GetSelectedOutputString
+IPQ_DLL_EXPORT void __stdcall getselectedoutputstringline(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetSelectedOutputStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall getselectedoutputstringlinecount(int *id)
+{
+	return GetSelectedOutputStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall getselectedoutputstringon(int *id)
+{
+	return GetSelectedOutputStringOnF(id);
+}
+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
+IPQ_DLL_EXPORT void __stdcall getwarningstringline(int *id, int *n, char* line, unsigned int line_length)
+{
+	GetWarningStringLineF(id, n, line, line_length);
+}
+IPQ_DLL_EXPORT int  __stdcall getwarningstringlinecount(int *id)
+{
+	return GetWarningStringLineCountF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall loaddatabase(int *id, char *filename, unsigned int len)
+{
+	return LoadDatabaseF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall loaddatabasestring(int *id, char *input, unsigned int len)
+{
+	return LoadDatabaseStringF(id, input, len);
+}
+IPQ_DLL_EXPORT void __stdcall outputaccumulatedlines(int *id)
+{
+	OutputAccumulatedLinesF(id);
+}
+IPQ_DLL_EXPORT void __stdcall outputerrorstring(int *id)
+{
+	OutputErrorStringF(id);
+}
+IPQ_DLL_EXPORT void __stdcall outputwarningstring(int *id)
+{
+	OutputWarningStringF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall runaccumulated(int *id)
+{
+	return RunAccumulatedF(id);
+}
+IPQ_DLL_EXPORT int  __stdcall runfile(int *id, char *filename, unsigned int len)
+{
+	return RunFileF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall runstring(int *id, char *input, unsigned int len)
+{
+	return RunStringF(id, input, len);
+}
+IPQ_DLL_EXPORT int  __stdcall setdumpfilename(int *id, char *filename, unsigned int len)
+{
+	return SetDumpFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall setdumpfileon(int *id, int *dump_on)
+{
+	return SetDumpFileOnF(id, dump_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setdumpstringon(int *id, int *dump_string_on)
+{
+	return SetDumpStringOnF(id, dump_string_on);
+}
+IPQ_DLL_EXPORT int  __stdcall seterrorfilename(int *id, char *filename, unsigned int len)
+{
+	return SetErrorFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall seterrorfileon(int *id, int *error_on)
+{
+	return SetErrorFileOnF(id, error_on);
+}
+IPQ_DLL_EXPORT int  __stdcall seterrorstringon(int *id, int *error_string_on)
+{
+	return SetErrorStringOnF(id, error_string_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setlogfilename(int *id, char *filename, unsigned int len)
+{
+	return SetLogFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall setlogfileon(int *id, int *log_on)
+{
+	return SetLogFileOnF(id, log_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setlogstringon(int *id, int *log_on)
+{
+	return SetLogStringOnF(id, log_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setoutputfilename(int *id, char *filename, unsigned int len)
+{
+	return SetOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall setoutputfileon(int *id, int *output_on)
+{
+	return SetOutputFileOnF(id, output_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setoutputstringon(int *id, int *output_on)
+{
+	return SetOutputStringOnF(id, output_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setselectedoutputfilename(int *id, char *filename, unsigned int len)
+{
+	return SetSelectedOutputFileNameF(id, filename, len);
+}
+IPQ_DLL_EXPORT int  __stdcall setselectedoutputfileon(int *id, int *selout_file_on)
+{
+	return SetSelectedOutputFileOnF(id, selout_file_on);
+}
+IPQ_DLL_EXPORT int  __stdcall setselectedoutputstringon(int *id, int *selout_string_on)
+{
+	return SetSelectedOutputStringOnF(id, selout_string_on);
+}
+#if defined(__cplusplus)
+}
+#endif
+
+#endif // _WIN32
+