diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 55847bcd6b7113987c2cd432e31e7325e346f87f..2241532d5e9da5bf89f0e8cb99084a258995bb9c 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -2475,6 +2475,7 @@ esxDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus,
 }
 
 
+
 static int
 esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus)
 {
@@ -2482,6 +2483,7 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus)
 }
 
 
+
 static int
 esxDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
 {
@@ -2540,6 +2542,8 @@ esxDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
     return priv->maxVcpus;
 }
 
+
+
 static int
 esxDomainGetMaxVcpus(virDomainPtr domain)
 {
@@ -2547,6 +2551,8 @@ esxDomainGetMaxVcpus(virDomainPtr domain)
                                            VIR_DOMAIN_VCPU_MAXIMUM));
 }
 
+
+
 static char *
 esxDomainDumpXML(virDomainPtr domain, int flags)
 {
@@ -3809,12 +3815,16 @@ esxDomainIsPersistent(virDomainPtr domain ATTRIBUTE_UNUSED)
     return 1;
 }
 
+
+
 static int
 esxDomainIsUpdated(virDomainPtr domain ATTRIBUTE_UNUSED)
 {
     return 0;
 }
 
+
+
 static virDomainSnapshotPtr
 esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc,
                            unsigned int flags)
diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 76be5a40cb8563c4adbe6dba79b32bf0fdaf5541..5dbf744cbe0a86d30c8d85028badedd3a75f2d20 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -1812,7 +1812,7 @@ esxVI_GetVirtualMachineQuestionInfo
 
 int
 esxVI_GetBoolean(esxVI_ObjectContent *objectContent, const char *propertyName,
-                 esxVI_Boolean *value, esxVI_Occurrence occurence)
+                 esxVI_Boolean *value, esxVI_Occurrence occurrence)
 {
     esxVI_DynamicProperty *dynamicProperty;
 
@@ -1835,7 +1835,7 @@ esxVI_GetBoolean(esxVI_ObjectContent *objectContent, const char *propertyName,
     }
 
     if (*value == esxVI_Boolean_Undefined &&
-        occurence == esxVI_Occurrence_RequiredItem) {
+        occurrence == esxVI_Occurrence_RequiredItem) {
         ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR,
                      _("Missing '%s' property"), propertyName);
         return -1;
@@ -1844,9 +1844,11 @@ esxVI_GetBoolean(esxVI_ObjectContent *objectContent, const char *propertyName,
     return 0;
 }
 
+
+
 int
 esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName,
-              esxVI_Long **value, esxVI_Occurrence occurence)
+              esxVI_Long **value, esxVI_Occurrence occurrence)
 {
     esxVI_DynamicProperty *dynamicProperty;
 
@@ -1866,7 +1868,7 @@ esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName,
         }
     }
 
-    if (*value == NULL && occurence == esxVI_Occurrence_RequiredItem) {
+    if (*value == NULL && occurrence == esxVI_Occurrence_RequiredItem) {
         ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR,
                      _("Missing '%s' property"), propertyName);
         return -1;
@@ -1880,7 +1882,7 @@ esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName,
 int
 esxVI_GetStringValue(esxVI_ObjectContent *objectContent,
                      const char *propertyName,
-                     char **value, esxVI_Occurrence occurence)
+                     char **value, esxVI_Occurrence occurrence)
 {
     esxVI_DynamicProperty *dynamicProperty;
 
@@ -1902,7 +1904,7 @@ esxVI_GetStringValue(esxVI_ObjectContent *objectContent,
         }
     }
 
-    if (*value == NULL && occurence == esxVI_Occurrence_RequiredItem) {
+    if (*value == NULL && occurrence == esxVI_Occurrence_RequiredItem) {
         ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR,
                      _("Missing '%s' property"), propertyName);
         return -1;
@@ -1917,7 +1919,7 @@ int
 esxVI_GetManagedObjectReference(esxVI_ObjectContent *objectContent,
                                 const char *propertyName,
                                 esxVI_ManagedObjectReference **value,
-                                esxVI_Occurrence occurence)
+                                esxVI_Occurrence occurrence)
 {
     esxVI_DynamicProperty *dynamicProperty;
 
@@ -1938,7 +1940,7 @@ esxVI_GetManagedObjectReference(esxVI_ObjectContent *objectContent,
         }
     }
 
-    if (*value == NULL && occurence == esxVI_Occurrence_RequiredItem) {
+    if (*value == NULL && occurrence == esxVI_Occurrence_RequiredItem) {
         ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR,
                      _("Missing '%s' property"), propertyName);
         return -1;
@@ -2265,9 +2267,10 @@ esxVI_GetSnapshotTreeBySnapshot
 
 
 
-int esxVI_LookupHostSystemProperties(esxVI_Context *ctx,
-                                     esxVI_String *propertyNameList,
-                                     esxVI_ObjectContent **hostSystem)
+int
+esxVI_LookupHostSystemProperties(esxVI_Context *ctx,
+                                 esxVI_String *propertyNameList,
+                                 esxVI_ObjectContent **hostSystem)
 {
     return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference,
                                            "HostSystem", propertyNameList,
diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h
index d512add7f7b82c015684906dde185e1efe4bd561..553967b51a39fa47d8e3a9c01c070b9a1550831e 100644
--- a/src/esx/esx_vi.h
+++ b/src/esx/esx_vi.h
@@ -300,19 +300,19 @@ int esxVI_GetVirtualMachineQuestionInfo
 
 int esxVI_GetBoolean(esxVI_ObjectContent *objectContent,
                      const char *propertyName,
-                     esxVI_Boolean *value, esxVI_Occurrence occurence);
+                     esxVI_Boolean *value, esxVI_Occurrence occurrence);
 
 int esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName,
-                  esxVI_Long **value, esxVI_Occurrence occurence);
+                  esxVI_Long **value, esxVI_Occurrence occurrence);
 
 int esxVI_GetStringValue(esxVI_ObjectContent *objectContent,
                          const char *propertyName,
-                         char **value, esxVI_Occurrence occurence);
+                         char **value, esxVI_Occurrence occurrence);
 
 int esxVI_GetManagedObjectReference(esxVI_ObjectContent *objectContent,
                                     const char *propertyName,
                                     esxVI_ManagedObjectReference **value,
-                                    esxVI_Occurrence occurence);
+                                    esxVI_Occurrence occurrence);
 
 int esxVI_LookupNumberOfDomainsByPowerState
       (esxVI_Context *ctx, esxVI_VirtualMachinePowerState powerState,