diff --git a/src/lib3270/actions.c b/src/lib3270/actions.c
index b7b3eb5..cd54687 100644
--- a/src/lib3270/actions.c
+++ b/src/lib3270/actions.c
@@ -54,7 +54,6 @@
 #endif /*]*/
 #if defined(X3270_DISPLAY) /*[*/
 #include "keypadc.h"
-// #include "menubarc.h"
 #endif /*]*/
 #if defined(X3270_DISPLAY) || defined(C3270) || defined(WC3270) /*[*/
 #include "screenc.h"
diff --git a/src/lib3270/glue.c b/src/lib3270/glue.c
index cc18b97..2928946 100644
--- a/src/lib3270/glue.c
+++ b/src/lib3270/glue.c
@@ -63,7 +63,6 @@
 // #include "keymapc.h"
 #include "kybdc.h"
 //#include "macrosc.h"
-// #include "menubarc.h"
 #include "popupsc.h"
 #include "screenc.h"
 // #include "selectc.h"
diff --git a/src/lib3270/hostc.h b/src/lib3270/hostc.h
index 47cd53f..9caf86e 100644
--- a/src/lib3270/hostc.h
+++ b/src/lib3270/hostc.h
@@ -17,25 +17,11 @@
  *		Global declarations for host.c.
  */
 
-#include "api.h"
-
-/*
-	struct host {
-		char *name;
-		char **parents;
-		char *hostname;
-		enum { PRIMARY, ALIAS, RECENT } entry_type;
-		char *loginstring;
-		time_t connect_time;
-		struct host *prev, *next;
-	};
-	extern struct host *hosts;
-*/
+	#include "api.h"
 
 	#define st_changed(tx,mode) lib3270_st_changed(NULL,tx,mode)
 
 	LIB3270_INTERNAL void lib3270_st_changed(H3270 *h, int tx, int mode);
-//	LIB3270_INTERNAL void hostfile_init(void);
 	LIB3270_INTERNAL void host_connected(H3270 *session);
 	LIB3270_INTERNAL void host_disconnected(H3270 *session);
 	LIB3270_INTERNAL void host_in3270(H3270 *session, LIB3270_CSTATE);
diff --git a/src/lib3270/lib3270.cbp b/src/lib3270/lib3270.cbp
index 3d9543f..27fac0b 100644
--- a/src/lib3270/lib3270.cbp
+++ b/src/lib3270/lib3270.cbp
@@ -7,8 +7,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin/Debug/lib3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Debug/" />
+				<Option output=".bin\Debug\lib3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj\Debug\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -19,8 +19,8 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output=".bin/Release/lib3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Release/" />
+				<Option output=".bin\Release\lib3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj\Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -33,8 +33,8 @@
 				</Linker>
 			</Target>
 			<Target title="testprogram">
-				<Option output=".bin/Debug/lib3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/testprogram/" />
+				<Option output=".bin\Debug\lib3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj\testprogram\" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option use_console_runner="0" />
@@ -51,10 +51,10 @@
 			<Add option="-Wmissing-declarations" />
 			<Add option="-Wall" />
 			<Add option="-DLIB3270=1" />
-			<Add directory="../include" />
-			<Add directory="../include/lib3270" />
+			<Add directory="..\include" />
+			<Add directory="..\include\lib3270" />
 		</Compiler>
-		<Unit filename="../include/lib3270/config.h.in" />
+		<Unit filename="..\include\lib3270\config.h.in" />
 		<Unit filename="Makefile.in" />
 		<Unit filename="X11keysym.h" />
 		<Unit filename="XtGlue.c">
@@ -125,7 +125,6 @@
 		<Unit filename="macros.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="menubarc.h" />
 		<Unit filename="mkversion.sh.in" />
 		<Unit filename="objects.h" />
 		<Unit filename="paste.c">
@@ -166,8 +165,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="seec.h" />
-		<Unit filename="selectc.h" />
-		<Unit filename="session.h" />
 		<Unit filename="sf.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/src/lib3270/menubarc.h b/src/lib3270/menubarc.h
deleted file mode 100644
index 482e913..0000000
--- a/src/lib3270/menubarc.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 1995, 1999, 2000, 2001, 2002, 2003, 2005 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * x3270, c3270, s3270 and tcl3270 are distributed in the hope that they will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file LICENSE
- * for more details.
- */
-
-/*
- *	menubarc.h
- *		Global declarations for menubar.c.
- */
-
-#warning menubarc.h is deprecated
-
-/*
-#if defined(X3270_MENUS)
-
-// LIB3270_INTERNAL void HandleMenu_action(Widget w, XEvent *event, String *params,Cardinal *num_params);
-// #if defined(X3270_SCRIPT)
-// LIB3270_INTERNAL void menubar_as_set(Boolean sensitive);
-// #else
-// #define menubar_as_set(n)
-// #endif
-
-// LIB3270_INTERNAL void menubar_init(Widget container, Dimension overall_width,Dimension current_width);
-// LIB3270_INTERNAL void menubar_keypad_changed(void);
-// LIB3270_INTERNAL Dimension menubar_qheight(Dimension container_width);
-// LIB3270_INTERNAL void menubar_resize(Dimension width);
-// LIB3270_INTERNAL void menubar_retoggle(struct toggle *t);
-
-#else
-
-// #define menubar_as_set(n)
-// #define menubar_init(a, b, c)
-// #define menubar_keypad_changed()
-// #define menubar_qheight(n)	0
-// #define menubar_resize(n)
-// #define menubar_retoggle(t)
-// #define HandleMenu_action ignore_action
-
-#endif
-*/
diff --git a/src/lib3270/printer.c b/src/lib3270/printer.c
index 9b0bc1d..428fede 100644
--- a/src/lib3270/printer.c
+++ b/src/lib3270/printer.c
@@ -59,7 +59,6 @@
 #include "charsetc.h"
 #include "ctlrc.h"
 #include "hostc.h"
-// #include "menubarc.h"
 #include "popupsc.h"
 #include "printerc.h"
 #include "printc.h"
diff --git a/src/lib3270/selectc.h b/src/lib3270/selectc.h
deleted file mode 100644
index 029d754..0000000
--- a/src/lib3270/selectc.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 1999, 2001 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * c3270, s3270 and tcl3270 are distributed in the hope that they will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file LICENSE
- * for more details.
- */
-
-/* Non-display version of selectc.h */
-
-// #define unselect(baddr, len)
-// #define area_is_selected(baddr, len)	False
-
-#error delete.me - Selection isnt used on library version
-
-
diff --git a/src/lib3270/toggles.c b/src/lib3270/toggles.c
index fbb66c5..45d0b27 100644
--- a/src/lib3270/toggles.c
+++ b/src/lib3270/toggles.c
@@ -44,7 +44,6 @@
 #include "ansic.h"
 #include "actionsc.h"
 #include "ctlrc.h"
-// #include "menubarc.h"
 #include "popupsc.h"
 #include "screenc.h"
 #include "trace_dsc.h"
diff --git a/src/lib3270/trace_ds.c b/src/lib3270/trace_ds.c
index bd72668..717d075 100644
--- a/src/lib3270/trace_ds.c
+++ b/src/lib3270/trace_ds.c
@@ -61,7 +61,6 @@
 #include "charsetc.h"
 #include "childc.h"
 #include "ctlrc.h"
-// #include "menubarc.h"
 #include "popupsc.h"
 #include "printc.h"
 #include "savec.h"
--
libgit2 0.21.2