21 files changed, 206 insertions, 394 deletions
diff --git a/php/src/IcePHP/.depend b/php/src/IcePHP/.depend
new file mode 100644
index 00000000000..77ac40ac4f0
--- /dev/null
+++ b/php/src/IcePHP/.depend
@@ -0,0 +1,6 @@
+Communicator$(OBJEXT): Communicator.cpp ./Communicator.h ./Config.h ./Proxy.h ./Marshal.h ./Util.h
+Init$(OBJEXT): Init.cpp ./Communicator.h ./Config.h ./Marshal.h ./Profile.h ./Proxy.h ./Util.h
+Marshal$(OBJEXT): Marshal.cpp ./Marshal.h ./Config.h ./Profile.h ./Proxy.h ./Util.h
+Profile$(OBJEXT): Profile.cpp ./Profile.h ./Config.h ./Util.h
+Proxy$(OBJEXT): Proxy.cpp ./Proxy.h ./Config.h ./Communicator.h ./Marshal.h ./Profile.h ./Util.h
+Util$(OBJEXT): Util.cpp ./Util.h ./Config.h
diff --git a/php/src/ice/communicator.cpp b/php/src/IcePHP/Communicator.cpp
index 4698631317c..ba548449ce2 100644
--- a/php/src/ice/communicator.cpp
+++ b/php/src/IcePHP/Communicator.cpp
@@ -7,15 +7,11 @@
 //
 // **********************************************************************
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <IceUtil/DisableWarnings.h>
-#include "ice_communicator.h"
-#include "ice_proxy.h"
-#include "ice_marshal.h"
-#include "ice_util.h"
+#include <Communicator.h>
+#include <Proxy.h>
+#include <Marshal.h>
+#include <Util.h>
 
 using namespace std;
 using namespace IcePHP;
@@ -357,7 +353,6 @@ ZEND_FUNCTION(Ice_Communicator_addObjectFactory)
         return;
     }
     assert(obj->ptr);
-    Ice::CommunicatorPtr* _this = static_cast<Ice::CommunicatorPtr*>(obj->ptr);
 
     zval* zfactory;
     char* id;
@@ -426,7 +421,6 @@ ZEND_FUNCTION(Ice_Communicator_findObjectFactory)
         RETURN_NULL();
     }
     assert(obj->ptr);
-    Ice::CommunicatorPtr* _this = static_cast<Ice::CommunicatorPtr*>(obj->ptr);
 
     char* id;
     int len;
diff --git a/php/src/ice/ice_communicator.h b/php/src/IcePHP/Communicator.h
index 6783c5b6f81..4e5862225eb 100644
--- a/php/src/ice/ice_communicator.h
+++ b/php/src/IcePHP/Communicator.h
@@ -7,10 +7,10 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PHP_ICE_COMMUNICATOR_H
-#define ICE_PHP_ICE_COMMUNICATOR_H
+#ifndef ICE_PHP_COMMUNICATOR_H
+#define ICE_PHP_COMMUNICATOR_H
 
-#include "ice_common.h"
+#include <Config.h>
 
 //
 // Ice_Communicator class methods.
diff --git a/php/src/ice/ice_common.h b/php/src/IcePHP/Config.h
index 939661237fb..50ae01f00e7 100644
--- a/php/src/ice/ice_common.h
+++ b/php/src/IcePHP/Config.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PHP_ICE_COMMON_H
-#define ICE_PHP_ICE_COMMON_H
+#ifndef ICE_PHP_CONFIG_H
+#define ICE_PHP_CONFIG_H
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
     // Necessary for TryEnterCriticalSection. VC 7.x only.
@@ -39,6 +39,37 @@ extern "C"
 }
 #endif
 
-#include "php_ice.h"
+extern zend_module_entry ice_module_entry;
+#define phpext_ice_ptr &ice_module_entry
+
+#ifdef PHP_WIN32
+#define PHP_ICE_API __declspec(dllexport)
+#else
+#define PHP_ICE_API
+#endif
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+ZEND_MINIT_FUNCTION(ice);
+ZEND_MSHUTDOWN_FUNCTION(ice);
+ZEND_RINIT_FUNCTION(ice);
+ZEND_RSHUTDOWN_FUNCTION(ice);
+ZEND_MINFO_FUNCTION(ice);
+
+ZEND_BEGIN_MODULE_GLOBALS(ice)
+    zval* communicator;
+    void* marshalerMap;
+    void* profile;
+    void* properties;
+    void* objectFactoryMap;
+ZEND_END_MODULE_GLOBALS(ice)
+
+#ifdef ZTS
+#define ICE_G(v) TSRMG(ice_globals_id, zend_ice_globals*, v)
+#else
+#define ICE_G(v) (ice_globals.v)
+#endif
 
 #endif
