Use .obj instead of .o

95 files changed, 1004 insertions, 1005 deletions

diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index 37ffac2c942..e4f2690140a 100644
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -29,7 +29,8 @@ BCB			= C:\Program Files\Borland\BDS\4.0
 # If third party libraries are not installed in the default location
 # change the following setting to reflect the installation location.
 #
-THIRDPARTY_HOME		= C:\Ice-$(VERSION)-ThirdParty
+#THIRDPARTY_HOME		= C:\Ice-$(VERSION)-ThirdParty
+THIRDPARTY_HOME		= C:\src\packages_win32
 
 # ----------------------------------------------------------------------
 # Don't change anything below this line!
@@ -55,6 +56,9 @@ INSTALL_PROGRAM		= $(INSTALL)
 INSTALL_LIBRARY		= $(INSTALL)
 INSTALL_DATA		= $(INSTALL)
 
+
+OBJEXT			= .obj
+
 #
 # Compiler specific definitions
 #
@@ -71,7 +75,7 @@ LIBSUFFIX	= $(LIBSUFFIX)d
 
 OPENSSL_LIBS            = ssleay32.lib libeay32.lib
 BZIP2_LIBS              = libbz2.lib
-DB_LIBS                 = libdb44.lib
+DB_LIBS                 = libdb43.lib
 EXPAT_LIBS              = libexpat.lib
 
 CPPFLAGS		= $(CPPFLAGS) -I$(includedir)
@@ -89,13 +93,13 @@ SLICE2DOCBOOK		= $(bindir)\slice2docbook.exe
 EVERYTHING		= all clean install
 
 .SUFFIXES:
-.SUFFIXES:		.cpp .c .o
+.SUFFIXES:		.cpp .c .obj
 
