Index: build.conf
===================================================================
--- build.conf	(revision 7418)
+++ build.conf	(working copy)
@@ -611,35 +611,37 @@
 [apr]
 type = lib
 external-lib = $(SVN_APR_LIBS)
-external-project = apr\apr
+external-project = apr\libapr
 msvc-libs = mswsock.lib ws2_32.lib advapi32.lib rpcrt4.lib
-msvc-static = yes
 msvc-fake = yes
+msvc-name = libapr
 
 [aprutil]
 type = lib
 external-lib = $(SVN_APRUTIL_LIBS)
-external-project = apr-util\aprutil
+external-project = apr-util\libaprutil
 libs = xml apr apriconv apriconv_ccs_modules apriconv_ces_modules gen_uri_delims
-msvc-static = yes
 msvc-fake = yes
+msvc-name = libaprutil
 
 [apriconv]
 type = lib
 external-lib = $(SVN_APRUTIL_LIBS)
-external-project = apr-iconv\apriconv
+external-project = apr-iconv\libapriconv
 libs = apr
-msvc-static = yes
+msvc-name = libapriconv
 
 [apriconv_ccs_modules]
 type = exe
-external-project = apr-iconv/ccs\apriconv_ccs_modules
+external-project = apr-iconv/ccs\libapriconv_ccs_modules
 libs = apriconv apr
+msvc-name = libapriconv_ccs_modules
 
 [apriconv_ces_modules]
 type = exe
-external-project = apr-iconv/ces\apriconv_ces_modules
+external-project = apr-iconv/ces\libapriconv_ces_modules
 libs = apriconv apr
+msvc-name = libapriconv_ces_modules
 
 [bdb]
 type = lib
Index: build/generator/gen_base.py
===================================================================
--- build/generator/gen_base.py	(revision 7416)
+++ build/generator/gen_base.py	(working copy)
@@ -294,6 +294,7 @@
     self.desc = options.get('description')
     self.path = options.get('path', '')
     self.add_deps = options.get('add-deps', '')
+    self.msvc_name = options.get('msvc-name') # override project name
 
     # true if several targets share the same directory, as is the case
     # with SWIG bindings.
Index: build/generator/gen_win.py
===================================================================
--- build/generator/gen_win.py	(revision 7417)
+++ build/generator/gen_win.py	(working copy)
@@ -239,6 +239,7 @@
                                              gen_base.TargetProject)
     section.create_targets(self.graph, dep.name + "_fake", self.cfg,
                            self._extension_map)
+    section.target.msvc_name = dep.msvc_name and dep.msvc_name + "_fake"
     self.graph.add(gen_base.DT_LINK, section.target.name, dep)
     dep.msvc_fake = section.target
     return section.target
@@ -311,6 +312,10 @@
     # underscores and replace *-test with test_* (so that the test
     # programs are visually separare from the rest of the projects)
     for target in install_targets:
+      if target.msvc_name:
+        target.proj_name = target.msvc_name
+        continue
+
       name = target.name
       pos = string.find(name, '-test')
       if pos >= 0:
@@ -393,9 +398,6 @@
     if isinstance(target, gen_base.TargetApacheMod):
       if target.name == 'mod_dav_svn':
         fakedefines.extend(["AP_DECLARE_EXPORT"])
-      pass
-    else:
-      fakedefines.extend(["APR_DECLARE_STATIC","APU_DECLARE_STATIC"])
 
     if isinstance(target, gen_base.TargetSWIG):
       fakedefines.append("SWIG_GLOBAL")