diff --git a/PHRQ_base.cxx b/PHRQ_base.cxx
index 009e6471..f2c164c2 100644
--- a/PHRQ_base.cxx
+++ b/PHRQ_base.cxx
@@ -1,4 +1,3 @@
-#include "Phreeqc.h"
 #include "PHRQ_base.h"
 #include <iostream>
 #include "PHRQ_io.h"
diff --git a/PHRQ_exports.h b/PHRQ_exports.h
index 8f50a7cc..3e74673e 100644
--- a/PHRQ_exports.h
+++ b/PHRQ_exports.h
@@ -1,6 +1,15 @@
 #ifndef INC_PHRQ_EXPORTS_H
 #define INC_PHRQ_EXPORTS_H
 
+#if defined(WIN32)
+#  if defined(PHREEQCI_GUI)
+#    ifndef WINVER
+#      define WINVER 0x0400
+#    endif
+#    include <afx.h>
+#  endif
+#  include <windows.h>
+#endif
 
 #if defined(_WINDLL) && defined(IPhreeqc_EXPORTS)
 #  define IPQ_DLL_EXPORT __declspec(dllexport)
diff --git a/PHRQ_io.cpp b/PHRQ_io.cpp
index 86e95fc6..15449606 100644
--- a/PHRQ_io.cpp
+++ b/PHRQ_io.cpp
@@ -1,5 +1,4 @@
 #include <assert.h>
-#include "Phreeqc.h"
 #include "PHRQ_io.h"
 #include "Parser.h"
 
@@ -14,7 +13,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-
 #if defined(PHREEQCI_GUI)
 #ifdef _DEBUG
 #define new DEBUG_NEW
diff --git a/Parser.cxx b/Parser.cxx
index 29faf3fa..0469142b 100644
--- a/Parser.cxx
+++ b/Parser.cxx
@@ -15,7 +15,6 @@
 #include "Parser.h"
 #include "PHRQ_io.h"
 
-
 #if defined(PHREEQCI_GUI)
 #ifdef _DEBUG
 #define new DEBUG_NEW
diff --git a/Parser.h b/Parser.h
index 1f329b4d..ac6620bc 100644
--- a/Parser.h
+++ b/Parser.h
@@ -1,7 +1,13 @@
 #if !defined(PARSER_H_INCLUDED)
 #define PARSER_H_INCLUDED
 #if defined(WIN32)
-#include <windows.h>
+#  if defined(PHREEQCI_GUI)
+#    ifndef WINVER
+#      define WINVER 0x0400
+#    endif
+#    include <afx.h>
+#  endif
+#  include <windows.h>
 #endif
 #include <string>				// std::string
 #include <map>					// std::map
diff --git a/Utils.cxx b/Utils.cxx
index 2a4276ce..ad96a147 100644
--- a/Utils.cxx
+++ b/Utils.cxx
@@ -12,7 +12,6 @@
 #include "float.h"
 #include "math.h"
 
-
 #if defined(PHREEQCI_GUI)
 #ifdef _DEBUG
 #define new DEBUG_NEW