diff --git a/php/src/ice/ice.cpp b/php/src/IcePHP/Init.cpp
index 0ef2314a12c..9441fffd8c4 100644
--- a/php/src/ice/ice.cpp
+++ b/php/src/IcePHP/Init.cpp
@@ -7,15 +7,11 @@
 //
 // **********************************************************************
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "ice_communicator.h"
-#include "ice_marshal.h"
-#include "ice_profile.h"
-#include "ice_proxy.h"
-#include "ice_util.h"
+#include <Communicator.h>
+#include <Marshal.h>
+#include <Profile.h>
+#include <Proxy.h>
+#include <Util.h>
 
 using namespace std;
 using namespace IcePHP;
@@ -48,9 +44,7 @@ zend_module_entry ice_module_entry =
     STANDARD_MODULE_PROPERTIES
 };
 
-#ifdef COMPILE_DL_ICE
 ZEND_GET_MODULE(ice)
-#endif
 
 //
 // Declare initialization file entries.
@@ -139,8 +133,8 @@ ZEND_RSHUTDOWN_FUNCTION(ice)
     for(ObjectFactoryMap::iterator p = ofm->begin(); p != ofm->end(); ++p)
     {
         zval* factory = p->second;
-        zend_call_method_with_0_params(&p->second, NULL, NULL, "destroy", NULL);
-        zval_ptr_dtor(&p->second);
+        zend_call_method_with_0_params(&factory, NULL, NULL, "destroy", NULL);
+        zval_ptr_dtor(&factory);
     }
     delete ofm;
 
@@ -155,7 +149,6 @@ ZEND_MINFO_FUNCTION(ice)
     php_info_print_table_start();
     php_info_print_table_header(2, "Ice support", "enabled");
     php_info_print_table_row(2, "Ice version", ICE_STRING_VERSION);
-    php_info_print_table_row(2, "IcePHP version", ICEPHP_STRING_VERSION);
     php_info_print_table_end();
 
     DISPLAY_INI_ENTRIES();
diff --git a/php/src/IcePHP/Makefile b/php/src/IcePHP/Makefile
new file mode 100644
index 00000000000..9e52974c117
--- /dev/null
+++ b/php/src/IcePHP/Makefile
@@ -0,0 +1,39 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir	= ../..
+
+LIBNAME		= $(call mkphplibname,IcePHP)
+SONAME          = $(LIBNAME)
+
+TARGETS		= $(libdir)/$(LIBNAME)
+
+OBJS		= Communicator.o \
+		  Init.o \
+		  Marshal.o \
+		  Profile.o \
+		  Proxy.o \
+		  Util.o
+
+SRCS		= $(OBJS:.o=.cpp)
+
+include $(top_srcdir)/config/Make.rules
+
+CPPFLAGS	:= -I. $(CPPFLAGS) $(ICE_FLAGS) $(PHP_FLAGS)
+
+LINKWITH        := $(ICE_LIBS) $(PHP_LIBS) $(CXXLIBS)
+
+$(libdir)/$(LIBNAME): $(OBJS)
+	rm -f $@
+	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
+
+install:: all
+	$(call installphplib,$(libdir)/$(LIBNAME),$(install_libdir))
+
+include .depend
diff --git a/php/src/IcePHP/Makefile.mak b/php/src/IcePHP/Makefile.mak
new file mode 100644
index 00000000000..b3bb3f8d8fa
--- /dev/null
+++ b/php/src/IcePHP/Makefile.mak
@@ -0,0 +1,45 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir	= ..\..
+
+LIBNAME		= php_ice$(LIBSUFFIX).lib
+DLLNAME         = $(bindir)\php_ice$(LIBSUFFIX).dll
+
+TARGETS		= $(LIBNAME) $(DLLNAME)
+
+OBJS		= Communicator.obj \
+		  Init.obj \
+		  Marshal.obj \
+		  Profile.obj \
+		  Proxy.obj \
+		  Util.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS	= -I. -I.. $(CPPFLAGS) $(ICE_CPPFLAGS) $(PHP_CPPFLAGS) 
+!if "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(LIBNAME:.lib=.pdb)
+!endif
+
+LINKWITH        = $(ICE_LIBS) $(CXXLIBS)
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS)
+	$(LINK) $(ICE_LDFLAGS) $(LD_DLLFLAGS) $(PDBFLAGS) /export:get_module $(OBJS) \
+		$(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH)
+	move $(DLLNAME:.dll=.lib) $(LIBNAME)
+
+install:: all
+	copy $(DLLNAME) $(install_bindir)
+
+!include .depend
diff --git a/php/src/ice/marshal.cpp b/php/src/IcePHP/Marshal.cpp
index 908741d11fc..68c6ddc3200 100644
--- a/php/src/ice/marshal.cpp
+++ b/php/src/IcePHP/Marshal.cpp
@@ -7,14 +7,10 @@
 //
 // **********************************************************************
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "ice_marshal.h"
-#include "ice_profile.h"
-#include "ice_proxy.h"
-#include "ice_util.h"
+#include <Marshal.h>
+#include <Profile.h>
+#include <Proxy.h>
+#include <Util.h>
 
 #include <IceUtil/InputUtil.h>
 #include <IceUtil/ScopedArray.h>
