Re-organize the Tools Core public headers (2/2).

Fix all files that reference the old headers. No real code changes
here.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/hgfsclient/hgfsclient.c b/open-vm-tools/hgfsclient/hgfsclient.c
index efc5fd2160d1e8ba281c759982095a01612355fd..f387483bcfd1a3dcb444cf56c418dd08bc2eed61 100644 (file)
--- a/open-vm-tools/hgfsclient/hgfsclient.c
+++ b/open-vm-tools/hgfsclient/hgfsclient.c
@@ -34,7 +34,7 @@
 #include "hgfsProto.h"
 #include "conf.h"
 #include "str.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 #include "hgfsclient_version.h"
 #include "embed_version.h"

diff --git a/open-vm-tools/lib/rpcChannel/rpcChannelInt.h b/open-vm-tools/lib/rpcChannel/rpcChannelInt.h
index f58f0465b0a61e640796a33f43b7c437ddf4e746..67aef37a4dca56b9c1c440e00efd503e771cd6a9 100644 (file)
--- a/open-vm-tools/lib/rpcChannel/rpcChannelInt.h
+++ b/open-vm-tools/lib/rpcChannel/rpcChannelInt.h
@@ -25,7 +25,7 @@
  *    Internal definitions for the RPC channel library.
  */
 
