diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE
index b14d1efbd..1270ef468 100644
--- a/configure/CONFIG_BASE
+++ b/configure/CONFIG_BASE
@@ -26,7 +26,7 @@ EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com
 #---------------------------------------------------------------
 # Epics base Host libraries 
 
-EPICS_BASE_HOST_LIBS += cas gdd dbStaticHost
+EPICS_BASE_HOST_LIBS += cas gdd
 EPICS_BASE_HOST_LIBS += ca Com
 
 #---------------------------------------------------------------
diff --git a/configure/os/CONFIG.Common.cygwin-x86 b/configure/os/CONFIG.Common.cygwin-x86
index 4181ce2ba..e537a3869 100644
--- a/configure/os/CONFIG.Common.cygwin-x86
+++ b/configure/os/CONFIG.Common.cygwin-x86
@@ -14,7 +14,7 @@ OS_CLASS = cygwin32
 ARCH_CLASS = x86
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-LDLIBS_READLINE = -lreadline -lcurses
+LDLIBS_READLINE = -lreadline
 
 POSIX_CPPFLAGS = -D_POSIX_THREADS -D_POSIX_TIMERS
 #POSIX_CPPFLAGS += -D_POSIX_SOURCE
diff --git a/configure/os/CONFIG_SITE.Common.cygwin-x86 b/configure/os/CONFIG_SITE.Common.cygwin-x86
index bbf155b51..1f410b318 100644
--- a/configure/os/CONFIG_SITE.Common.cygwin-x86
+++ b/configure/os/CONFIG_SITE.Common.cygwin-x86
@@ -9,6 +9,3 @@
 # to add command-line editing and history support
 COMMANDLINE_LIBRARY = READLINE
 
-# On later versions of Cygwin you may need to uncomment this:
-#LDLIBS_READLINE = -lreadline
-
diff --git a/src/ioc/dbStatic/dbStaticLib.c b/src/ioc/dbStatic/dbStaticLib.c
index 5d7863052..ed983f9f0 100644
--- a/src/ioc/dbStatic/dbStaticLib.c
+++ b/src/ioc/dbStatic/dbStaticLib.c
@@ -31,10 +31,10 @@
 #include "epicsStdlib.h"
 #include "epicsString.h"
 #include "epicsStdio.h"
-#include "dbChannel.h"
 
 #define epicsExportSharedSymbols
 #include "link.h"
+#include "dbChannel.h"
 #include "dbFldTypes.h"
 #include "devSup.h"
 #include "drvSup.h"