diff --git a/php/src/ice/ice_marshal.h b/php/src/IcePHP/Marshal.h
index 82a26699d09..68c768508f9 100644
--- a/php/src/ice/ice_marshal.h
+++ b/php/src/IcePHP/Marshal.h
@@ -7,10 +7,10 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PHP_ICE_MARSHAL_H
-#define ICE_PHP_ICE_MARSHAL_H
+#ifndef ICE_PHP_MARSHAL_H
+#define ICE_PHP_MARSHAL_H
 
-#include "ice_common.h"
+#include <Config.h>
 
 namespace IcePHP
 {
diff --git a/php/src/ice/profile.cpp b/php/src/IcePHP/Profile.cpp
index 37635e1ef27..e738527f900 100644
--- a/php/src/ice/profile.cpp
+++ b/php/src/IcePHP/Profile.cpp
@@ -7,12 +7,8 @@
 //
 // **********************************************************************
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "ice_profile.h"
-#include "ice_util.h"
+#include <Profile.h>
+#include <Util.h>
 
 #include <Slice/Preprocessor.h>
 #include <IceUtil/Options.h>
diff --git a/php/src/ice/ice_profile.h b/php/src/IcePHP/Profile.h
index 45c7721482a..76cf462569f 100644
--- a/php/src/ice/ice_profile.h
+++ b/php/src/IcePHP/Profile.h
@@ -7,10 +7,10 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PHP_ICE_PROFILE_H
-#define ICE_PHP_ICE_PROFILE_H
+#ifndef ICE_PHP_PROFILE_H
+#define ICE_PHP_PROFILE_H
 
-#include "ice_common.h"
+#include <Config.h>
 
 //
 // Global functions.
diff --git a/php/src/ice/proxy.cpp b/php/src/IcePHP/Proxy.cpp
index f88e7daa21d..48b06536bf6 100644
--- a/php/src/ice/proxy.cpp
+++ b/php/src/IcePHP/Proxy.cpp
@@ -7,16 +7,12 @@
 //
 // **********************************************************************
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <IceUtil/DisableWarnings.h>
-#include "ice_proxy.h"
-#include "ice_communicator.h"
-#include "ice_marshal.h"
-#include "ice_profile.h"
-#include "ice_util.h"
+#include <Proxy.h>
+#include <Communicator.h>
+#include <Marshal.h>
+#include <Profile.h>
+#include <Util.h>
 
 using namespace std;
 using namespace IcePHP;
@@ -199,7 +195,6 @@ static function_entry _proxyMethods[] =
     {"ice_timeout",                PHP_FN(Ice_ObjectPrx_ice_timeout),                NULL},
     {"ice_connectionId",           PHP_FN(Ice_ObjectPrx_ice_connectionId),           NULL},
     {"ice_getConnection",          PHP_FN(Ice_ObjectPrx_ice_getConnection),          NULL},
-    {"ice_getCachedConnection",    PHP_FN(Ice_ObjectPrx_ice_getCachedConnection),    NULL},
     {"ice_uncheckedCast",          PHP_FN(Ice_ObjectPrx_ice_uncheckedCast),          NULL},
     {"ice_checkedCast",            PHP_FN(Ice_ObjectPrx_ice_checkedCast),            NULL},
     {NULL, NULL, NULL}
@@ -1544,32 +1539,6 @@ ZEND_FUNCTION(Ice_ObjectPrx_ice_getConnection)
     }
 }
 
