Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h	(revision 99773)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h	(revision 99775)
@@ -175,4 +175,5 @@
 #endif
 RTEXITCODE handleModifyVM(HandlerArg *a);
+VMProcPriority_T nameToVMProcPriority(const char *pszName);
 
 /* VBoxManageDebugVM.cpp */
Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp	(revision 99773)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp	(revision 99775)
@@ -53,6 +53,4 @@
 
 DECLARE_TRANSLATION_CONTEXT(ControlVM);
-
-VMProcPriority_T nameToVMProcPriority(const char *pszName);
 
 /**
Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp	(revision 99773)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp	(revision 99775)
@@ -370,5 +370,5 @@
  * Translates a guest process wait result to a human readable string.
  */
-const char *gctlProcessWaitResultToText(ProcessWaitResult_T enmWaitResult)
+static const char *gctlProcessWaitResultToText(ProcessWaitResult_T enmWaitResult)
 {
     switch (enmWaitResult)
@@ -455,5 +455,5 @@
  * Translates a file system objec type to a string.
  */
-const char *gctlFsObjTypeToName(FsObjType_T enmType)
+static const char *gctlFsObjTypeToName(FsObjType_T enmType)
 {
     switch (enmType)
Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp	(revision 99773)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp	(revision 99775)
@@ -400,5 +400,5 @@
 }
 
-const char *facilityStateToName(AdditionsFacilityStatus_T faStatus, bool fShort)
+static const char *facilityStateToName(AdditionsFacilityStatus_T faStatus, bool fShort)
 {
     switch (faStatus)
@@ -471,5 +471,5 @@
  * This simply outputs the string adding necessary escaping and nothing else.
  */
-void outputMachineReadableStringWorker(const char *psz)
+static void outputMachineReadableStringWorker(const char *psz)
 {
     for (;;)
Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp	(revision 99773)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp	(revision 99775)
@@ -932,5 +932,5 @@
 };
 
-RTEXITCODE handleSetVMEncryption(HandlerArg *a, const char *pszFilenameOrUuid)
+static RTEXITCODE handleSetVMEncryption(HandlerArg *a, const char *pszFilenameOrUuid)
 {
     HRESULT           hrc;
@@ -1065,5 +1065,5 @@
 }
 
-RTEXITCODE handleCheckVMPassword(HandlerArg *a, const char *pszFilenameOrUuid)
+static RTEXITCODE handleCheckVMPassword(HandlerArg *a, const char *pszFilenameOrUuid)
 {
     HRESULT hrc;
@@ -1108,5 +1108,5 @@
 };
 
-RTEXITCODE handleAddVMPassword(HandlerArg *a, const char *pszFilenameOrUuid)
+static RTEXITCODE handleAddVMPassword(HandlerArg *a, const char *pszFilenameOrUuid)
 {
     HRESULT hrc;
@@ -1189,5 +1189,5 @@
 }
 
-RTEXITCODE handleRemoveVMPassword(HandlerArg *a, const char *pszFilenameOrUuid)
+static RTEXITCODE handleRemoveVMPassword(HandlerArg *a, const char *pszFilenameOrUuid)
 {
     HRESULT hrc;
@@ -1967,5 +1967,5 @@
 }
 
-RTEXITCODE handleUnattendedDetect(HandlerArg *a)
+static RTEXITCODE handleUnattendedDetect(HandlerArg *a)
 {
     HRESULT hrc;
@@ -2087,5 +2087,5 @@
 }
 
-RTEXITCODE handleUnattendedInstall(HandlerArg *a)
+static RTEXITCODE handleUnattendedInstall(HandlerArg *a)
 {
     HRESULT hrc;
Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp	(revision 99773)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp	(revision 99775)
@@ -60,9 +60,9 @@
  * @return
  */
-bool FindAndPrintSnapshotUsingMedium(ComPtr<IMedium> &pMedium,
-                                     ComPtr<ISnapshot> &pThisSnapshot,
-                                     ComPtr<ISnapshot> &pCurrentSnapshot,
-                                     uint32_t uMediumLevel,
-                                     uint32_t uSnapshotLevel)
+static bool FindAndPrintSnapshotUsingMedium(ComPtr<IMedium> &pMedium,
+                                            ComPtr<ISnapshot> &pThisSnapshot,
+                                            ComPtr<ISnapshot> &pCurrentSnapshot,
+                                            uint32_t uMediumLevel,
+                                            uint32_t uSnapshotLevel)
 {
     HRESULT hrc;
@@ -138,9 +138,9 @@
  * @param uLevel variant, the recursion level for output indentation.
  */
-void DumpMediumWithChildren(ComPtr<IMedium> &pCurrentStateMedium,
-                            ComPtr<IMedium> &pMedium,
-                            ComPtr<ISnapshot> &pRootSnapshot,
-                            ComPtr<ISnapshot> &pCurrentSnapshot,
-                            uint32_t uLevel)
+static void DumpMediumWithChildren(ComPtr<IMedium> &pCurrentStateMedium,
+                                   ComPtr<IMedium> &pMedium,
+                                   ComPtr<ISnapshot> &pRootSnapshot,
+                                   ComPtr<ISnapshot> &pCurrentSnapshot,
+                                   uint32_t uLevel)
 {
     HRESULT hrc;
@@ -227,5 +227,5 @@
  * @param pMachine Machine to dump snapshots for.
  */
-void DumpSnapshot(ComPtr<IMachine> &pMachine)
+static void DumpSnapshot(ComPtr<IMachine> &pMachine)
 {
     HRESULT hrc;
