diff --git a/apps/controllib/Makefile b/apps/controllib/Makefile
index 99cf910690..6749b805fa 100644
--- a/apps/controllib/Makefile
+++ b/apps/controllib/Makefile
@@ -43,11 +43,4 @@ CXXSRCS		 = block/Block.cpp \
 		   blocks.cpp \
 		   fixedwing.cpp
 
-CXXHDRS		 = block/Block.hpp \
-		   block/BlockParam.hpp \
-		   block/UOrbPublication.hpp \
-		   block/UOrbSubscription.hpp \
-		   blocks.hpp \
-		   fixedwing.hpp
-
 include $(APPDIR)/mk/app.mk
diff --git a/apps/mathlib/Makefile b/apps/mathlib/Makefile
index e3aa9275ec..7eebd6ae0b 100644
--- a/apps/mathlib/Makefile
+++ b/apps/mathlib/Makefile
@@ -42,14 +42,6 @@ CXXSRCS		 = math/test/test.cpp \
 		   math/Dcm.cpp \
 		   math/Matrix.cpp
 
-CXXHDRS		 = math/test/test.hpp \
-		   math/Vector.hpp \
-		   math/Vector3.hpp \
-		   math/EulerAngles.hpp \
-		   math/Quaternion.hpp \
-		   math/Dcm.hpp \
-		   math/Matrix.hpp
-
 #
 # In order to include .config we first have to save off the
 # current makefile name, since app.mk needs it.
@@ -61,14 +53,10 @@ ifeq ($(CONFIG_ARCH_CORTEXM4)$(CONFIG_ARCH_FPU),yy)
 INCLUDES	+= math/arm
 CXXSRCS		+= math/arm/Vector.cpp \
 		   math/arm/Matrix.cpp
-CXXHDRS		+= math/arm/Vector.hpp \
-		   math/arm/Matrix.hpp
 else
 INCLUDES	+= math/generic
 CXXSRCS		+= math/generic/Vector.cpp \
 		   math/generic/Matrix.cpp
-CXXHDRS		+= math/generic/Vector.hpp \
-		   math/generic/Matrix.hpp
 endif
 
 include $(APPDIR)/mk/app.mk
diff --git a/apps/mk/app.mk b/apps/mk/app.mk
index 7cbdc3e620..fa4a12cab6 100644
--- a/apps/mk/app.mk
+++ b/apps/mk/app.mk
@@ -167,9 +167,13 @@ else
 PRELINKOBJ	 = $(LIBNAME).pre.o
 endif
 
+# The archive the prelinked object will be linked into
 # XXX does WINTOOL ever get set?
 ifeq ($(WINTOOL),y)
   INCDIROPT	= -w
+  BIN		 = "$(shell cygpath -w  $(APPDIR)/libapps$(LIBEXT))"
+else
+  BIN		 = "$(APPDIR)/libapps$(LIBEXT)"
 endif
 
 ############################################################################