-.cpp.o:
-	$(CXX) /c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
+.cpp.obj:
+	$(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
 
-.c.o:
-	$(CC) /c $(CPPFLAGS) $(CFLAGS) -o $@ $<
+.c.obj:
+	$(CC) /c $(CPPFLAGS) $(CFLAGS) $<
 
 all:: $(SRCS) $(TARGETS)
 
@@ -107,6 +111,6 @@ clean::
 !endif
 
 clean::
-	-del /q core *.o *.bak
+	-del /q core *.obj *.bak
 
 install::
diff --git a/cpp/demo/Freeze/bench/Makefile.mak b/cpp/demo/Freeze/bench/Makefile.mak
index b0279dfd723..bf59b725066 100644
--- a/cpp/demo/Freeze/bench/Makefile.mak
+++ b/cpp/demo/Freeze/bench/Makefile.mak
@@ -13,9 +13,9 @@ CLIENT		= client.exe
 
 TARGETS		= $(CLIENT)
 
-OBJS		= Client.o BenchTypes.o Test.o
+OBJS		= Client.obj BenchTypes.obj Test.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Freeze/library/Makefile.mak b/cpp/demo/Freeze/library/Makefile.mak
index cb1ece3c710..adc1ce5b806 100644
--- a/cpp/demo/Freeze/library/Makefile.mak
+++ b/cpp/demo/Freeze/library/Makefile.mak
@@ -15,32 +15,32 @@ COLLOCATED	= collocated.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
 
-OBJS		= Library.o
-
-COBJS		= Grammar.o \
-		  Scanner.o \
-		  Parser.o \
-		  RunParser.o \
-		  Client.o \
-
-SOBJS		= LibraryI.o \
-		  LibraryTypes.o \
-		  BookFactory.o \
-		  Server.o
-
-COLOBJS		= Grammar.o \
-		  Scanner.o \
-		  Parser.o \
-		  RunParser.o \
-		  LibraryI.o \
-		  LibraryTypes.o \
-		  BookFactory.o \
-		  Collocated.o
-
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(COLOBJS:.o=.cpp)
+OBJS		= Library.obj
+
+COBJS		= Grammar.obj \
+		  Scanner.obj \
+		  Parser.obj \
+		  RunParser.obj \
+		  Client.obj \
+
+SOBJS		= LibraryI.obj \
+		  LibraryTypes.obj \
+		  BookFactory.obj \
+		  Server.obj
+
+COLOBJS		= Grammar.obj \
+		  Scanner.obj \
+		  Parser.obj \
+		  RunParser.obj \
+		  LibraryI.obj \
+		  LibraryTypes.obj \
+		  BookFactory.obj \
+		  Collocated.obj
+
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(COLOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Freeze/phonebook/Makefile.mak b/cpp/demo/Freeze/phonebook/Makefile.mak
index 7d2bedae83c..cddc7dfef31 100644
--- a/cpp/demo/Freeze/phonebook/Makefile.mak
+++ b/cpp/demo/Freeze/phonebook/Makefile.mak
@@ -15,32 +15,32 @@ COLLOCATED	= collocated.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
 
-OBJS		= PhoneBook.o
-
-COBJS		= Grammar.o \
-		  Scanner.o \
-		  Parser.o \
-		  RunParser.o \
-		  Client.o \
-
-SOBJS		= PhoneBookI.o \
-		  ContactFactory.o \
-		  NameIndex.o \
-		  Server.o
-
-COLOBJS		= Grammar.o \
-		  Scanner.o \
-		  Parser.o \
-		  RunParser.o \
-		  PhoneBookI.o \
-		  ContactFactory.o \
-		  NameIndex.o \
-		  Collocated.o
-
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(COLOBJS:.o=.cpp)
+OBJS		= PhoneBook.obj
+
+COBJS		= Grammar.obj \
+		  Scanner.obj \
+		  Parser.obj \
+		  RunParser.obj \
+		  Client.obj \
+
+SOBJS		= PhoneBookI.obj \
+		  ContactFactory.obj \
+		  NameIndex.obj \
+		  Server.obj
+
+COLOBJS		= Grammar.obj \
+		  Scanner.obj \
+		  Parser.obj \
+		  RunParser.obj \
+		  PhoneBookI.obj \
+		  ContactFactory.obj \
+		  NameIndex.obj \
+		  Collocated.obj
+
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(COLOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Glacier2/callback/Makefile.mak b/cpp/demo/Glacier2/callback/Makefile.mak
index 46c10a4609a..211bccc89bc 100644
--- a/cpp/demo/Glacier2/callback/Makefile.mak
+++ b/cpp/demo/Glacier2/callback/Makefile.mak
@@ -15,20 +15,20 @@ SESSION_SERVER	= sessionserver.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(SESSION_SERVER)
 
-OBJS		= Callback.o \
-		  CallbackI.o
+OBJS		= Callback.obj \
+		  CallbackI.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= Server.o
+SOBJS		= Server.obj
 
-SSOBJS		= SessionServer.o \
-		  SessionI.o
+SSOBJS		= SessionServer.obj \
+		  SessionI.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(SSOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(SSOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Glacier2/chat/Makefile.mak b/cpp/demo/Glacier2/chat/Makefile.mak
index 8bcb4c59c4b..3fc1ac4bdf0 100644
--- a/cpp/demo/Glacier2/chat/Makefile.mak
+++ b/cpp/demo/Glacier2/chat/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Chat.o
+OBJS		= Chat.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= Server.o \
-		  ChatSessionI.o
+SOBJS		= Server.obj \
+		  ChatSessionI.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Ice/bidir/Makefile.mak b/cpp/demo/Ice/bidir/Makefile.mak
index 5eb32267beb..6eed262ea6b 100644
--- a/cpp/demo/Ice/bidir/Makefile.mak
+++ b/cpp/demo/Ice/bidir/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Callback.o
+OBJS		= Callback.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= CallbackI.o \
-		  Server.o
+SOBJS		= CallbackI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Ice/callback/Makefile.mak b/cpp/demo/Ice/callback/Makefile.mak
index 66cac1cdd65..e27be53e985 100644
--- a/cpp/demo/Ice/callback/Makefile.mak
+++ b/cpp/demo/Ice/callback/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Callback.o
+OBJS		= Callback.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= CallbackSenderI.o \
-		  Server.o
+SOBJS		= CallbackSenderI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Ice/converter/Makefile.mak b/cpp/demo/Ice/converter/Makefile.mak
index 95d09f533a9..8e227fe197f 100644
--- a/cpp/demo/Ice/converter/Makefile.mak
+++ b/cpp/demo/Ice/converter/Makefile.mak
@@ -14,17 +14,17 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Echo.o \
-		  StringConverterI.o
+OBJS		= Echo.obj \
+		  StringConverterI.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= EchoI.o \
-		  Server.o
+SOBJS		= EchoI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Ice/hello/Makefile.mak b/cpp/demo/Ice/hello/Makefile.mak
index 64c16a4a21f..ccc36c67ba9 100644
--- a/cpp/demo/Ice/hello/Makefile.mak
+++ b/cpp/demo/Ice/hello/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Hello.o
+OBJS		= Hello.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= HelloI.o \
-		  Server.o
+SOBJS		= HelloI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Ice/invoke/Makefile.mak b/cpp/demo/Ice/invoke/Makefile.mak
index cc056158efe..1097193a2df 100644
--- a/cpp/demo/Ice/invoke/Makefile.mak
+++ b/cpp/demo/Ice/invoke/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Printer.o
+OBJS		= Printer.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= PrinterI.o \
-		  Server.o
+SOBJS		= PrinterI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Ice/latency/Makefile.mak b/cpp/demo/Ice/latency/Makefile.mak
index 33041c6880f..c2251864753 100644
--- a/cpp/demo/Ice/latency/Makefile.mak
+++ b/cpp/demo/Ice/latency/Makefile.mak
@@ -14,15 +14,15 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Latency.o
+OBJS		= Latency.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= Server.o
+SOBJS		= Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Ice/minimal/Makefile.mak b/cpp/demo/Ice/minimal/Makefile.mak
index 64c16a4a21f..ccc36c67ba9 100644
--- a/cpp/demo/Ice/minimal/Makefile.mak
+++ b/cpp/demo/Ice/minimal/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Hello.o
+OBJS		= Hello.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= HelloI.o \
-		  Server.o
+SOBJS		= HelloI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Ice/nested/Makefile.mak b/cpp/demo/Ice/nested/Makefile.mak
index 66d04251e9c..6585c7cbd14 100644
--- a/cpp/demo/Ice/nested/Makefile.mak
+++ b/cpp/demo/Ice/nested/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Nested.o \
-		  NestedI.o
+OBJS		= Nested.obj \
+		  NestedI.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= Server.o
+SOBJS		= Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Ice/session/Makefile.mak b/cpp/demo/Ice/session/Makefile.mak
index bc4b7da4db3..775b4b07ff1 100644
--- a/cpp/demo/Ice/session/Makefile.mak
+++ b/cpp/demo/Ice/session/Makefile.mak
@@ -14,18 +14,18 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Session.o
+OBJS		= Session.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= ReapThread.o \
-		  SessionFactoryI.o \
-		  SessionI.o \
-		  Server.o
+SOBJS		= ReapThread.obj \
+		  SessionFactoryI.obj \
+		  SessionI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Ice/throughput/Makefile.mak b/cpp/demo/Ice/throughput/Makefile.mak
index f03a0dc9e9c..f131176a020 100644
--- a/cpp/demo/Ice/throughput/Makefile.mak
+++ b/cpp/demo/Ice/throughput/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Throughput.o
+OBJS		= Throughput.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= ThroughputI.o \
-		  Server.o
+SOBJS		= ThroughputI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/Ice/value/Makefile.mak b/cpp/demo/Ice/value/Makefile.mak
index 8bcdb86001d..bacf5e1963b 100644
--- a/cpp/demo/Ice/value/Makefile.mak
+++ b/cpp/demo/Ice/value/Makefile.mak
@@ -14,17 +14,17 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Value.o \
-		  ValueI.o
+OBJS		= Value.obj \
+		  ValueI.obj
 
-COBJS		= Client.o \
-		  ObjectFactory.o
+COBJS		= Client.obj \
+		  ObjectFactory.obj
 
-SOBJS		= Server.o
+SOBJS		= Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/IceBox/hello/Makefile.mak b/cpp/demo/IceBox/hello/Makefile.mak
index e43a5439f6a..f14cf0b65c4 100644
--- a/cpp/demo/IceBox/hello/Makefile.mak
+++ b/cpp/demo/IceBox/hello/Makefile.mak
@@ -16,16 +16,16 @@ DLLNAME         = helloservice$(LIBSUFFIX).dll
 
 TARGETS		= $(CLIENT) $(LIBNAME) $(DLLNAME)
 
-OBJS		= Hello.o
+OBJS		= Hello.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= HelloI.o \
-		  HelloServiceI.o
+SOBJS		= HelloI.obj \
+		  HelloServiceI.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 SLICE_SRCS	= Hello.ice
 
diff --git a/cpp/demo/IceGrid/allocate/Makefile.mak b/cpp/demo/IceGrid/allocate/Makefile.mak
index 7f92c187197..46999192462 100644
--- a/cpp/demo/IceGrid/allocate/Makefile.mak
+++ b/cpp/demo/IceGrid/allocate/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Hello.o
+OBJS		= Hello.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= HelloI.o \
-		  Server.o
+SOBJS		= HelloI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/IceGrid/sessionActivation/Makefile.mak b/cpp/demo/IceGrid/sessionActivation/Makefile.mak
index 7f92c187197..46999192462 100644
--- a/cpp/demo/IceGrid/sessionActivation/Makefile.mak
+++ b/cpp/demo/IceGrid/sessionActivation/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Hello.o
+OBJS		= Hello.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= HelloI.o \
-		  Server.o
+SOBJS		= HelloI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/IceGrid/simple/Makefile.mak b/cpp/demo/IceGrid/simple/Makefile.mak
index 7f92c187197..46999192462 100644
--- a/cpp/demo/IceGrid/simple/Makefile.mak
+++ b/cpp/demo/IceGrid/simple/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Hello.o
+OBJS		= Hello.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= HelloI.o \
-		  Server.o
+SOBJS		= HelloI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/IceStorm/clock/Makefile.mak b/cpp/demo/IceStorm/clock/Makefile.mak
index 14b8109bc93..3a86b89258e 100644
--- a/cpp/demo/IceStorm/clock/Makefile.mak
+++ b/cpp/demo/IceStorm/clock/Makefile.mak
@@ -14,16 +14,16 @@ SUBSCRIBER	= subscriber.exe
 
 TARGETS		= $(PUBLISHER) $(SUBSCRIBER)
 
-OBJS		= Clock.o
+OBJS		= Clock.obj
 
-POBJS		= Publisher.o
+POBJS		= Publisher.obj
 
-SOBJS		= Subscriber.o \
-		  ClockI.o
+SOBJS		= Subscriber.obj \
+		  ClockI.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(POBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(POBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 
 !include $(top_srcdir)/config/Make.rules.mak
diff --git a/cpp/demo/IceUtil/workqueue/Makefile.mak b/cpp/demo/IceUtil/workqueue/Makefile.mak
index b0b68545215..eefb9e13fd7 100644
--- a/cpp/demo/IceUtil/workqueue/Makefile.mak
+++ b/cpp/demo/IceUtil/workqueue/Makefile.mak
@@ -13,9 +13,9 @@ CLIENT		= workqueue.exe
 
 TARGETS		= $(CLIENT)
 
-OBJS		= WorkQueue.o
+OBJS		= WorkQueue.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/book/printer/Makefile.mak b/cpp/demo/book/printer/Makefile.mak
index ba871076d16..2dce2be4f5f 100644
--- a/cpp/demo/book/printer/Makefile.mak
+++ b/cpp/demo/book/printer/Makefile.mak
@@ -14,15 +14,15 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Printer.o
+OBJS		= Printer.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= Server.o
+SOBJS		= Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/demo/book/simple_filesystem/Makefile.mak b/cpp/demo/book/simple_filesystem/Makefile.mak
index e349be88b0a..68a064d6a86 100644
--- a/cpp/demo/book/simple_filesystem/Makefile.mak
+++ b/cpp/demo/book/simple_filesystem/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Filesystem.o
+OBJS		= Filesystem.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= FilesystemI.o \
-		  Server.o
+SOBJS		= FilesystemI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak
index b9382910b3a..a9d33d9be5f 100644
--- a/cpp/src/Freeze/Makefile.mak
+++ b/cpp/src/Freeze/Makefile.mak
@@ -16,29 +16,29 @@ DLLNAME		= $(top_srcdir)\bin\freeze$(SOVERSION)$(LIBSUFFIX).dll
 TARGETS		= $(LIBNAME) $(DLLNAME)
 
 
-OBJS		= CatalogData.o \
-                  Catalog.o \
-                  ConnectionI.o \
-                  Connection.o \
-		  DB.o \
-		  EvictorI.o \
-                  EvictorIteratorI.o \
-		  Evictor.o \
-		  EvictorStorage.o \
-                  Exception.o \
-                  IndexI.o \
-                  Index.o \
-	  	  MapI.o \
-                  ObjectStore.o \
-		  PingObject.o \
-                  SharedDbEnv.o \
-                  SharedDb.o \
-                  TransactionHolder.o \
-                  TransactionI.o \
-                  Transaction.o \
-                  Util.o
-
-SRCS		= $(OBJS:.o=.cpp)
+OBJS		= CatalogData.obj \
+                  Catalog.obj \
+                  ConnectionI.obj \
+                  Connection.obj \
+		  DB.obj \
+		  EvictorI.obj \
+                  EvictorIteratorI.obj \
+		  Evictor.obj \
+		  EvictorStorage.obj \
+                  Exception.obj \
+                  IndexI.obj \
+                  Index.obj \
+	  	  MapI.obj \
+                  ObjectStore.obj \
+		  PingObject.obj \
+                  SharedDbEnv.obj \
+                  SharedDb.obj \
+                  TransactionHolder.obj \
+                  TransactionI.obj \
+                  Transaction.obj \
+                  Util.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
 
 
 HDIR		= $(includedir)\Freeze
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak
index 77811505847..4b6f5f0d032 100644
--- a/cpp/src/FreezeScript/Makefile.mak
+++ b/cpp/src/FreezeScript/Makefile.mak
@@ -14,26 +14,26 @@ DUMPDB		= $(top_srcdir)\bin\dumpdb.exe
 
 TARGETS		= $(TRANSFORMDB) $(DUMPDB)
 
-COMMON_OBJS	= Grammar.o \
-		  Scanner.o \
-		  AssignVisitor.o \
-		  Data.o \
-		  Error.o \
-		  Functions.o \
-		  Exception.o \
-		  Parser.o \
-		  Print.o \
-		  Util.o
-
-TRANSFORM_OBJS	= TransformAnalyzer.o \
-		  TransformVisitor.o \
-		  Transformer.o \
-		  transformdb.o
-
-DUMP_OBJS	= DumpDescriptors.o \
-		  DumpDB.o
-
-SRCS		= $(COMMON_OBJS:.o=.cpp) $(TRANSFORM_OBJS:.o=.cpp) $(DUMP_OBJS:.o=.cpp)
+COMMON_OBJS	= Grammar.obj \
+		  Scanner.obj \
+		  AssignVisitor.obj \
+		  Data.obj \
+		  Error.obj \
+		  Functions.obj \
+		  Exception.obj \
+		  Parser.obj \
+		  Print.obj \
+		  Util.obj
+
+TRANSFORM_OBJS	= TransformAnalyzer.obj \
+		  TransformVisitor.obj \
+		  Transformer.obj \
+		  transformdb.obj
+
+DUMP_OBJS	= DumpDescriptors.obj \
+		  DumpDB.obj
+
+SRCS		= $(COMMON_OBJS:.obj=.cpp) $(TRANSFORM_OBJS:.obj=.cpp) $(DUMP_OBJS:.obj=.cpp)
 
 HDIR		= $(includedir)\FreezeScript
 
diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak
index c273e32cf52..54862ea9665 100644
--- a/cpp/src/Glacier2/Makefile.mak
+++ b/cpp/src/Glacier2/Makefile.mak
@@ -24,26 +24,26 @@ TARGETS         = $(LIBNAME) $(DLLNAME)
 
 !endif
 
-OBJS		= PermissionsVerifier.o \
-		  Router.o \
-		  SSLInfo.o \
-		  Session.o
-
-ROBJS		= Blobject.o \
-		  ClientBlobject.o \
-		  CryptPermissionsVerifierI.o \
-		  Glacier2Router.o \
-		  ProxyVerifier.o \
-		  RequestQueue.o \
-		  RouterI.o \
-		  RoutingTable.o \
-		  FilterI.o \
-		  FilterManager.o \
-		  ServerBlobject.o \
-		  SessionRouterI.o
-
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(ROBJS:.o=.cpp)
+OBJS		= PermissionsVerifier.obj \
+		  Router.obj \
+		  SSLInfo.obj \
+		  Session.obj
+
+ROBJS		= Blobject.obj \
+		  ClientBlobject.obj \
+		  CryptPermissionsVerifierI.obj \
+		  Glacier2Router.obj \
+		  ProxyVerifier.obj \
+		  RequestQueue.obj \
+		  RouterI.obj \
+		  RoutingTable.obj \
+		  FilterI.obj \
+		  FilterManager.obj \
+		  ServerBlobject.obj \
+		  SessionRouterI.obj
+
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(ROBJS:.obj=.cpp)
 
 HDIR		= $(includedir)\Glacier2
 SDIR		= $(slicedir)\Glacier2
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index e559c44426b..ae9aac41ef2 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -14,93 +14,93 @@ DLLNAME		= $(top_srcdir)\bin\ice$(SOVERSION)$(LIBSUFFIX).dll
 
 TARGETS		= $(LIBNAME) $(DLLNAME)
 
-OBJS		= Acceptor.o \
-		  Application.o \
-		  Buffer.o \
-		  BasicStream.o \
-		  BuiltinSequences.o \
-		  CommunicatorI.o \
-		  Communicator.o \
-		  ConnectionFactory.o \
-		  ConnectionI.o \
-		  ConnectionMonitor.o \
-		  Connection.o \
-		  Connector.o \
-		  Current.o \
-		  DefaultsAndOverrides.o \
-		  Direct.o \
-		  DynamicLibrary.o \
-		  EndpointFactoryManager.o \
-		  EndpointFactory.o \
-		  Endpoint.o \
-		  EndpointI.o \
-		  EventHandler.o \
-		  EventLoggerI.o \
-		  Exception.o \
-		  FacetMap.o \
-		  FactoryTableDef.o \
-		  FactoryTable.o \
-		  GC.o \
-		  GCRecMutex.o \
-		  GCShared.o \
-		  Identity.o \
-		  IdentityUtil.o \
-		  IncomingAsync.o \
-		  Incoming.o \
-		  Initialize.o \
-		  Instance.o \
-		  LocalException.o \
-		  LocalObject.o \
-		  LocatorInfo.o \
-		  Locator.o \
-		  LoggerI.o \
-		  Logger.o \
-		  LoggerUtil.o \
-		  Network.o \
-		  ObjectAdapterFactory.o \
-		  ObjectAdapterI.o \
-		  ObjectAdapter.o \
-		  ObjectFactoryManager.o \
-		  ObjectFactory.o \
-		  Object.o \
-		  OutgoingAsync.o \
-		  Outgoing.o \
-		  PluginManagerI.o \
-		  Plugin.o \
-		  Process.o \
-		  PropertiesI.o \
-		  Properties.o \
-		  PropertyNames.o \
-		  Protocol.o \
-		  ProtocolPluginFacade.o \
-		  ProxyFactory.o \
-		  Proxy.o \
-		  ReferenceFactory.o \
-		  Reference.o \
-		  RouterInfo.o \
-		  Router.o \
-		  ServantLocator.o \
-		  ServantManager.o \
-		  Service.o \
-		  SliceChecksumDict.o \
-		  SliceChecksums.o \
-		  Stats.o \
-		  StreamI.o \
-		  Stream.o \
-                  StringConverter.o \
-		  TcpAcceptor.o \
-		  TcpConnector.o \
-		  TcpEndpointI.o \
-		  TcpTransceiver.o \
-	          ThreadPool.o \
-		  TraceLevels.o \
-		  TraceUtil.o \
-		  Transceiver.o \
-		  UdpEndpointI.o \
-		  UdpTransceiver.o \
-		  UnknownEndpointI.o
-
-SRCS		= $(OBJS:.o=.cpp)
+OBJS		= Acceptor.obj \
+		  Application.obj \
+		  Buffer.obj \
+		  BasicStream.obj \
+		  BuiltinSequences.obj \
+		  CommunicatorI.obj \
+		  Communicator.obj \
+		  ConnectionFactory.obj \
+		  ConnectionI.obj \
+		  ConnectionMonitor.obj \
+		  Connection.obj \
+		  Connector.obj \
+		  Current.obj \
+		  DefaultsAndOverrides.obj \
+		  Direct.obj \
+		  DynamicLibrary.obj \
+		  EndpointFactoryManager.obj \
+		  EndpointFactory.obj \
+		  Endpoint.obj \
+		  EndpointI.obj \
+		  EventHandler.obj \
+		  EventLoggerI.obj \
+		  Exception.obj \
+		  FacetMap.obj \
+		  FactoryTableDef.obj \
+		  FactoryTable.obj \
+		  GC.obj \
+		  GCRecMutex.obj \
+		  GCShared.obj \
+		  Identity.obj \
+		  IdentityUtil.obj \
+		  IncomingAsync.obj \
+		  Incoming.obj \
+		  Initialize.obj \
+		  Instance.obj \
+		  LocalException.obj \
+		  LocalObject.obj \
+		  LocatorInfo.obj \
+		  Locator.obj \
+		  LoggerI.obj \
+		  Logger.obj \
+		  LoggerUtil.obj \
+		  Network.obj \
+		  ObjectAdapterFactory.obj \
+		  ObjectAdapterI.obj \
+		  ObjectAdapter.obj \
+		  ObjectFactoryManager.obj \
+		  ObjectFactory.obj \
+		  Object.obj \
+		  OutgoingAsync.obj \
+		  Outgoing.obj \
+		  PluginManagerI.obj \
+		  Plugin.obj \
+		  Process.obj \
+		  PropertiesI.obj \
+		  Properties.obj \
+		  PropertyNames.obj \
+		  Protocol.obj \
+		  ProtocolPluginFacade.obj \
+		  ProxyFactory.obj \
+		  Proxy.obj \
+		  ReferenceFactory.obj \
+		  Reference.obj \
+		  RouterInfo.obj \
+		  Router.obj \
+		  ServantLocator.obj \
+		  ServantManager.obj \
+		  Service.obj \
+		  SliceChecksumDict.obj \
+		  SliceChecksums.obj \
+		  Stats.obj \
+		  StreamI.obj \
+		  Stream.obj \
+                  StringConverter.obj \
+		  TcpAcceptor.obj \
+		  TcpConnector.obj \
+		  TcpEndpointI.obj \
+		  TcpTransceiver.obj \
+	          ThreadPool.obj \
+		  TraceLevels.obj \
+		  TraceUtil.obj \
+		  Transceiver.obj \
+		  UdpEndpointI.obj \
+		  UdpTransceiver.obj \
+		  UnknownEndpointI.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
 
 HDIR		= $(includedir)\Ice
 SDIR		= $(slicedir)\Ice
@@ -118,7 +118,7 @@ $(DLLNAME): $(OBJS)
 	$(LINK) $(LD_DLLFLAGS) $(OBJS), $(DLLNAME),, $(LINKWITH)
 	move $(DLLNAME:.dll=.lib) $(LIBNAME)
 
-EventLoggerI.o: EventLoggerMsg.h
+EventLoggerI.obj: EventLoggerMsg.h
 
 EventLoggerMsg.h EventLoggerMsg.res: EventLoggerMsg.mc
 	mc EventLoggerMsg.mc
diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak
index 27db2de4bd4..9504005fe19 100644
--- a/cpp/src/IceBox/Makefile.mak
+++ b/cpp/src/IceBox/Makefile.mak
@@ -25,17 +25,17 @@ TARGETS         = $(LIBNAME) $(DLLNAME)
 
 !endif
 
-OBJS		= IceBox.o \
-		  Exception.o
+OBJS		= IceBox.obj \
+		  Exception.obj
 
-SOBJS		= ServiceManagerI.o \
-		  Service.o
+SOBJS		= ServiceManagerI.obj \
+		  Service.obj
 
-AOBJS		= Admin.o
+AOBJS		= Admin.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(AOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(AOBJS:.obj=.cpp)
 
 HDIR		= $(includedir)\IceBox
 SDIR		= $(slicedir)\IceBox
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
index d5ef5a7dc0a..a5d4e1d3f9b 100644
--- a/cpp/src/IceGrid/Makefile.mak
+++ b/cpp/src/IceGrid/Makefile.mak
@@ -26,84 +26,84 @@ TARGETS         = $(LIBNAME) $(DLLNAME)
 
 !endif
 
-LIB_OBJS	= Admin.o \
-		  Query.o \
-		  Exception.o \
-		  Descriptor.o \
-		  Observer.o \
-		  Session.o \
-		  Registry.o \
-		  UserAccountMapper.o
-
-ADMIN_OBJS	= Grammar.o \
-		  Scanner.o \
-		  Parser.o \
-		  DescriptorParser.o \
-		  DescriptorBuilder.o \
-		  DescriptorHelper.o \
-		  FileParser.o \
-		  FileParserI.o \
-		  Util.o \
-		  Internal.o \
-		  Client.o
-
-COMMON_OBJS	= Internal.o \
-		  DescriptorParser.o \
-		  DescriptorBuilder.o \
-		  TraceLevels.o
-
-NODE_OBJS	= NodeI.o \
-		  ServerI.o \
-		  ServerAdapterI.o \
-		  Activator.o \
-		  PlatformInfo.o \
-		  NodeSessionManager.o
-
-REGISTRY_OBJS	= RegistryI.o \
-		  InternalRegistryI.o \
-		  StringApplicationInfoDict.o \
-		  IdentityObjectInfoDict.o \
-		  StringAdapterInfoDict.o \
-		  Database.o \
-		  Allocatable.o \
-		  AdapterCache.o \
-		  ObjectCache.o \
-		  AllocatableObjectCache.o \
-		  ServerCache.o \
-		  NodeCache.o \
-		  ReplicaCache.o \
-		  LocatorI.o \
-		  LocatorRegistryI.o \
-		  AdminI.o \
-		  Util.o \
-		  DescriptorHelper.o \
-		  NodeSessionI.o \
-		  ReplicaSessionI.o \
-		  ReapThread.o \
-		  SessionI.o \
-		  AdminSessionI.o \
-		  SessionServantLocatorI.o \
-		  Topics.o \
-		  QueryI.o \
-		  WaitQueue.o \
-		  FileUserAccountMapperI.o \
-		  ReplicaSessionManager.o
+LIB_OBJS	= Admin.obj \
+		  Query.obj \
+		  Exception.obj \
+		  Descriptor.obj \
+		  Observer.obj \
+		  Session.obj \
+		  Registry.obj \
+		  UserAccountMapper.obj
+
+ADMIN_OBJS	= Grammar.obj \
+		  Scanner.obj \
+		  Parser.obj \
+		  DescriptorParser.obj \
+		  DescriptorBuilder.obj \
+		  DescriptorHelper.obj \
+		  FileParser.obj \
+		  FileParserI.obj \
+		  Util.obj \
+		  Internal.obj \
+		  Client.obj
+
+COMMON_OBJS	= Internal.obj \
+		  DescriptorParser.obj \
+		  DescriptorBuilder.obj \
+		  TraceLevels.obj
+
+NODE_OBJS	= NodeI.obj \
+		  ServerI.obj \
+		  ServerAdapterI.obj \
+		  Activator.obj \
+		  PlatformInfo.obj \
+		  NodeSessionManager.obj
+
+REGISTRY_OBJS	= RegistryI.obj \
+		  InternalRegistryI.obj \
+		  StringApplicationInfoDict.obj \
+		  IdentityObjectInfoDict.obj \
+		  StringAdapterInfoDict.obj \
+		  Database.obj \
+		  Allocatable.obj \
+		  AdapterCache.obj \
+		  ObjectCache.obj \
+		  AllocatableObjectCache.obj \
+		  ServerCache.obj \
+		  NodeCache.obj \
+		  ReplicaCache.obj \
+		  LocatorI.obj \
+		  LocatorRegistryI.obj \
+		  AdminI.obj \
+		  Util.obj \
+		  DescriptorHelper.obj \
+		  NodeSessionI.obj \
+		  ReplicaSessionI.obj \
+		  ReapThread.obj \
+		  SessionI.obj \
+		  AdminSessionI.obj \
+		  SessionServantLocatorI.obj \
+		  Topics.obj \
+		  QueryI.obj \
+		  WaitQueue.obj \
+		  FileUserAccountMapperI.obj \
+		  ReplicaSessionManager.obj
 
 NODE_SVR_OBJS	= $(COMMON_OBJS) \
 		  $(NODE_OBJS) \
 		  $(REGISTRY_OBJS) \
-		  IceGridNode.o
+		  IceGridNode.obj
 
 REGISTRY_SVR_OBJS = \
 		  $(COMMON_OBJS) \
 		  $(REGISTRY_OBJS) \
-		  IceGridRegistry.o
+		  IceGridRegistry.obj
 		    
-SRCS		= $(LIB_OBJS:.o=.cpp) \
-		  $(ADMIN_OBJS:.o=.cpp) \
-		  $(COMMON_OBJS:.o=.cpp) \
-		  $(NODE_OBJS:.o=.cpp) \
-		  $(REGISTRY_OBJS:.o=.cpp) \
+SRCS		= $(LIB_OBJS:.obj=.cpp) \
+		  $(ADMIN_OBJS:.obj=.cpp) \
+		  $(COMMON_OBJS:.obj=.cpp) \
+		  $(NODE_OBJS:.obj=.cpp) \
+		  $(REGISTRY_OBJS:.obj=.cpp) \
 		  IceGridNode.cpp \
 		  IceGridRegistry.cpp
 
diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak
index 4e015b27cc9..8c6bbf86513 100644
--- a/cpp/src/IcePatch2/Makefile.mak
+++ b/cpp/src/IcePatch2/Makefile.mak
@@ -26,23 +26,23 @@ TARGETS         = $(LIBNAME) $(DLLNAME)
 
 !endif
 
-OBJS		= Util.o \
-		  ClientUtil.o \
-		  FileInfo.o \
-		  FileServer.o \
-		  OS.o
+OBJS		= Util.obj \
+		  ClientUtil.obj \
+		  FileInfo.obj \
+		  FileServer.obj \
+		  OS.obj
 
-SOBJS		= Server.o \
-		  FileServerI.o
+SOBJS		= Server.obj \
+		  FileServerI.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-CALCOBJS	= Calc.o
+CALCOBJS	= Calc.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(CALCOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(CALCOBJS:.obj=.cpp)
 
 HDIR		= $(includedir)\IcePatch2
 SDIR		= $(slicedir)\IcePatch2
diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak
index f692eed1e59..451f0dc1a34 100644
--- a/cpp/src/IceSSL/Makefile.mak
+++ b/cpp/src/IceSSL/Makefile.mak
@@ -14,18 +14,18 @@ DLLNAME		= $(top_srcdir)\bin\icessl$(SOVERSION)$(LIBSUFFIX).dll
 
 TARGETS		= $(LIBNAME) $(DLLNAME)
 
-OBJS		= AcceptorI.o \
-		  Certificate.o \
-                  ConnectorI.o \
-                  EndpointI.o \
-                  Instance.o \
-                  PluginI.o \
-                  TransceiverI.o \
-                  Util.o \
-		  RFC2253.o \
-		  TrustManager.o
-
-SRCS		= $(OBJS:.o=.cpp)
+OBJS		= AcceptorI.obj \
+		  Certificate.obj \
+                  ConnectorI.obj \
+                  EndpointI.obj \
+                  Instance.obj \
+                  PluginI.obj \
+                  TransceiverI.obj \
+                  Util.obj \
+		  RFC2253.obj \
+		  TrustManager.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
 
 HDIR		= $(includedir)\IceSSL
 
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index 6f854fc4c74..4a959b90118 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -27,35 +27,35 @@ TARGETS         = $(LIBNAME) $(DLLNAME) $(SVCLIBNAME) $(SVCDLLNAME)
 
 !endif
 
-OBJS		= IceStorm.o \
-
-SOBJS		= TraceLevels.o \
-		  Flusher.o \
-		  Subscriber.o \
-		  OnewaySubscriber.o \
-		  OnewayBatchSubscriber.o \
-		  LinkSubscriber.o \
-		  SubscriberFactory.o \
-		  TopicI.o \
-		  TopicManagerI.o \
-		  PersistentTopicMap.o \
-		  LinkRecord.o \
-		  IceStormInternal.o \
-		  Service.o \
-		  QueuedProxy.o \
-		  OnewayProxy.o \
-		  TwowayProxy.o \
-		  LinkProxy.o
-
-AOBJS		= Admin.o \
-		  Grammar.o \
-		  Scanner.o \
-		  WeightedGraph.o \
-		  Parser.o
-
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(AOBJS:.o=.cpp)
+OBJS		= IceStorm.obj \
+
+SOBJS		= TraceLevels.obj \
+		  Flusher.obj \
+		  Subscriber.obj \
+		  OnewaySubscriber.obj \
+		  OnewayBatchSubscriber.obj \
+		  LinkSubscriber.obj \
+		  SubscriberFactory.obj \
+		  TopicI.obj \
+		  TopicManagerI.obj \
+		  PersistentTopicMap.obj \
+		  LinkRecord.obj \
+		  IceStormInternal.obj \
+		  Service.obj \
+		  QueuedProxy.obj \
+		  OnewayProxy.obj \
+		  TwowayProxy.obj \
+		  LinkProxy.obj
+
+AOBJS		= Admin.obj \
+		  Grammar.obj \
+		  Scanner.obj \
+		  WeightedGraph.obj \
+		  Parser.obj
+
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(AOBJS:.obj=.cpp)
 
 HDIR		= $(includedir)\IceStorm
 SDIR		= $(slicedir)\IceStorm
@@ -73,11 +73,11 @@ EXTRAFLAGS	= -DICE_STORM_SERVICE_API_EXPORTS
 
 !endif
 
-IceStorm.o: IceStorm.cpp
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -DICE_STORM_API_EXPORTS -o IceStorm.o IceStorm.cpp
+IceStorm.obj: IceStorm.cpp
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -DICE_STORM_API_EXPORTS IceStorm.cpp
 
-.cpp.o:
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(EXTRAFLAGS) -o $@ $<
+.cpp.obj:
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(EXTRAFLAGS) $<
 
 $(LIBNAME): $(DLLNAME)
 
diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak
index b8e43a9a9c8..9076fe6df59 100644
--- a/cpp/src/IceUtil/Makefile.mak
+++ b/cpp/src/IceUtil/Makefile.mak
@@ -14,30 +14,30 @@ DLLNAME         = $(top_srcdir)\bin\iceutil$(SOVERSION)$(LIBSUFFIX).dll
 
 TARGETS		= $(LIBNAME) $(DLLNAME)
 
-OBJS		= Base64.o \
-		  Cond.o \
-                  ConvertUTF.o \
-		  CountDownLatch.o \
-		  CtrlCHandler.o \
-		  Exception.o \
-		  Shared.o \
-		  InputUtil.o \
-		  MD5.o \
-		  MD5I.o \
-		  Options.o \
-		  OutputUtil.o \
-		  Random.o \
-		  RWRecMutex.o \
-		  RecMutex.o \
-		  StaticMutex.o \
-		  StringUtil.o \
-		  Thread.o \
-		  ThreadException.o \
-		  Time.o \
-		  UUID.o \
-		  Unicode.o
-
-SRCS		= $(OBJS:.o=.cpp)
+OBJS		= Base64.obj \
+		  Cond.obj \
+                  ConvertUTF.obj \
+		  CountDownLatch.obj \
+		  CtrlCHandler.obj \
+		  Exception.obj \
+		  Shared.obj \
+		  InputUtil.obj \
+		  MD5.obj \
+		  MD5I.obj \
+		  Options.obj \
+		  OutputUtil.obj \
+		  Random.obj \
+		  RWRecMutex.obj \
+		  RecMutex.obj \
+		  StaticMutex.obj \
+		  StringUtil.obj \
+		  Thread.obj \
+		  ThreadException.obj \
+		  Time.obj \
+		  UUID.obj \
+		  Unicode.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
@@ -57,7 +57,7 @@ install:: all
 
 !include .depend
 
-parser: parser.o
+parser: parser.obj
 	del /q $@
-	$(CXX) $(LDFLAGS) -o $@ parser.o $(BASELIBS)
+	$(CXX) $(LDFLAGS) -o $@ parser.obj $(BASELIBS)
 
diff --git a/cpp/src/IceUtil/Options.cpp b/cpp/src/IceUtil/Options.cpp
index 93ca0973ee4..edf24c3db9a 100755
--- a/cpp/src/IceUtil/Options.cpp
+++ b/cpp/src/IceUtil/Options.cpp
@@ -945,5 +945,5 @@ string
 IceUtil::Options::getSynonym(const ::std::string& optName) const
 {
     Synonyms::const_iterator pos = _synonyms.find(optName);
-    return pos != _synonyms.end() ? pos->second : "";
+    return pos != _synonyms.end() ? pos->second : string("");
 }
diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak
index 43af1bf3ab8..a6e15e7ce39 100644
--- a/cpp/src/IceXML/Makefile.mak
+++ b/cpp/src/IceXML/Makefile.mak
@@ -14,9 +14,9 @@ DLLNAME		= $(top_srcdir)\bin\icexml$(SOVERSION)$(LIBSUFFIX).dll
 
 TARGETS		= $(LIBNAME) $(DLLNAME)
 
-OBJS		= Parser.o
+OBJS		= Parser.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak
index 3ca7f73c414..cb5cdeb6d7a 100644
--- a/cpp/src/Slice/Makefile.mak
+++ b/cpp/src/Slice/Makefile.mak
@@ -14,19 +14,19 @@ DLLNAME		= $(top_srcdir)\bin\slice$(SOVERSION)$(LIBSUFFIX).dll
 
 TARGETS		= $(LIBNAME) $(DLLNAME)
 
-OBJS		= Scanner.o \
-		  Grammar.o \
-		  Parser.o \
-		  CPlusPlusUtil.o \
-		  CsUtil.o \
-		  VbUtil.o \
-		  JavaUtil.o \
-		  Preprocessor.o \
-		  Checksum.o \
-		  PythonUtil.o \
-		  DotNetNames.o
+OBJS		= Scanner.obj \
+		  Grammar.obj \
+		  Parser.obj \
+		  CPlusPlusUtil.obj \
+		  CsUtil.obj \
+		  VbUtil.obj \
+		  JavaUtil.obj \
+		  Preprocessor.obj \
+		  Checksum.obj \
+		  PythonUtil.obj \
+		  DotNetNames.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/icecpp/Makefile.mak b/cpp/src/icecpp/Makefile.mak
index 7cf6424093c..eb5f3e5caf1 100644
--- a/cpp/src/icecpp/Makefile.mak
+++ b/cpp/src/icecpp/Makefile.mak
@@ -13,9 +13,9 @@ NAME		= $(top_srcdir)\bin\icecpp.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= cccp.o \
-		  cexp.o \
-		  prefix.o
+OBJS		= cccp.obj \
+		  cexp.obj \
+		  prefix.obj
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/slice2cpp/Makefile.mak b/cpp/src/slice2cpp/Makefile.mak
index 382009e1c51..3808b969fc4 100644
--- a/cpp/src/slice2cpp/Makefile.mak
+++ b/cpp/src/slice2cpp/Makefile.mak
@@ -13,10 +13,10 @@ NAME		= $(top_srcdir)\bin\slice2cpp.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= Gen.o \
-		  Main.o
+OBJS		= Gen.obj \
+		  Main.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/slice2cppe/Makefile.mak b/cpp/src/slice2cppe/Makefile.mak
index 12d1fa48ff4..1607fc4b128 100644
--- a/cpp/src/slice2cppe/Makefile.mak
+++ b/cpp/src/slice2cppe/Makefile.mak
@@ -13,10 +13,10 @@ NAME		= $(top_srcdir)\bin\slice2cppe.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= Gen.o \
-		  Main.o
+OBJS		= Gen.obj \
+		  Main.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/slice2cs/Makefile.mak b/cpp/src/slice2cs/Makefile.mak
index bd5bb52c94b..b1f84318f23 100644
--- a/cpp/src/slice2cs/Makefile.mak
+++ b/cpp/src/slice2cs/Makefile.mak
@@ -13,10 +13,10 @@ NAME		= $(top_srcdir)\bin\slice2cs.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= Gen.o \
-		  Main.o
+OBJS		= Gen.obj \
+		  Main.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/slice2docbook/Makefile.mak b/cpp/src/slice2docbook/Makefile.mak
index 8fd8b7870aa..a183a0f288b 100644
--- a/cpp/src/slice2docbook/Makefile.mak
+++ b/cpp/src/slice2docbook/Makefile.mak
@@ -13,10 +13,10 @@ NAME		= $(top_srcdir)\bin\slice2docbook.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= Gen.o \
-		  Main.o
+OBJS		= Gen.obj \
+		  Main.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/slice2freeze/Makefile.mak b/cpp/src/slice2freeze/Makefile.mak
index 40c04e02d1f..a3f4a9e9c8b 100644
--- a/cpp/src/slice2freeze/Makefile.mak
+++ b/cpp/src/slice2freeze/Makefile.mak
@@ -13,9 +13,9 @@ NAME		= $(top_srcdir)\bin\slice2freeze.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= Main.o
+OBJS		= Main.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/slice2freezej/Makefile.mak b/cpp/src/slice2freezej/Makefile.mak
index e0bcf11123d..a1e6a7a85ae 100644
--- a/cpp/src/slice2freezej/Makefile.mak
+++ b/cpp/src/slice2freezej/Makefile.mak
@@ -13,9 +13,9 @@ NAME		= $(top_srcdir)\bin\slice2freezej.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= Main.o
+OBJS		= Main.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/slice2java/Makefile.mak b/cpp/src/slice2java/Makefile.mak
index ef6811248df..c04b1809518 100644
--- a/cpp/src/slice2java/Makefile.mak
+++ b/cpp/src/slice2java/Makefile.mak
@@ -13,10 +13,10 @@ NAME		= $(top_srcdir)\bin\slice2java.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= Gen.o \
-		  Main.o
+OBJS		= Gen.obj \
+		  Main.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/slice2javae/Makefile.mak b/cpp/src/slice2javae/Makefile.mak
index fdf5cdf8ecc..c40159679d1 100644
--- a/cpp/src/slice2javae/Makefile.mak
+++ b/cpp/src/slice2javae/Makefile.mak
@@ -13,10 +13,10 @@ NAME		= $(top_srcdir)\bin\slice2javae.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= Gen.o \
-		  Main.o
+OBJS		= Gen.obj \
+		  Main.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/slice2py/Makefile.mak b/cpp/src/slice2py/Makefile.mak
index ace0362ff91..0dcabf04df7 100644
--- a/cpp/src/slice2py/Makefile.mak
+++ b/cpp/src/slice2py/Makefile.mak
@@ -13,9 +13,9 @@ NAME		= $(top_srcdir)\bin\slice2py.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= Main.o
+OBJS		= Main.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/src/slice2vb/Makefile.mak b/cpp/src/slice2vb/Makefile.mak
index 8fd3bc341d6..1ecc7780b7b 100644
--- a/cpp/src/slice2vb/Makefile.mak
+++ b/cpp/src/slice2vb/Makefile.mak
@@ -13,10 +13,10 @@ NAME		= $(top_srcdir)\bin\slice2vb.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= Gen.o \
-		  Main.o
+OBJS		= Gen.obj \
+		  Main.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Freeze/complex/Makefile.mak b/cpp/test/Freeze/complex/Makefile.mak
index d7496759854..ffb253b9319 100644
--- a/cpp/test/Freeze/complex/Makefile.mak
+++ b/cpp/test/Freeze/complex/Makefile.mak
@@ -13,14 +13,14 @@ CLIENT		= client.exe
 
 TARGETS		= $(CLIENT)
 
-OBJS		= ComplexDict.o \
-		  Complex.o \
-		  Grammar.o \
-		  Scanner.o \
-		  Parser.o \
-		  Client.o
-
-SRCS		= $(OBJS:.o=.cpp)
+OBJS		= ComplexDict.obj \
+		  Complex.obj \
+		  Grammar.obj \
+		  Scanner.obj \
+		  Parser.obj \
+		  Client.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)\config\Make.rules.mak
 
diff --git a/cpp/test/Freeze/dbmap/Makefile.mak b/cpp/test/Freeze/dbmap/Makefile.mak
index b2f95f452b4..afe4ef2eaca 100644
--- a/cpp/test/Freeze/dbmap/Makefile.mak
+++ b/cpp/test/Freeze/dbmap/Makefile.mak
@@ -13,14 +13,14 @@ CLIENT		= client.exe
 
 TARGETS		= $(CLIENT)
 
-OBJS		= Client.o \
-                  ByteIntMap.o \
-                  IntIdentityMap.o \
-                  IntIdentityMapWithIndex.o \
-                  SortedMap.o \
-		  WstringWstringMap.o
-
-SRCS		= $(OBJS:.o=.cpp)
+OBJS		= Client.obj \
+                  ByteIntMap.obj \
+                  IntIdentityMap.obj \
+                  IntIdentityMapWithIndex.obj \
+                  SortedMap.obj \
+		  WstringWstringMap.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)\config\Make.rules.mak
 
diff --git a/cpp/test/Freeze/evictor/Makefile.mak b/cpp/test/Freeze/evictor/Makefile.mak
index 037a32ec16f..22631d45d15 100644
--- a/cpp/test/Freeze/evictor/Makefile.mak
+++ b/cpp/test/Freeze/evictor/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Test.o
+OBJS		= Test.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= TestI.o \
-		  Server.o
+SOBJS		= TestI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Freeze/oldevictor/Makefile.mak b/cpp/test/Freeze/oldevictor/Makefile.mak
index 037a32ec16f..22631d45d15 100644
--- a/cpp/test/Freeze/oldevictor/Makefile.mak
+++ b/cpp/test/Freeze/oldevictor/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Test.o
+OBJS		= Test.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= TestI.o \
-		  Server.o
+SOBJS		= TestI.obj \
+		  Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/FreezeScript/dbmap/Makefile.mak b/cpp/test/FreezeScript/dbmap/Makefile.mak
index a0308ad5d4e..33447cac8c9 100644
--- a/cpp/test/FreezeScript/dbmap/Makefile.mak
+++ b/cpp/test/FreezeScript/dbmap/Makefile.mak
@@ -13,11 +13,11 @@ CLIENT		= makedb.exe
 
 TARGETS		= $(CLIENT)
 
-OBJS		= TestOld.o \
-                  makedb.o \
-                  IntSMap.o
+OBJS		= TestOld.obj \
+                  makedb.obj \
+                  IntSMap.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 SLICE_SRCS	= TestOld.ice
 
diff --git a/cpp/test/FreezeScript/evictor/Makefile.mak b/cpp/test/FreezeScript/evictor/Makefile.mak
index 345ce95e0b3..8368ce213b1 100644
--- a/cpp/test/FreezeScript/evictor/Makefile.mak
+++ b/cpp/test/FreezeScript/evictor/Makefile.mak
@@ -13,10 +13,10 @@ CLIENT		= makedb.exe
 
 TARGETS		= $(CLIENT)
 
-OBJS		= TestOld.o \
-                  makedb.o
+OBJS		= TestOld.obj \
+                  makedb.obj
 
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 SLICE_SRCS	= TestOld.ice
 
diff --git a/cpp/test/Glacier2/addressFilter/Makefile.mak b/cpp/test/Glacier2/addressFilter/Makefile.mak
index 0f28ec1a5d3..4cafbec4435 100644
--- a/cpp/test/Glacier2/addressFilter/Makefile.mak
+++ b/cpp/test/Glacier2/addressFilter/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Backend.o \
-		  BackendI.o
+OBJS		= Backend.obj \
+		  BackendI.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= Server.o
+SOBJS		= Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Glacier2/attack/Makefile.mak b/cpp/test/Glacier2/attack/Makefile.mak
index 0f28ec1a5d3..4cafbec4435 100644
--- a/cpp/test/Glacier2/attack/Makefile.mak
+++ b/cpp/test/Glacier2/attack/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Backend.o \
-		  BackendI.o
+OBJS		= Backend.obj \
+		  BackendI.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= Server.o
+SOBJS		= Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Glacier2/filters/Makefile.mak b/cpp/test/Glacier2/filters/Makefile.mak
index 878f7ee2977..86add64b6d1 100644
--- a/cpp/test/Glacier2/filters/Makefile.mak
+++ b/cpp/test/Glacier2/filters/Makefile.mak
@@ -14,17 +14,17 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Client.o \
-		  Test.o
+COBJS		= Client.obj \
+		  Test.obj
 
-SOBJS		= Server.o \
-		  Test.o \
-		  SessionI.o \
-		  BackendI.o \
-		  TestControllerI.o
+SOBJS		= Server.obj \
+		  Test.obj \
+		  SessionI.obj \
+		  BackendI.obj \
+		  TestControllerI.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Glacier2/router/Makefile.mak b/cpp/test/Glacier2/router/Makefile.mak
index 434f19cd362..474fded7648 100644
--- a/cpp/test/Glacier2/router/Makefile.mak
+++ b/cpp/test/Glacier2/router/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-OBJS		= Callback.o \
-		  CallbackI.o
+OBJS		= Callback.obj \
+		  CallbackI.obj
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= Server.o
+SOBJS		= Server.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Glacier2/sessionControl/Makefile.mak b/cpp/test/Glacier2/sessionControl/Makefile.mak
index 79f19d140e3..99b7ca32cd4 100644
--- a/cpp/test/Glacier2/sessionControl/Makefile.mak
+++ b/cpp/test/Glacier2/sessionControl/Makefile.mak
@@ -14,15 +14,15 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Client.o \
-		  Session.o
+COBJS		= Client.obj \
+		  Session.obj
 
-SOBJS		= Server.o \
-		  Session.o \
-		  SessionI.o
+SOBJS		= Server.obj \
+		  Session.obj \
+		  SessionI.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Glacier2/ssl/Makefile.mak b/cpp/test/Glacier2/ssl/Makefile.mak
index 831d7f86604..630dc9cd4c5 100644
--- a/cpp/test/Glacier2/ssl/Makefile.mak
+++ b/cpp/test/Glacier2/ssl/Makefile.mak
@@ -14,12 +14,12 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Client.o
+COBJS		= Client.obj
 
-SOBJS		= Server.o
+SOBJS		= Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/adapterDeactivation/Makefile.mak b/cpp/test/Ice/adapterDeactivation/Makefile.mak
index 110b95903c4..001314061d7 100644
--- a/cpp/test/Ice/adapterDeactivation/Makefile.mak
+++ b/cpp/test/Ice/adapterDeactivation/Makefile.mak
@@ -15,24 +15,24 @@ COLLOCATED	= collocated.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
-
-SOBJS		= Test.o \
-		  TestI.o \
-		  ServantLocatorI.o \
-		  Server.o
-
-COLOBJS		= Test.o \
-		  TestI.o \
-		  ServantLocatorI.o \
-		  Collocated.o \
-		  AllTests.o
-
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(COLOBJS:.o=.cpp)
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
+
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  ServantLocatorI.obj \
+		  Server.obj
+
+COLOBJS		= Test.obj \
+		  TestI.obj \
+		  ServantLocatorI.obj \
+		  Collocated.obj \
+		  AllTests.obj
+
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(COLOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/binding/Makefile.mak b/cpp/test/Ice/binding/Makefile.mak
index e4734adf576..8f2785cf9e5 100644
--- a/cpp/test/Ice/binding/Makefile.mak
+++ b/cpp/test/Ice/binding/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
 
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/checksum/client/Makefile.mak b/cpp/test/Ice/checksum/client/Makefile.mak
index 4b0d7889aa3..4a709f0b62e 100644
--- a/cpp/test/Ice/checksum/client/Makefile.mak
+++ b/cpp/test/Ice/checksum/client/Makefile.mak
@@ -13,12 +13,12 @@ CLIENT		= client.exe
 
 TARGETS		= $(CLIENT)
 
-COBJS		= Test.o \
-		  Types.o \
-		  Client.o \
-		  AllTests.o
+COBJS		= Test.obj \
+		  Types.obj \
+		  Client.obj \
+		  AllTests.obj
 
-SRCS		= $(COBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/checksum/server/Makefile.mak b/cpp/test/Ice/checksum/server/Makefile.mak
index 08ad0a48dd7..7ef3e333e7d 100644
--- a/cpp/test/Ice/checksum/server/Makefile.mak
+++ b/cpp/test/Ice/checksum/server/Makefile.mak
@@ -13,12 +13,12 @@ SERVER		= server.exe
 
 TARGETS		= $(SERVER)
 
-SOBJS		= Test.o \
-		  Types.o \
-		  TestI.o \
-		  Server.o
+SOBJS		= Test.obj \
+		  Types.obj \
+		  TestI.obj \
+		  Server.obj
 
-SRCS		= $(SOBJS:.o=.cpp)
+SRCS		= $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/custom/Makefile.mak b/cpp/test/Ice/custom/Makefile.mak
index 848a621f980..14e9afb41eb 100644
--- a/cpp/test/Ice/custom/Makefile.mak
+++ b/cpp/test/Ice/custom/Makefile.mak
@@ -16,42 +16,42 @@ COLLOCATED	= collocated.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
 
-COBJS           = Test.o \
-		  Wstring.o \
-		  Client.o \
-		  AllTests.o \
-		  MyByteSeq.o \
-		  StringConverterI.o 
-
-SOBJS           = Test.o \
-		  Wstring.o \
-		  TestI.o \
-		  WstringI.o \
-		  Server.o \
-		  MyByteSeq.o \
-		  StringConverterI.o
-
-SAMDOBJS        = TestAMD.o \
-		  TestAMDI.o \
-		  WstringAMD.o \
-		  WstringAMDI.o \
-		  ServerAMD.o \
-		  MyByteSeq.o \
-		  StringConverterI.o
-
-COLOBJS         = Test.o \
-		  Wstring.o \
-		  TestI.o \
-		  WstringI.o \
-		  Collocated.o \
-		  AllTests.o \
-		  MyByteSeq.o \
-		  StringConverterI.o
-
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(SAMDOBJS:.o=.cpp) \
-		  $(COLOBJS:.o=.cpp)
+COBJS           = Test.obj \
+		  Wstring.obj \
+		  Client.obj \
+		  AllTests.obj \
+		  MyByteSeq.obj \
+		  StringConverterI.obj 
+
+SOBJS           = Test.obj \
+		  Wstring.obj \
+		  TestI.obj \
+		  WstringI.obj \
+		  Server.obj \
+		  MyByteSeq.obj \
+		  StringConverterI.obj
+
+SAMDOBJS        = TestAMD.obj \
+		  TestAMDI.obj \
+		  WstringAMD.obj \
+		  WstringAMDI.obj \
+		  ServerAMD.obj \
+		  MyByteSeq.obj \
+		  StringConverterI.obj
+
+COLOBJS         = Test.obj \
+		  Wstring.obj \
+		  TestI.obj \
+		  WstringI.obj \
+		  Collocated.obj \
+		  AllTests.obj \
+		  MyByteSeq.obj \
+		  StringConverterI.obj
+
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(SAMDOBJS:.obj=.cpp) \
+		  $(COLOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/exceptions/Makefile.mak b/cpp/test/Ice/exceptions/Makefile.mak
index ab78d0d1979..d06e9cac1d3 100644
--- a/cpp/test/Ice/exceptions/Makefile.mak
+++ b/cpp/test/Ice/exceptions/Makefile.mak
@@ -16,27 +16,27 @@ COLLOCATED	= collocated.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
-
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
-
-SAMDOBJS	= TestAMD.o \
-		  TestAMDI.o \
-		  ServerAMD.o
-
-COLOBJS		= Test.o \
-		  TestI.o \
-		  Collocated.o \
-		  AllTests.o
-
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(SAMDOBJS:.o=.cpp) \
-		  $(COLOBJS:.o=.cpp)
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
+
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
+
+SAMDOBJS	= TestAMD.obj \
+		  TestAMDI.obj \
+		  ServerAMD.obj
+
+COLOBJS		= Test.obj \
+		  TestI.obj \
+		  Collocated.obj \
+		  AllTests.obj
+
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(SAMDOBJS:.obj=.cpp) \
+		  $(COLOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/facets/Makefile.mak b/cpp/test/Ice/facets/Makefile.mak
index 1179b3226ef..e7650db72f5 100644
--- a/cpp/test/Ice/facets/Makefile.mak
+++ b/cpp/test/Ice/facets/Makefile.mak
@@ -15,22 +15,22 @@ COLLOCATED	= collocated.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
-
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
-
-COLOBJS		= Test.o \
-		  TestI.o \
-		  Collocated.o \
-		  AllTests.o
-
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(COLOBJS:.o=.cpp)
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
+
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
+
+COLOBJS		= Test.obj \
+		  TestI.obj \
+		  Collocated.obj \
+		  AllTests.obj
+
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(COLOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/faultTolerance/Makefile.mak b/cpp/test/Ice/faultTolerance/Makefile.mak
index e4734adf576..8f2785cf9e5 100644
--- a/cpp/test/Ice/faultTolerance/Makefile.mak
+++ b/cpp/test/Ice/faultTolerance/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
 
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/gc/Makefile.mak b/cpp/test/Ice/gc/Makefile.mak
index 5c2fb982476..15669b4d8cc 100644
--- a/cpp/test/Ice/gc/Makefile.mak
+++ b/cpp/test/Ice/gc/Makefile.mak
@@ -13,10 +13,10 @@ CLIENT		= client.exe
 
 TARGETS		= $(CLIENT)
 
-COBJS		= Test.o \
-		  Client.o
+COBJS		= Test.obj \
+		  Client.obj
 
-SRCS		= $(COBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/hold/Makefile.mak b/cpp/test/Ice/hold/Makefile.mak
index e4734adf576..8f2785cf9e5 100644
--- a/cpp/test/Ice/hold/Makefile.mak
+++ b/cpp/test/Ice/hold/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
 
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/inheritance/Makefile.mak b/cpp/test/Ice/inheritance/Makefile.mak
index 1179b3226ef..e7650db72f5 100644
--- a/cpp/test/Ice/inheritance/Makefile.mak
+++ b/cpp/test/Ice/inheritance/Makefile.mak
@@ -15,22 +15,22 @@ COLLOCATED	= collocated.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
-
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
-
-COLOBJS		= Test.o \
-		  TestI.o \
-		  Collocated.o \
-		  AllTests.o
-
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(COLOBJS:.o=.cpp)
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
+
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
+
+COLOBJS		= Test.obj \
+		  TestI.obj \
+		  Collocated.obj \
+		  AllTests.obj
+
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(COLOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/location/Makefile.mak b/cpp/test/Ice/location/Makefile.mak
index 434a58d868b..e935ce9b5f8 100644
--- a/cpp/test/Ice/location/Makefile.mak
+++ b/cpp/test/Ice/location/Makefile.mak
@@ -14,17 +14,17 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
 
-SOBJS		= Test.o \
-		  TestI.o \
-		  ServerLocator.o \
-		  Server.o
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  ServerLocator.obj \
+		  Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/objects/Makefile.mak b/cpp/test/Ice/objects/Makefile.mak
index 3f0d3fbb213..e04145a1e10 100644
--- a/cpp/test/Ice/objects/Makefile.mak
+++ b/cpp/test/Ice/objects/Makefile.mak
@@ -15,23 +15,23 @@ COLLOCATED	= collocated.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
 
-COBJS		= Test.o \
-		  TestI.o \
-		  Client.o \
-		  AllTests.o
-
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
-
-COLOBJS		= Test.o \
-		  TestI.o \
-		  Collocated.o \
-		  AllTests.o
-
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(COLOBJS:.o=.cpp)
+COBJS		= Test.obj \
+		  TestI.obj \
+		  Client.obj \
+		  AllTests.obj
+
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
+
+COLOBJS		= Test.obj \
+		  TestI.obj \
+		  Collocated.obj \
+		  AllTests.obj
+
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(COLOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/operations/Makefile.mak b/cpp/test/Ice/operations/Makefile.mak
index f19334b38c8..6614679a875 100644
--- a/cpp/test/Ice/operations/Makefile.mak
+++ b/cpp/test/Ice/operations/Makefile.mak
@@ -16,33 +16,33 @@ COLLOCATED	= collocated.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o \
-		  Twoways.o \
-		  TwowaysAMI.o \
-		  BatchOneways.o
-
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
-
-SAMDOBJS	= TestAMD.o \
-		  TestAMDI.o \
-		  ServerAMD.o
-
-COLOBJS		= Test.o \
-		  TestI.o \
-		  Collocated.o \
-		  AllTests.o \
-		  Twoways.o \
-		  TwowaysAMI.o \
-		  BatchOneways.o
-
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(SAMDOBJS:.o=.cpp) \
-		  $(COLOBJS:.o=.cpp)
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj \
+		  Twoways.obj \
+		  TwowaysAMI.obj \
+		  BatchOneways.obj
+
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
+
+SAMDOBJS	= TestAMD.obj \
+		  TestAMDI.obj \
+		  ServerAMD.obj
+
+COLOBJS		= Test.obj \
+		  TestI.obj \
+		  Collocated.obj \
+		  AllTests.obj \
+		  Twoways.obj \
+		  TwowaysAMI.obj \
+		  BatchOneways.obj
+
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(SAMDOBJS:.obj=.cpp) \
+		  $(COLOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/retry/Makefile.mak b/cpp/test/Ice/retry/Makefile.mak
index e4734adf576..8f2785cf9e5 100644
--- a/cpp/test/Ice/retry/Makefile.mak
+++ b/cpp/test/Ice/retry/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
 
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/slicing/exceptions/Makefile.mak b/cpp/test/Ice/slicing/exceptions/Makefile.mak
index fecec57ff91..fe0847a4896 100644
--- a/cpp/test/Ice/slicing/exceptions/Makefile.mak
+++ b/cpp/test/Ice/slicing/exceptions/Makefile.mak
@@ -15,23 +15,23 @@ SERVERAMD	= serveramd.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(SERVERAMD)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
-
-SOBJS		= Test.o \
-    		  ServerPrivate.o \
-		  TestI.o \
-		  Server.o
-
-SAMDOBJS	= TestAMD.o \
-    		  ServerPrivateAMD.o \
-		  TestAMDI.o \
-		  ServerAMD.o
-
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(SAMDOBJS:.o=.cpp)
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
+
+SOBJS		= Test.obj \
+    		  ServerPrivate.obj \
+		  TestI.obj \
+		  Server.obj
+
+SAMDOBJS	= TestAMD.obj \
+    		  ServerPrivateAMD.obj \
+		  TestAMDI.obj \
+		  ServerAMD.obj
+
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(SAMDOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/slicing/objects/Makefile.mak b/cpp/test/Ice/slicing/objects/Makefile.mak
index ec2293b901d..8f7f91520ab 100644
--- a/cpp/test/Ice/slicing/objects/Makefile.mak
+++ b/cpp/test/Ice/slicing/objects/Makefile.mak
@@ -15,27 +15,27 @@ SERVERAMD	= serveramd.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(SERVERAMD)
 
-COBJS		= Test.o \
-		  ClientPrivate.o \
-		  Client.o \
-		  AllTests.o \
-		  Forward.o
-
-SOBJS		= Test.o \
-    		  ServerPrivate.o \
-		  TestI.o \
-		  Server.o \
-		  Forward.o
-
-SAMDOBJS	= TestAMD.o \
-    		  ServerPrivateAMD.o \
-		  TestAMDI.o \
-		  ServerAMD.o \
-		  Forward.o
-
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(SAMDOBJS:.o=.cpp)
+COBJS		= Test.obj \
+		  ClientPrivate.obj \
+		  Client.obj \
+		  AllTests.obj \
+		  Forward.obj
+
+SOBJS		= Test.obj \
+    		  ServerPrivate.obj \
+		  TestI.obj \
+		  Server.obj \
+		  Forward.obj
+
+SAMDOBJS	= TestAMD.obj \
+    		  ServerPrivateAMD.obj \
+		  TestAMDI.obj \
+		  ServerAMD.obj \
+		  Forward.obj
+
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(SAMDOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/stream/Makefile.mak b/cpp/test/Ice/stream/Makefile.mak
index 2b625125229..26fb6f3e4b2 100644
--- a/cpp/test/Ice/stream/Makefile.mak
+++ b/cpp/test/Ice/stream/Makefile.mak
@@ -13,10 +13,10 @@ CLIENT		= client.exe
 
 TARGETS		= $(CLIENT)
 
-COBJS		= Test.o \
-		  Client.o
+COBJS		= Test.obj \
+		  Client.obj
 
-SRCS		= $(COBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/Ice/timeout/Makefile.mak b/cpp/test/Ice/timeout/Makefile.mak
index e4734adf576..8f2785cf9e5 100644
--- a/cpp/test/Ice/timeout/Makefile.mak
+++ b/cpp/test/Ice/timeout/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
 
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceGrid/activation/Makefile.mak b/cpp/test/IceGrid/activation/Makefile.mak
index b8a2f00b1f2..305b9d37bd3 100644
--- a/cpp/test/IceGrid/activation/Makefile.mak
+++ b/cpp/test/IceGrid/activation/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
 
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceGrid/allocation/Makefile.mak b/cpp/test/IceGrid/allocation/Makefile.mak
index b8a2f00b1f2..305b9d37bd3 100644
--- a/cpp/test/IceGrid/allocation/Makefile.mak
+++ b/cpp/test/IceGrid/allocation/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
 
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceGrid/deployer/Makefile.mak b/cpp/test/IceGrid/deployer/Makefile.mak
index 415c95a4ce9..99eb62906b2 100644
--- a/cpp/test/IceGrid/deployer/Makefile.mak
+++ b/cpp/test/IceGrid/deployer/Makefile.mak
@@ -17,21 +17,21 @@ DLLNAME		= testservice$(LIBSUFFIX).dll
 
 TARGETS		= $(CLIENT) $(SERVER) $(LIBNAME) $(DLLNAME)
 
-OBJS		= Test.o
+OBJS		= Test.obj
 
-COBJS		= Client.o \
-		  AllTests.o
+COBJS		= Client.obj \
+		  AllTests.obj
 
-SOBJS		= TestI.o \
-		  Server.o
+SOBJS		= TestI.obj \
+		  Server.obj
 
-SERVICE_OBJS	= TestI.o \
-		  Service.o
+SERVICE_OBJS	= TestI.obj \
+		  Service.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(SERVICE_OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(SERVICE_OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceGrid/replication/Makefile.mak b/cpp/test/IceGrid/replication/Makefile.mak
index 415c95a4ce9..99eb62906b2 100644
--- a/cpp/test/IceGrid/replication/Makefile.mak
+++ b/cpp/test/IceGrid/replication/Makefile.mak
@@ -17,21 +17,21 @@ DLLNAME		= testservice$(LIBSUFFIX).dll
 
 TARGETS		= $(CLIENT) $(SERVER) $(LIBNAME) $(DLLNAME)
 
-OBJS		= Test.o
+OBJS		= Test.obj
 
-COBJS		= Client.o \
-		  AllTests.o
+COBJS		= Client.obj \
+		  AllTests.obj
 
-SOBJS		= TestI.o \
-		  Server.o
+SOBJS		= TestI.obj \
+		  Server.obj
 
-SERVICE_OBJS	= TestI.o \
-		  Service.o
+SERVICE_OBJS	= TestI.obj \
+		  Service.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp) \
-		  $(SERVICE_OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(SERVICE_OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceGrid/session/Makefile.mak b/cpp/test/IceGrid/session/Makefile.mak
index 093175becd6..6fd8b51f032 100644
--- a/cpp/test/IceGrid/session/Makefile.mak
+++ b/cpp/test/IceGrid/session/Makefile.mak
@@ -14,13 +14,13 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Client.o \
-		  AllTests.o
+COBJS		= Client.obj \
+		  AllTests.obj
 
-SOBJS		= Server.o
+SOBJS		= Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceGrid/simple/Makefile.mak b/cpp/test/IceGrid/simple/Makefile.mak
index b8a2f00b1f2..305b9d37bd3 100644
--- a/cpp/test/IceGrid/simple/Makefile.mak
+++ b/cpp/test/IceGrid/simple/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
 
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceGrid/update/Makefile.mak b/cpp/test/IceGrid/update/Makefile.mak
index b8a2f00b1f2..305b9d37bd3 100644
--- a/cpp/test/IceGrid/update/Makefile.mak
+++ b/cpp/test/IceGrid/update/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
 
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceSSL/configuration/Makefile.mak b/cpp/test/IceSSL/configuration/Makefile.mak
index 0c6922711b2..7decbb2fcd9 100644
--- a/cpp/test/IceSSL/configuration/Makefile.mak
+++ b/cpp/test/IceSSL/configuration/Makefile.mak
@@ -14,16 +14,16 @@ SERVER		= server.exe
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-COBJS		= Test.o \
-		  Client.o \
-		  AllTests.o
+COBJS		= Test.obj \
+		  Client.obj \
+		  AllTests.obj
 
-SOBJS		= Test.o \
-		  TestI.o \
-		  Server.o
+SOBJS		= Test.obj \
+		  TestI.obj \
+		  Server.obj
 
-SRCS		= $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceStorm/federation/Makefile.mak b/cpp/test/IceStorm/federation/Makefile.mak
index c47a5379bc2..2b87cc4e4bd 100644
--- a/cpp/test/IceStorm/federation/Makefile.mak
+++ b/cpp/test/IceStorm/federation/Makefile.mak
@@ -14,15 +14,15 @@ SUBSCRIBER	= subscriber.exe
 
 TARGETS		= $(PUBLISHER) $(SUBSCRIBER)
 
-OBJS		= Event.o
+OBJS		= Event.obj
 
-POBJS		= Publisher.o
+POBJS		= Publisher.obj
 
-SOBJS		= Subscriber.o
+SOBJS		= Subscriber.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(POBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(POBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 
 !include $(top_srcdir)/config/Make.rules.mak
diff --git a/cpp/test/IceStorm/single/Makefile.mak b/cpp/test/IceStorm/single/Makefile.mak
index 52212941858..068649f4c99 100644
--- a/cpp/test/IceStorm/single/Makefile.mak
+++ b/cpp/test/IceStorm/single/Makefile.mak
@@ -14,15 +14,15 @@ SUBSCRIBER	= subscriber.exe
 
 TARGETS		= $(PUBLISHER) $(SUBSCRIBER)
 
-OBJS		= Single.o
+OBJS		= Single.obj
 
-POBJS		= Publisher.o
+POBJS		= Publisher.obj
 
-SOBJS		= Subscriber.o
+SOBJS		= Subscriber.obj
 
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(POBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(POBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
 
 
 !include $(top_srcdir)/config/Make.rules.mak
diff --git a/cpp/test/IceUtil/ctrlCHandler/Makefile.mak b/cpp/test/IceUtil/ctrlCHandler/Makefile.mak
index 1e27b13947c..66569c0f2ad 100644
--- a/cpp/test/IceUtil/ctrlCHandler/Makefile.mak
+++ b/cpp/test/IceUtil/ctrlCHandler/Makefile.mak
@@ -13,10 +13,9 @@ CLIENT		= client.exe
 
 TARGETS		= $(CLIENT)
 
-OBJS		= Client.o
+OBJS		= Client.obj
 
-
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceUtil/inputUtil/Makefile.mak b/cpp/test/IceUtil/inputUtil/Makefile.mak
index 1e27b13947c..66569c0f2ad 100644
--- a/cpp/test/IceUtil/inputUtil/Makefile.mak
+++ b/cpp/test/IceUtil/inputUtil/Makefile.mak
@@ -13,10 +13,9 @@ CLIENT		= client.exe
 
 TARGETS		= $(CLIENT)
 
-OBJS		= Client.o
+OBJS		= Client.obj
 
-
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceUtil/thread/Makefile.mak b/cpp/test/IceUtil/thread/Makefile.mak
index af8fa776d8a..69a76d3c533 100644
--- a/cpp/test/IceUtil/thread/Makefile.mak
+++ b/cpp/test/IceUtil/thread/Makefile.mak
@@ -13,22 +13,21 @@ CLIENT		= client.exe
 
 TARGETS		= $(CLIENT)
 
-OBJS		= TestBase.o \
-		  CreateTest.o \
-		  AliveTest.o \
-		  StartTest.o \
-		  RWRecMutexTest.o \
-		  RecMutexTest.o \
-		  StaticMutexTest.o \
-		  MutexTest.o \
-		  MonitorMutexTest.o \
-		  MonitorRecMutexTest.o \
-                  CountDownLatchTest.o \
-		  TestSuite.o \
-		  Client.o
-
-
-SRCS		= $(OBJS:.o=.cpp)
+OBJS		= TestBase.obj \
+		  CreateTest.obj \
+		  AliveTest.obj \
+		  StartTest.obj \
+		  RWRecMutexTest.obj \
+		  RecMutexTest.obj \
+		  StaticMutexTest.obj \
+		  MutexTest.obj \
+		  MonitorMutexTest.obj \
+		  MonitorRecMutexTest.obj \
+                  CountDownLatchTest.obj \
+		  TestSuite.obj \
+		  Client.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceUtil/unicode/Makefile.mak b/cpp/test/IceUtil/unicode/Makefile.mak
index 1e27b13947c..66569c0f2ad 100644
--- a/cpp/test/IceUtil/unicode/Makefile.mak
+++ b/cpp/test/IceUtil/unicode/Makefile.mak
@@ -13,10 +13,9 @@ CLIENT		= client.exe
 
 TARGETS		= $(CLIENT)
 
-OBJS		= Client.o
+OBJS		= Client.obj
 
-
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak
 
diff --git a/cpp/test/IceUtil/uuid/Makefile.mak b/cpp/test/IceUtil/uuid/Makefile.mak
index 1e27b13947c..66569c0f2ad 100644
--- a/cpp/test/IceUtil/uuid/Makefile.mak
+++ b/cpp/test/IceUtil/uuid/Makefile.mak
@@ -13,10 +13,9 @@ CLIENT		= client.exe
 
 TARGETS		= $(CLIENT)
 
-OBJS		= Client.o
+OBJS		= Client.obj
 
-
-SRCS		= $(OBJS:.o=.cpp)
+SRCS		= $(OBJS:.obj=.cpp)
 
 !include $(top_srcdir)/config/Make.rules.mak