-#include "rpcChannel.h"
+#include "vmware/tools/guestrpc.h"
 
 void
 RpcChannel_Error(void *_state,

diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c
index 3fbd342de80706c1b50215740bd6eaca88826dbc..3984203f1c484db7c50a95bcb70b40497dcdf1de 100644 (file)
--- a/open-vm-tools/lib/rpcIn/rpcin.c
+++ b/open-vm-tools/lib/rpcIn/rpcin.c
@@ -45,7 +45,7 @@
 #endif
 
 #if defined(VMTOOLS_USE_GLIB)
-#  include "rpcChannel.h"
+#  include "vmware/tools/guestrpc.h"
 #endif
 
 #include "vmware.h"

diff --git a/open-vm-tools/libvmtools/signalSource.c b/open-vm-tools/libvmtools/signalSource.c
index a35b1dcab5239e2b3e015ccf27aac08a69bcf3b0..0e8ea354c404d7e352a022d1831739aa958d3f5d 100644 (file)
--- a/open-vm-tools/libvmtools/signalSource.c
+++ b/open-vm-tools/libvmtools/signalSource.c
@@ -28,7 +28,7 @@
  */
 
 #include "vm_assert.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>

diff --git a/open-vm-tools/libvmtools/vmtools.c b/open-vm-tools/libvmtools/vmtools.c
index fde18b76ff4c418439f6064111cf0e31aadd3249..544a49188fd20a899e19ed2d3f3ad1fffc106206 100644 (file)
--- a/open-vm-tools/libvmtools/vmtools.c
+++ b/open-vm-tools/libvmtools/vmtools.c
@@ -34,8 +34,8 @@
 #endif
 
 #include "vm_assert.h"
-#include "vmtools.h"
 #include "wiper.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"

diff --git a/open-vm-tools/libvmtools/vmtoolsConfig.c b/open-vm-tools/libvmtools/vmtoolsConfig.c
index 32489324eeec05f9281322ac678299c1f5c28438..db7b262d549cbb73a24b0e4566647634cd0164b7 100644 (file)
--- a/open-vm-tools/libvmtools/vmtoolsConfig.c
+++ b/open-vm-tools/libvmtools/vmtoolsConfig.c
@@ -23,12 +23,12 @@
  *    automatically migrating from old-style tools configuration files.
  */
 
+#include "vmware/tools/utils.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gstdio.h>
-#include "vmtools.h"
 #include "conf.h"
 #include "file.h"
 #include "guestApp.h"

diff --git a/open-vm-tools/libvmtools/vmtoolsLog.c b/open-vm-tools/libvmtools/vmtoolsLog.c
index 815f781e2a88e55d17739d4fd1cadaf5e62cab72..d0821209d03e936f215cb318e48d57ec7893fd52 100644 (file)
--- a/open-vm-tools/libvmtools/vmtoolsLog.c
+++ b/open-vm-tools/libvmtools/vmtoolsLog.c
@@ -28,6 +28,7 @@
  *    before including glib.h.
  */
 
+#include "vmware/tools/utils.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <glib/gstdio.h>
@@ -37,7 +38,6 @@
 #  include <unistd.h>
 #endif
 
-#include "vmtools.h"
 #include "codeset.h"
 #if defined(G_PLATFORM_WIN32)
 #  include "coreDump.h"

diff --git a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
index de70c1e8363e29c1a3838402a38dbd4505ab863e..c5cd10ea0150ccdec75bbfbf17664f2c64386405 100644 (file)
--- a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
+++ b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
@@ -46,18 +46,17 @@
 #include "guestInfoInt.h"
 #include "guest_msg_def.h" // For GUESTMSG_MAX_IN_SIZE
 #include "netutil.h"
-#include "rpcChannel.h"
 #include "rpcvmx.h"
 #include "procMgr.h"
 #include "str.h"
 #include "strutil.h"
 #include "system.h"
 #include "util.h"
-#include "vmtools.h"
-#include "vmtoolsApp.h"
 #include "xdrutil.h"
 #include "vmsupport.h"
 #include "vmware/guestrpc/tclodefs.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"

diff --git a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
index da72a75c49abadb30ab88997acfd453c22a03c6a..3a88cf5345ed6a41acb28be85e84ff67413af4aa 100644 (file)
--- a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
+++ b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
@@ -25,15 +25,15 @@
 #include <string.h>
 
 #define G_LOG_DOMAIN "hgfsd"
-#include "vmtoolsApp.h"
 
 #include "hgfs.h"
 #include "hgfsServerPolicy.h"
 #include "hgfsServer.h"
 #include "hgfsChannel.h"
 #include "vm_assert.h"
-#include "vmtools.h"
 #include "vmware/guestrpc/tclodefs.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"

diff --git a/open-vm-tools/services/plugins/powerOps/powerOps.c b/open-vm-tools/services/plugins/powerOps/powerOps.c
index ebc10fa9ae93d83818927fcb6a5421ab24805c6c..ba3c0536954e4888fc2ca8b610e4ea7a5c468bca 100644 (file)
--- a/open-vm-tools/services/plugins/powerOps/powerOps.c
+++ b/open-vm-tools/services/plugins/powerOps/powerOps.c
@@ -26,13 +26,13 @@
 
 #include "vm_assert.h"
 #include "vm_basic_defs.h"
-#include "vmtoolsApp.h"
 
 #include "conf.h"
 #include "procMgr.h"
 #include "system.h"
-#include "vmtools.h"
 #include "vmware/guestrpc/powerops.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 #if defined(G_PLATFORM_WIN32)
 #  define INVALID_PID NULL

diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c b/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
index 75631752c6c057c6bf33849128acb394c4f80f45..455de62ea0f245f44817a088ef3c43f4dd443dc4 100644 (file)
--- a/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
+++ b/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
@@ -34,10 +34,10 @@
 
 #include "resolutionInt.h"
 
-#include "vmtools.h"
-#include "vmtoolsApp.h"
 #include "xdrutil.h"
 #include "vmware/guestrpc/tclodefs.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 /*
  * The maximum number of capabilities we can set.

diff --git a/open-vm-tools/services/plugins/timeSync/timeSync.c b/open-vm-tools/services/plugins/timeSync/timeSync.c
index 73bdd365bd8bf05898405de55636127ee8e5c427..287c111f240cd542e7b9dbb674b3d379c7289f8f 100644 (file)
--- a/open-vm-tools/services/plugins/timeSync/timeSync.c
+++ b/open-vm-tools/services/plugins/timeSync/timeSync.c
@@ -34,9 +34,9 @@
 #include "msg.h"
 #include "strutil.h"
 #include "system.h"
-#include "vmtools.h"
-#include "vmtoolsApp.h"
 #include "vmware/guestrpc/timesync.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"

diff --git a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
index f9f4c2f7d7ce656c72ff801f1d0e114426f57ecf..c6856b3e5dcd6713095554870fb9bb204b893ecd 100644 (file)
--- a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
+++ b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
@@ -57,7 +57,7 @@
 
 #if defined(VMTOOLS_USE_GLIB)
 #  include "vixPluginInt.h"
-#  include "vmtools.h"
+#  include "vmware/tools/utils.h"
 #else
 #  include "debug.h"
 #  include "eventManager.h"

diff --git a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.h b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.h
index 962395826cdcb7a16848d0384cd387e5750a6bfd..8f7aa174ab79f1630926ad2cb800ea96ea3caeba 100644 (file)
--- a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.h
+++ b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.h
@@ -31,7 +31,7 @@
 
 #if defined(VMTOOLS_USE_GLIB)
 
-#include "vmtoolsApp.h"
+#include "vmware/tools/plugin.h"
 
 void
 FoundryToolsDaemon_Initialize(ToolsAppCtx *ctx);

diff --git a/open-vm-tools/services/plugins/vix/vixPlugin.c b/open-vm-tools/services/plugins/vix/vixPlugin.c
index d236da69620e9a6f9e424be1d44a325f2a58fafe..9ff6d7b08223959da727deb2a216536c6efd6043 100644 (file)
--- a/open-vm-tools/services/plugins/vix/vixPlugin.c
+++ b/open-vm-tools/services/plugins/vix/vixPlugin.c
@@ -31,7 +31,7 @@
 #include "syncDriver.h"
 #include "vixCommands.h"
 #include "vixPluginInt.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"

diff --git a/open-vm-tools/services/plugins/vix/vixPluginInt.h b/open-vm-tools/services/plugins/vix/vixPluginInt.h
index 3a36da3951c4b1e60f42f27f68462a1fcfc060c9..ebe7e16ae47f91d07f46d4012c560d3cd0316b8c 100644 (file)
--- a/open-vm-tools/services/plugins/vix/vixPluginInt.h
+++ b/open-vm-tools/services/plugins/vix/vixPluginInt.h
@@ -28,7 +28,7 @@
 #define Debug        g_debug
 #define Warning      g_warning
 
-#include "vmtoolsApp.h"
+#include "vmware/tools/plugin.h"
 #include "rpcin.h"
 
 RpcInRet

diff --git a/open-vm-tools/services/plugins/vixUser/vixUser.c b/open-vm-tools/services/plugins/vixUser/vixUser.c
index 52471ccec5f57053dee5c6bd6792dfd1f58f048f..40821ac63b6562ecbce65114cd1863be7b09fec1 100644 (file)
--- a/open-vm-tools/services/plugins/vixUser/vixUser.c
+++ b/open-vm-tools/services/plugins/vixUser/vixUser.c
@@ -34,9 +34,9 @@
 #include "strutil.h"
 #include "vixCommands.h"
 #include "vixTools.h"
-#include "vmtools.h"
-#include "vmtoolsApp.h"
 #include "util.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 #if defined(_WIN32)
 #  include "win32u.h"

diff --git a/open-vm-tools/services/plugins/vmbackup/stateMachine.c b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
index 126eefc6a48d402a31b3a6e248340cc419aee655..c49bd3e14da7e667c831c859f1918810ad4a81c8 100644 (file)
--- a/open-vm-tools/services/plugins/vmbackup/stateMachine.c
+++ b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
@@ -40,7 +40,7 @@
 #include "str.h"
 #include "strutil.h"
 #include "util.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"

diff --git a/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h b/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
index 3efc004423f26fadc173eccc38a0d76b6cf17fb8..c2203c0ea15d9b33a4aedf7bb570ac39393f6bc6 100644 (file)
--- a/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
+++ b/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
@@ -29,8 +29,8 @@
 
 #include <glib.h>
 #include "vmware.h"
-#include "vmtoolsApp.h"
 #include "vmware/guestrpc/vmbackup.h"
+#include "vmware/tools/plugin.h"
 
 typedef enum {
    VMBACKUP_STATUS_PENDING,

diff --git a/open-vm-tools/services/vmtoolsd/cmdLine.c b/open-vm-tools/services/vmtoolsd/cmdLine.c
index 7f487cf165edd3f0258251012ce4cf27e62fb65d..6cbd6046461205888165114146424be34d3e9740 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/cmdLine.c
+++ b/open-vm-tools/services/vmtoolsd/cmdLine.c
@@ -37,8 +37,8 @@
 #include "conf.h"
 #include "rpcout.h"
 #include "str.h"
-#include "vmtools.h"
 #include "vmtoolsd_version.h"
+#include "vmware/tools/utils.h"
 
 
 /**

diff --git a/open-vm-tools/services/vmtoolsd/mainLoop.c b/open-vm-tools/services/vmtoolsd/mainLoop.c
index 8fd5627a61328b80d6751cd1076b03072f0b7cc1..6ae9aa02796aa4a97183d7ebc9ac8a96c8fd8709 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/mainLoop.c
+++ b/open-vm-tools/services/vmtoolsd/mainLoop.c
@@ -38,8 +38,8 @@
 #include "system.h"
 #include "util.h"
 #include "vmcheck.h"
-#include "vmtools.h"
 #include "vmware/guestrpc/tclodefs.h"
+#include "vmware/tools/utils.h"
 
 
 /**

diff --git a/open-vm-tools/services/vmtoolsd/mainPosix.c b/open-vm-tools/services/vmtoolsd/mainPosix.c
index 0f2c133250c3e2cc10ad7bd038d07eed7928e29f..66647cd09abd60ef5384ed6f3e114c560edfa259 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/mainPosix.c
+++ b/open-vm-tools/services/vmtoolsd/mainPosix.c
@@ -34,7 +34,7 @@
 #include "system.h"
 #include "unicode.h"
 #include "util.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"

diff --git a/open-vm-tools/services/vmtoolsd/pluginMgr.c b/open-vm-tools/services/vmtoolsd/pluginMgr.c
index 08eb90942c853d4d554999910d45e824582712d7..95f17c4c81257e3d8290d24411040d3d94d8e588 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/pluginMgr.c
+++ b/open-vm-tools/services/vmtoolsd/pluginMgr.c
@@ -27,7 +27,7 @@
 #include "guestApp.h"
 #include "toolsCoreInt.h"
 #include "util.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 
 #ifdef USE_APPLOADER

diff --git a/open-vm-tools/services/vmtoolsd/serviceObj.c b/open-vm-tools/services/vmtoolsd/serviceObj.c
index b6937a20cd9a38bf8e9121099e5f145b8c4bd5d2..30394dda90bbe8d91541841085bb7d55a66eac6e 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/serviceObj.c
+++ b/open-vm-tools/services/vmtoolsd/serviceObj.c
@@ -25,7 +25,6 @@
 #include "toolsCoreInt.h"
 #include "serviceObj.h"
 #include "svcSignals.h"
-#include "vmtoolsApp.h"
 
 
 /**

diff --git a/open-vm-tools/services/vmtoolsd/serviceObj.h b/open-vm-tools/services/vmtoolsd/serviceObj.h
index 4b771f3daae369174a2fc204db7bc852228d8120..a46a27d020c7005c133c5bdcd400acdfdd9a59e2 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/serviceObj.h
+++ b/open-vm-tools/services/vmtoolsd/serviceObj.h
@@ -29,7 +29,6 @@
  */
 
 #include <glib-object.h>
-#include "vmtoolsApp.h"
 
 #define TOOLSCORE_TYPE_SERVICE   ToolsCore_Service_get_type()
 

diff --git a/open-vm-tools/services/vmtoolsd/svcSignals.gm b/open-vm-tools/services/vmtoolsd/svcSignals.gm
index 957a6f845a5a59c0ac4845b8a036c881863d105e..37629ed152589e955e63a78195ed891fb51d4066 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/svcSignals.gm
+++ b/open-vm-tools/services/vmtoolsd/svcSignals.gm
@@ -21,7 +21,7 @@
 #
 # Defines the custom GClosure marshal functions for the core services signals.
 #
-# @see vmtoolsApp.h
+# @see plugin.h
 #
 
 # The "capabilities" signal.

diff --git a/open-vm-tools/services/vmtoolsd/toolsCoreInt.h b/open-vm-tools/services/vmtoolsd/toolsCoreInt.h
index 4464c7153a76340be699af22bdc9b5beccdb96ef..1dc8dc8a34f26c079daf5b59794d4115773a47cd 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/toolsCoreInt.h
+++ b/open-vm-tools/services/vmtoolsd/toolsCoreInt.h
@@ -31,8 +31,8 @@
 #include <glib-object.h>
 #include <gmodule.h>
 #include <time.h>
-#include "vmrpcdbg.h"
-#include "vmtoolsApp.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/rpcdebug.h"
 
 /* Used by the Windows implementation to communicate with other processes. */
 #if defined(G_PLATFORM_WIN32)

diff --git a/open-vm-tools/services/vmtoolsd/toolsRpc.c b/open-vm-tools/services/vmtoolsd/toolsRpc.c
index 897901b4adb3ff6024e5bf976496a83816458edc..1670efdfe67a8a613bca13fbbde72e5e01839331 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/toolsRpc.c
+++ b/open-vm-tools/services/vmtoolsd/toolsRpc.c
@@ -32,8 +32,8 @@
 #include "str.h"
 #include "strutil.h"
 #include "toolsCoreInt.h"
-#include "vmtools.h"
 #include "vm_tools_version.h"
+#include "vmware/tools/utils.h"
 
 
 /**

diff --git a/open-vm-tools/tests/testDebug/testDebug.c b/open-vm-tools/tests/testDebug/testDebug.c
index 11201db712442221d519b844e161580b2bf19bbb..0aa3f9e5f3e2e29f1c62b190be59ff4fbf1a27de 100644 (file)
--- a/open-vm-tools/tests/testDebug/testDebug.c
+++ b/open-vm-tools/tests/testDebug/testDebug.c
@@ -27,10 +27,9 @@
 #define G_LOG_DOMAIN "testDebug"
 #include <glib-object.h>
 #include "util.h"
-#include "vmrpcdbg.h"
-#include "vmtools.h"
 #include "guestrpc/ghiGetBinaryHandlers.h"
 #include "vmware/guestrpc/tclodefs.h"
+#include "vmware/tools/rpcdebug.h"
 
 static gboolean
 TestDebugValidateReset(RpcInData *data, gboolean ret);

diff --git a/open-vm-tools/tests/testPlugin/testPlugin.c b/open-vm-tools/tests/testPlugin/testPlugin.c
index aedc5e7c9d711a82fd043ad3b272fd3a69ff146e..f7ef4fe8ccc24022ac83bb500c63210d7405fbdc 100644 (file)
--- a/open-vm-tools/tests/testPlugin/testPlugin.c
+++ b/open-vm-tools/tests/testPlugin/testPlugin.c
@@ -30,9 +30,9 @@
 #include <gmodule.h>
 #include "testData.h"
 #include "util.h"
-#include "vmtoolsApp.h"
-#include "vmtools.h"
 #include "guestrpc/ghiGetBinaryHandlers.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 #define TEST_APP_PROVIDER  "TestProvider"
 #define TEST_APP_NAME      "TestProviderApp1"

diff --git a/open-vm-tools/tests/vmrpcdbg/debugChannel.c b/open-vm-tools/tests/vmrpcdbg/debugChannel.c
index fd68994a6efe9a9df697e8ececd78b8fd477afa1..94947509a4d20e712409588d7d7a0dc55331a335 100644 (file)
--- a/open-vm-tools/tests/vmrpcdbg/debugChannel.c
+++ b/open-vm-tools/tests/vmrpcdbg/debugChannel.c
@@ -30,11 +30,11 @@
 #include <gmodule.h>
 
 #include "strutil.h"
-#include "vmrpcdbg.h"
-#include "vmtools.h"
 #include "util.h"
 #include "vmxrpc.h"
 #include "xdrutil.h"
+#include "vmware/tools/rpcdebug.h"
+#include "vmware/tools/utils.h"
 
 typedef struct DbgChannelData {
    gboolean          hasLibRef;

diff --git a/open-vm-tools/tests/vmrpcdbg/vmrpcdbg.c b/open-vm-tools/tests/vmrpcdbg/vmrpcdbg.c
index e072477f0f28cd85070cc15810e654b24cb178f0..efe5655eaef2b875cf382df998c96deda8e6e88c 100644 (file)
--- a/open-vm-tools/tests/vmrpcdbg/vmrpcdbg.c
+++ b/open-vm-tools/tests/vmrpcdbg/vmrpcdbg.c
@@ -27,7 +27,7 @@
 #include <gmodule.h>
 #include <rpc/rpc.h>
 #include "util.h"
-#include "vmrpcdbg.h"
+#include "vmware/tools/rpcdebug.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"

diff --git a/open-vm-tools/toolbox/toolboxInt.c b/open-vm-tools/toolbox/toolboxInt.c
index 4195b3c1452364a4724a7c6a4edac05e194d69a6..889b8fa8f5953e8edcdbe929a8fd9dfbdc1b5c3c 100644 (file)
--- a/open-vm-tools/toolbox/toolboxInt.c
+++ b/open-vm-tools/toolbox/toolboxInt.c
@@ -30,7 +30,7 @@
 #include "debug.h"
 #include "guestApp.h"
 #include "util.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 
 /*

diff --git a/open-vm-tools/toolbox/toolboxcmd-scripts.c b/open-vm-tools/toolbox/toolboxcmd-scripts.c
index 24e741a67985b38feef0317bb4681a1f112db080..ee51f424dd20f3bd7ec3ee7cf7090f06e5e36943 100644 (file)
--- a/open-vm-tools/toolbox/toolboxcmd-scripts.c
+++ b/open-vm-tools/toolbox/toolboxcmd-scripts.c
@@ -30,7 +30,7 @@
 
 #include "system.h"
 #include "toolboxCmdInt.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 
 #define SCRIPT_SUSPEND "suspend"