-ZEND_FUNCTION(Ice_ObjectPrx_ice_getCachedConnection)
-{
-    if(ZEND_NUM_ARGS() != 0)
-    {
-	WRONG_PARAM_COUNT;
-    }
-
-    ice_object* obj = static_cast<ice_object*>(zend_object_store_get_object(getThis() TSRMLS_CC));
-    assert(obj->ptr);
-    Proxy* _this = static_cast<Proxy*>(obj->ptr);
-
-    try
-    {
-	Ice::ConnectionPtr con = _this->getProxy()->ice_getCachedConnection();
-	if(!con || !createConnection(return_value, con TSRMLS_CC))
-	{
-	    RETURN_NULL();
-	}
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-	throwException(ex TSRMLS_CC);
-	RETURN_NULL();
-    }
-}
-
 static void
 do_cast(INTERNAL_FUNCTION_PARAMETERS, bool check)
 {
@@ -2107,7 +2076,7 @@ IcePHP::Operation::throwUserException(Ice::InputStreamPtr& is TSRMLS_DC)
 {
     Slice::UnitPtr unit = _op->unit();
 
-    bool usesClasses = is->readBool();
+    is->readBool(); // usesClasses
 
     string id = is->readString();
     while(!id.empty())
diff --git a/php/src/ice/ice_proxy.h b/php/src/IcePHP/Proxy.h
index ce475301605..10dcd6e125b 100644
--- a/php/src/ice/ice_proxy.h
+++ b/php/src/IcePHP/Proxy.h
@@ -7,10 +7,10 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PHP_ICE_PROXY_H
-#define ICE_PHP_ICE_PROXY_H
+#ifndef ICE_PHP_PROXY_H
+#define ICE_PHP_PROXY_H
 
-#include "ice_common.h"
+#include <Config.h>
 
 //
 // Ice_ObjectPrx class methods.
@@ -58,7 +58,6 @@ ZEND_FUNCTION(Ice_ObjectPrx_ice_compress);
 ZEND_FUNCTION(Ice_ObjectPrx_ice_timeout);
 ZEND_FUNCTION(Ice_ObjectPrx_ice_connectionId);
 ZEND_FUNCTION(Ice_ObjectPrx_ice_getConnection);
-ZEND_FUNCTION(Ice_ObjectPrx_ice_getCachedConnection);
 ZEND_FUNCTION(Ice_ObjectPrx_ice_uncheckedCast);
 ZEND_FUNCTION(Ice_ObjectPrx_ice_checkedCast);
 
@@ -117,7 +116,6 @@ ZEND_FUNCTION(Ice_Connection_toString);
     ZEND_FE(Ice_ObjectPrx_ice_timeout, 			NULL) \
     ZEND_FE(Ice_ObjectPrx_ice_connectionId, 		NULL) \
     ZEND_FE(Ice_ObjectPrx_ice_getConnection, 		NULL) \
-    ZEND_FE(Ice_ObjectPrx_ice_getCachedConnection, 	NULL) \
     ZEND_FE(Ice_ObjectPrx_ice_uncheckedCast, 		NULL) \
     ZEND_FE(Ice_ObjectPrx_ice_checkedCast, 		NULL)
 
diff --git a/php/src/ice/util.cpp b/php/src/IcePHP/Util.cpp
index 7bf85e5e6e6..a7f3c81b456 100644
--- a/php/src/ice/util.cpp
+++ b/php/src/IcePHP/Util.cpp
@@ -7,11 +7,7 @@
 //
 // **********************************************************************
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "ice_util.h"
+#include <Util.h>
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/IdentityUtil.h>
 #include <algorithm>
@@ -210,9 +206,6 @@ IcePHP::extractIdentity(zval* zv, Ice::Identity& id TSRMLS_DC)
 bool
 IcePHP::createContext(zval* zv, const Ice::Context& ctx TSRMLS_DC)
 {
-    zend_class_entry* cls = findClass("Ice_Identity" TSRMLS_CC);
-    assert(cls);
-
     array_init(zv);
     for(Ice::Context::const_iterator p = ctx.begin(); p != ctx.end(); ++p)
     {
diff --git a/php/src/ice/ice_util.h b/php/src/IcePHP/Util.h
index abcec9a4d93..23a8fc4e690 100644
--- a/php/src/ice/ice_util.h
+++ b/php/src/IcePHP/Util.h
@@ -7,10 +7,10 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PHP_ICE_UTIL_H
-#define ICE_PHP_ICE_UTIL_H
+#ifndef ICE_PHP_UTIL_H
+#define ICE_PHP_UTIL_H
 
-#include "ice_common.h"
+#include <Config.h>
 
 //
 // Ice_Identity global functions.
diff --git a/php/src/Makefile b/php/src/Makefile
new file mode 100644
index 00000000000..55e6b1c3b24
--- /dev/null
+++ b/php/src/Makefile
@@ -0,0 +1,24 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir	= ..
+
+include $(top_srcdir)/config/Make.rules
+
+SUBDIRS		= IcePHP
+
+$(EVERYTHING)::
+	@for subdir in $(SUBDIRS); \
+	do \
+	    if test -d $$subdir ; \
+	    then \
+		echo "making $@ in $$subdir"; \
+		( cd $$subdir && $(MAKE) $@ ) || exit 1; \
+	    fi; \
+	done
diff --git a/php/src/Makefile.mak b/php/src/Makefile.mak
new file mode 100644
index 00000000000..c6d2ce88210
--- /dev/null
+++ b/php/src/Makefile.mak
@@ -0,0 +1,19 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir	= ..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS		= IcePHP
+
+$(EVERYTHING)::
+	@for %i in ( $(SUBDIRS) ) do \
+	    @echo "making $@ in %i" & \
+	    cmd /c "cd %i & $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/php/src/ice/.cvsignore b/php/src/ice/.cvsignore
deleted file mode 100644
index da7f324ebec..00000000000
--- a/php/src/ice/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-*.lo
-*.la
diff --git a/php/src/ice/config.m4 b/php/src/ice/config.m4
deleted file mode 100644
index 8b55af56751..00000000000
--- a/php/src/ice/config.m4
+++ /dev/null
@@ -1,57 +0,0 @@
-dnl $Id$
-dnl config.m4 for extension ice
-
-dnl Comments in this file start with the string 'dnl'.
-dnl Remove where necessary. This file will not work
-dnl without editing.
-
-PHP_ARG_WITH(ice, for Ice support,
-[  --with-ice              Include Ice support])
-
-if test "$PHP_ICE" != "no"; then
-
-  SEARCH_PATH="/usr/local /usr"
-  SEARCH_FOR="/include/Ice/Ice.h"
-  if test -r $PHP_ICE/$SEARCH_FOR; then # path given as parameter
-    ICE_DIR=$PHP_ICE
-  else # search default path list
-    AC_MSG_CHECKING([for Ice files in default path])
-    for i in $SEARCH_PATH ; do
-      if test -r $i/$SEARCH_FOR; then
-        ICE_DIR=$i
-        AC_MSG_RESULT(found in $i)
-      fi
-    done
-  fi
-  
-  if test -z "$ICE_DIR"; then
-    AC_MSG_RESULT([not found])
-    AC_MSG_ERROR([Please reinstall the Ice distribution from http://www.zeroc.com])
-  fi
-
-  PHP_ADD_INCLUDE($ICE_DIR/include)
-
-  PHP_REQUIRE_CXX()
-  PHP_ADD_LIBPATH($ICE_DIR/lib, ICE_SHARED_LIBADD)
-  PHP_ADD_LIBRARY(Ice, 1, ICE_SHARED_LIBADD)
-  PHP_ADD_LIBRARY(Slice, 1, ICE_SHARED_LIBADD)
-  PHP_ADD_LIBRARY(IceUtil, 1, ICE_SHARED_LIBADD)
-  case $host_os in
-  solaris*)
-    if test "$GXX" != "yes"; then
-      PHP_ADD_LIBRARY(Cstd, 1, ICE_SHARED_LIBADD)
-      PHP_ADD_LIBRARY(Crun, 1, ICE_SHARED_LIBADD)
-    fi
-  ;;
-  esac
-
-  sources="ice.cpp \
-           communicator.cpp \
-           marshal.cpp \
-           profile.cpp \
-           proxy.cpp \
-           util.cpp"
-
-  PHP_SUBST(ICE_SHARED_LIBADD)
-  PHP_NEW_EXTENSION(ice, $sources, $ext_shared,,,yes)
-fi
diff --git a/php/src/ice/php_ice.dsp b/php/src/ice/php_ice.dsp
deleted file mode 100644
index 37d85f9bd98..00000000000
--- a/php/src/ice/php_ice.dsp
+++ /dev/null
@@ -1,169 +0,0 @@
-# Microsoft Developer Studio Project File - Name="php_ice" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=php_ice - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "php_ice.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "php_ice.mak" CFG="php_ice - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "php_ice - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php_ice - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "php_ice - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICE_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /D HAVE_ICE=1 /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "WIN32" /D "PHP_WIN32" /D "ZEND_WIN32" /D "ZTS" /D ZEND_DEBUG=0 /D "COMPILE_DL_ICE" /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 Ice.lib Slice.lib IceUtil.lib php5ts.lib /nologo /dll /machine:I386
-# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-OutDir=.\Release
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\php_ice.dll ..\..\bin\release
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "php_ice - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICE_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /D "_DEBUG" /D HAVE_ICE=1 /D "_WINDOWS" /D "_UNICODE" /D "WIN32" /D "PHP_WIN32" /D "ZEND_WIN32" /D "ZTS" /D ZEND_DEBUG=1 /D "COMPILE_DL_ICE" /FD /GZ /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 Iced.lib Sliced.lib IceUtild.lib php5ts_debug.lib /nologo /dll /debug /machine:I386
-# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-OutDir=.\Debug
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\php_ice.pdb ..\..\bin\debug	copy $(OutDir)\php_ice.dll ..\..\bin\debug
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "php_ice - Win32 Release"
-# Name "php_ice - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\communicator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\marshal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\profile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\proxy.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\util.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\ice_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ice_communicator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ice_marshal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ice_profile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ice_proxy.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ice_util.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\php_ice.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/php/src/ice/php_ice.h b/php/src/ice/php_ice.h
deleted file mode 100644
index 31f93642cc3..00000000000
--- a/php/src/ice/php_ice.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/************************************************************************
- *
- * Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
- *
- * This copy of Ice is licensed to you under the terms described in the
- * ICE_LICENSE file included in this distribution.
- *
- ************************************************************************/
-
-#ifndef PHP_ICE_H
-#define PHP_ICE_H
-
-#define ICEPHP_STRING_VERSION "3.2.0"
-#define ICEPHP_INT_VERSION 30200      /* AABBCC, with AA=major, BB=minor, CC=patch */
-
-/*
- * This file may be included by PHP's build system, therefore we have
- * to guard the use of 'extern "C"'.
- */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern zend_module_entry ice_module_entry;
-#define phpext_ice_ptr &ice_module_entry
-
-#ifdef PHP_WIN32
-#define PHP_ICE_API __declspec(dllexport)
-#else
-#define PHP_ICE_API
-#endif
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-ZEND_MINIT_FUNCTION(ice);
-ZEND_MSHUTDOWN_FUNCTION(ice);
-ZEND_RINIT_FUNCTION(ice);
-ZEND_RSHUTDOWN_FUNCTION(ice);
-ZEND_MINFO_FUNCTION(ice);
-
-ZEND_BEGIN_MODULE_GLOBALS(ice)
-    zval* communicator;
-    void* marshalerMap;
-    void* profile;
-    void* properties;
-    void* objectFactoryMap;
-ZEND_END_MODULE_GLOBALS(ice)
-
-#ifdef ZTS
-#define ICE_G(v) TSRMG(ice_globals_id, zend_ice_globals*, v)
-#else
-#define ICE_G(v) (ice_globals.v)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* PHP_ICE_H */