diff --git a/pvDataApp/factory/PVAuxInfoImpl.cpp b/pvDataApp/factory/PVAuxInfoImpl.cpp
index 6a80ada..35963c2 100644
--- a/pvDataApp/factory/PVAuxInfoImpl.cpp
+++ b/pvDataApp/factory/PVAuxInfoImpl.cpp
@@ -29,7 +29,7 @@ PVAuxInfo::PVAuxInfo(PVField *pvField)
 PVAuxInfo::~PVAuxInfo()
 {
     PVDATA_REFCOUNT_MONITOR_DESTRUCT(pvAuxInfo);
-    for(int i=0; i<lengthInfo; i++) delete pvInfos[i];
+    for(int i=0; i<numberInfo; i++) delete pvInfos[i];
     delete[] pvInfos;
 }
 
diff --git a/pvDataApp/property/pvAlarm.h b/pvDataApp/property/pvAlarm.h
index 0024b44..01b7422 100644
--- a/pvDataApp/property/pvAlarm.h
+++ b/pvDataApp/property/pvAlarm.h
@@ -4,12 +4,14 @@
  * EPICS pvDataCPP is distributed subject to a Software License Agreement found
  * in file LICENSE that is included with this distribution.
  */
+#ifndef PVALARM_H
+#define PVALARM_H
 #include <string>
 #include <pv/pvType.h>
 #include <pv/alarm.h>
-#ifndef PVALARM_H
-#define PVALARM_H
-namespace epics { namespace pvData { 
+#include <pv/pvData.h>
+
+namespace epics { namespace pvData {
 
 class PVAlarm {
 public: