diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj
index 4e0b425df1d..012725fe77c 100644
--- a/cpp/src/Slice/msbuild/slice.vcxproj
+++ b/cpp/src/Slice/msbuild/slice.vcxproj
@@ -95,12 +95,7 @@
-
-
-
-
-
@@ -110,10 +105,7 @@
-
-
-
diff --git a/cpp/src/Slice/msbuild/slice.vcxproj.filters b/cpp/src/Slice/msbuild/slice.vcxproj.filters
index 6406fb562b9..60c5011d558 100644
--- a/cpp/src/Slice/msbuild/slice.vcxproj.filters
+++ b/cpp/src/Slice/msbuild/slice.vcxproj.filters
@@ -18,19 +18,12 @@
-
-
-
-
-
-
-
@@ -257,16 +250,11 @@
-
-
-
-
-
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 3af65f18cba..6d2d31d9fbb 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -13,7 +13,7 @@
#include
#include
#include
-#include
+#include "PHPUtil.h"
#include
#include
#include
diff --git a/cpp/src/Slice/PHPUtil.cpp b/cpp/src/slice2php/PHPUtil.cpp
similarity index 99%
rename from cpp/src/Slice/PHPUtil.cpp
rename to cpp/src/slice2php/PHPUtil.cpp
index 715049a57f1..0b29d95635a 100644
--- a/cpp/src/Slice/PHPUtil.cpp
+++ b/cpp/src/slice2php/PHPUtil.cpp
@@ -3,7 +3,7 @@
//
#include
-#include
+#include "PHPUtil.h"
#include
#include
#include
diff --git a/cpp/src/Slice/PHPUtil.h b/cpp/src/slice2php/PHPUtil.h
similarity index 100%
rename from cpp/src/Slice/PHPUtil.h
rename to cpp/src/slice2php/PHPUtil.h
diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj b/cpp/src/slice2php/msbuild/slice2php.vcxproj
index 02391c53bbd..0e24e15dee1 100644
--- a/cpp/src/slice2php/msbuild/slice2php.vcxproj
+++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj
@@ -105,6 +105,7 @@
+
@@ -120,6 +121,9 @@
+
+
+
diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters b/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters
index 62800ba8a81..6e0e4aa1315 100644
--- a/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters
+++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters
@@ -18,6 +18,9 @@
Source Files
+
+ Source Files
+
@@ -27,4 +30,9 @@
+
+
+ Header Files
+
+
\ No newline at end of file
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
index 79d17548cf7..8aa32854d79 100644
--- a/cpp/src/slice2py/Main.cpp
+++ b/cpp/src/slice2py/Main.cpp
@@ -2,7 +2,7 @@
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-#include
+#include "PythonUtil.h"
#include
#include
diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/slice2py/Python.cpp
similarity index 99%
rename from cpp/src/Slice/Python.cpp
rename to cpp/src/slice2py/Python.cpp
index f34b734257a..51dc5f5a826 100644
--- a/cpp/src/Slice/Python.cpp
+++ b/cpp/src/slice2py/Python.cpp
@@ -13,7 +13,7 @@
#include
#include
#include
-#include
+#include "PythonUtil.h"
#include
#include
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/slice2py/PythonUtil.cpp
similarity index 99%
rename from cpp/src/Slice/PythonUtil.cpp
rename to cpp/src/slice2py/PythonUtil.cpp
index 209bbb51acd..8e43ad8a705 100644
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/slice2py/PythonUtil.cpp
@@ -2,7 +2,7 @@
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-#include
+#include "PythonUtil.h"
#include
#include
#include
diff --git a/cpp/src/Slice/PythonUtil.h b/cpp/src/slice2py/PythonUtil.h
similarity index 100%
rename from cpp/src/Slice/PythonUtil.h
rename to cpp/src/slice2py/PythonUtil.h
diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj b/cpp/src/slice2py/msbuild/slice2py.vcxproj
index be5584d69e0..d22b23c726e 100644
--- a/cpp/src/slice2py/msbuild/slice2py.vcxproj
+++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj
@@ -105,6 +105,8 @@
+
+
@@ -120,6 +122,9 @@
+
+
+
diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters b/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters
index eb750eda368..a7bcd94d4ea 100644
--- a/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters
+++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters
@@ -18,6 +18,12 @@
Source Files
+
+ Source Files
+
+
+ Source Files
+
@@ -27,4 +33,9 @@
+
+
+ Header Files
+
+
\ No newline at end of file
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
index 7d4e755b724..a797e21dba1 100644
--- a/cpp/src/slice2rb/Main.cpp
+++ b/cpp/src/slice2rb/Main.cpp
@@ -2,7 +2,7 @@
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-#include
+#include "RubyUtil.h"
#include
#include
diff --git a/cpp/src/Slice/Ruby.cpp b/cpp/src/slice2rb/Ruby.cpp
similarity index 99%
rename from cpp/src/Slice/Ruby.cpp
rename to cpp/src/slice2rb/Ruby.cpp
index df07578e73a..47ea9de0d43 100644
--- a/cpp/src/Slice/Ruby.cpp
+++ b/cpp/src/slice2rb/Ruby.cpp
@@ -10,7 +10,7 @@
#include
#include
#include
-#include
+#include "RubyUtil.h"
#include
#include
diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/slice2rb/RubyUtil.cpp
similarity index 99%
rename from cpp/src/Slice/RubyUtil.cpp
rename to cpp/src/slice2rb/RubyUtil.cpp
index 762837d4736..bf4f5bc6f04 100644
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/slice2rb/RubyUtil.cpp
@@ -2,7 +2,7 @@
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-#include
+#include "RubyUtil.h"
#include
#include
#include
diff --git a/cpp/src/Slice/RubyUtil.h b/cpp/src/slice2rb/RubyUtil.h
similarity index 100%
rename from cpp/src/Slice/RubyUtil.h
rename to cpp/src/slice2rb/RubyUtil.h
diff --git a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
index e2e7a4e5c65..481aa4d0671 100644
--- a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
+++ b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
@@ -104,6 +104,8 @@
+
+
@@ -119,6 +121,9 @@
+
+
+
diff --git a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj.filters b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj.filters
index 45e70222c6a..0fd83f9ca5b 100644
--- a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj.filters
+++ b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj.filters
@@ -18,6 +18,12 @@
Source Files
+
+ Source Files
+
+
+ Source Files
+
@@ -27,4 +33,9 @@
+
+
+ Header Files
+
+
\ No newline at end of file
diff --git a/php/src/Makefile.mk b/php/src/Makefile.mk
index c8ab55f0f4e..64c488997fb 100644
--- a/php/src/Makefile.mk
+++ b/php/src/Makefile.mk
@@ -8,18 +8,16 @@ IcePHP_target := php-module
IcePHP_targetname := ice
IcePHP_targetdir := lib
IcePHP_installdir := $(install_phplibdir)
-IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/src $(ice_cpp_cppflags) $(php_cppflags)
+IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/src -I$(top_srcdir)/cpp/src/slice2php $(ice_cpp_cppflags) $(php_cppflags)
IcePHP_ldflags := $(php_ldflags)
IcePHP_dependencies := IceDiscovery++11 IceLocatorDiscovery++11 IceSSL++11 Ice++11
# TODO temporary ++11 dependencies are not linked
IcePHP_system_libs := -L$(top_srcdir)/cpp/lib/x86_64-linux-gnu \
-L$(top_srcdir)/cpp/lib \
-lIce++11 -lIceSSL++11 -lIceDiscovery++11 -lIceLocatorDiscovery++11
-IcePHP_extra_sources := $(filter-out %Util.cpp %Ruby.cpp,\
- $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \
- $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \
- $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp \
- $(top_srcdir)/cpp/src/Slice/StringLiteralUtil.cpp \
+
+IcePHP_extra_sources := $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp) \
+ $(top_srcdir)/cpp/src/slice2php/PHPUtil.cpp \
projects += $(project)
srcs:: $(project)
diff --git a/php/src/Operation.cpp b/php/src/Operation.cpp
index 3394dd3c6b1..7073379f846 100644
--- a/php/src/Operation.cpp
+++ b/php/src/Operation.cpp
@@ -8,7 +8,7 @@
#include "Types.h"
#include "Util.h"
-#include "Slice/PHPUtil.h"
+#include "PHPUtil.h"
using namespace std;
using namespace IcePHP;
diff --git a/php/src/Types.cpp b/php/src/Types.cpp
index d9a3cd6c77b..f1e96291c93 100644
--- a/php/src/Types.cpp
+++ b/php/src/Types.cpp
@@ -8,7 +8,7 @@
#include
#include
-#include
+#include "PHPUtil.h"
#include
#include
diff --git a/php/src/Util.cpp b/php/src/Util.cpp
index 98fb27546d6..71fe550e616 100644
--- a/php/src/Util.cpp
+++ b/php/src/Util.cpp
@@ -5,7 +5,7 @@
#include "Util.h"
#include
-#include
+#include "PHPUtil.h"
#include
#include
diff --git a/python/modules/IcePy/Makefile.mk b/python/modules/IcePy/Makefile.mk
index 28b4139a5e9..06645c1ea8a 100644
--- a/python/modules/IcePy/Makefile.mk
+++ b/python/modules/IcePy/Makefile.mk
@@ -8,15 +8,13 @@ IcePy_target := python-module
IcePy_targetname := IcePy
IcePy_targetdir := $(lang_srcdir)/python
IcePy_installdir := $(install_pythondir)
-IcePy_cppflags := -I$(project) $(ice_cpp_cppflags) -I$(top_srcdir)/cpp/src $(python_cppflags)
+IcePy_cppflags := -I$(project) $(ice_cpp_cppflags) -I$(top_srcdir)/cpp/src -I$(top_srcdir)/cpp/src/slice2py $(python_cppflags)
IcePy_system_libs := $(python_ldflags)
IcePy_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice
IcePy_libs := mcpp
-IcePy_extra_sources := $(filter-out %Util.cpp %Ruby.cpp,\
- $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \
- $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \
- $(top_srcdir)/cpp/src/Slice/PythonUtil.cpp \
- $(top_srcdir)/cpp/src/Slice/StringLiteralUtil.cpp \
+IcePy_extra_sources := $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp) \
+ $(top_srcdir)/cpp/src/slice2py/PythonUtil.cpp \
+ $(top_srcdir)/cpp/src/slice2py/Python.cpp \
#
# On the default platform, always write the module in the python directory.
diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp
index 5b63c2cabd2..52d8954b4f5 100644
--- a/python/modules/IcePy/Operation.cpp
+++ b/python/modules/IcePy/Operation.cpp
@@ -20,7 +20,7 @@
#include
#include
#include
-#include
+#include "PythonUtil.h"
using namespace std;
using namespace IcePy;
diff --git a/python/modules/IcePy/Slice.cpp b/python/modules/IcePy/Slice.cpp
index a30829f50dc..713d95281b6 100644
--- a/python/modules/IcePy/Slice.cpp
+++ b/python/modules/IcePy/Slice.cpp
@@ -5,7 +5,7 @@
#include
#include
#include
-#include
+#include "PythonUtil.h"
#include
#include
#include
diff --git a/python/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp
index 2d7a2847a05..55404fc0cf8 100644
--- a/python/modules/IcePy/Util.cpp
+++ b/python/modules/IcePy/Util.cpp
@@ -7,7 +7,7 @@
#include
#include
#include
-#include
+#include "PythonUtil.h"
#include
#include
diff --git a/python/modules/IcePy/msbuild/icepy.vcxproj b/python/modules/IcePy/msbuild/icepy.vcxproj
index 5ec854cdc8c..2887c6e60de 100644
--- a/python/modules/IcePy/msbuild/icepy.vcxproj
+++ b/python/modules/IcePy/msbuild/icepy.vcxproj
@@ -1,6 +1,5 @@
-
+
Debug
@@ -20,12 +19,12 @@
+
+
-
-
@@ -52,6 +51,7 @@
+
@@ -205,4 +205,4 @@
CopyDependencies
-
+
\ No newline at end of file
diff --git a/python/modules/IcePy/msbuild/icepy.vcxproj.filters b/python/modules/IcePy/msbuild/icepy.vcxproj.filters
index 65c89738e94..0eb9afe79ef 100644
--- a/python/modules/IcePy/msbuild/icepy.vcxproj.filters
+++ b/python/modules/IcePy/msbuild/icepy.vcxproj.filters
@@ -1,6 +1,5 @@
-
+
{2a1af2ab-9818-4227-b57f-db37b32a9941}
@@ -85,12 +84,6 @@
Source Files
-
- Source Files
-
-
- Source Files
-
Source Files
@@ -101,6 +94,12 @@
Source Files
+
+ Source Files
+
+
+ Source Files
+
@@ -166,6 +165,9 @@
Header Files
+
+ Header Files
+
@@ -175,4 +177,4 @@
-
+
\ No newline at end of file
diff --git a/python/msbuild/ice.props b/python/msbuild/ice.props
index 5a0b1a159be..66a3f39e09d 100644
--- a/python/msbuild/ice.props
+++ b/python/msbuild/ice.props
@@ -17,7 +17,7 @@
- ..;$(PythonHome)\include;%(AdditionalIncludeDirectories)
+ ..;..\..\..\..\cpp\src\slice2py;$(PythonHome)\include;%(AdditionalIncludeDirectories)
$(PythonHome)\libs;%(AdditionalLibraryDirectories)
diff --git a/ruby/src/IceRuby/Makefile.mk b/ruby/src/IceRuby/Makefile.mk
index 92f53895ba8..1d478dd1c4e 100644
--- a/ruby/src/IceRuby/Makefile.mk
+++ b/ruby/src/IceRuby/Makefile.mk
@@ -8,7 +8,8 @@ IceRuby_target := ruby-module
IceRuby_targetname := IceRuby
IceRuby_targetdir := $(lang_srcdir)/ruby
IceRuby_installdir := $(install_rubylibdir)
-IceRuby_cppflags := -I$(project) $(ice_cpp_cppflags) -I$(top_srcdir)/cpp/src $(ruby_cppflags) -DICE_CPP11_MAPPING
+IceRuby_cppflags := -I$(project) $(ice_cpp_cppflags) -I$(top_srcdir)/cpp/src -I$(top_srcdir)/cpp/src/slice2rb \
+ $(ruby_cppflags) -DICE_CPP11_MAPPING
IceRuby_system_libs := $(ruby_ldflags)
IceRubydependencies := IceDiscovery++11 IceLocatorDiscovery++11 IceSSL++11 Ice++11
# TODO temporary ++11 dependencies are not linked
@@ -16,11 +17,9 @@ IceRuby_system_libs += -L$(top_srcdir)/cpp/lib/x86_64-linux-gnu \
-L$(top_srcdir)/cpp/lib \
-lIce++11 -lIceSSL++11 -lIceDiscovery++11 -lIceLocatorDiscovery++11
IceRuby_libs := mcpp
-IceRuby_extra_sources := $(filter-out %Util.cpp %Python.cpp,\
- $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \
- $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \
- $(top_srcdir)/cpp/src/Slice/RubyUtil.cpp \
- $(top_srcdir)/cpp/src/Slice/StringLiteralUtil.cpp
+IceRuby_extra_sources := $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp) \
+ $(top_srcdir)/cpp/src/slice2rb/RubyUtil.cpp \
+ (top_srcdir)/cpp/src/slice2rb/Ruby.cpp \
#
# On the default platform, always write the module in the ruby directory.
diff --git a/ruby/src/IceRuby/Operation.cpp b/ruby/src/IceRuby/Operation.cpp
index b8cb24f91eb..d3e4677dccb 100644
--- a/ruby/src/IceRuby/Operation.cpp
+++ b/ruby/src/IceRuby/Operation.cpp
@@ -13,7 +13,7 @@
#include
#include
#include
-#include
+#include "RubyUtil.h"
#include
diff --git a/ruby/src/IceRuby/Slice.cpp b/ruby/src/IceRuby/Slice.cpp
index 98f1eb7c4d8..c61ee16f02d 100644
--- a/ruby/src/IceRuby/Slice.cpp
+++ b/ruby/src/IceRuby/Slice.cpp
@@ -5,7 +5,7 @@
#include
#include
#include
-#include
+#include "RubyUtil.h"
#include
#include