diff --git a/definitions/Definitions.cpp b/definitions/Definitions.cpp
index 0e045a61..662207e7 100644
--- a/definitions/Definitions.cpp
+++ b/definitions/Definitions.cpp
@@ -20,9 +20,12 @@
 #include "definitions.h"
 
 #ifdef __WINDOWS__
+#include <interfaces/IAmazonPrime.h>
+#include <interfaces/IApplication.h>
 #include <interfaces/IAVNClient.h>
 #include <interfaces/IAVSClient.h>
 #include <interfaces/IBluetooth.h>
+#include <interfaces/IBluetoothAudio.h>
 #include <interfaces/IButler.h>
 #include <interfaces/IBrowser.h>
 #include <interfaces/ICapture.h>
@@ -42,17 +45,22 @@
 #include <interfaces/IDsgccClient.h>
 #include <interfaces/IExternalBase.h>
 #include <interfaces/IGuide.h>
+#include <interfaces/IFocus.h>
 #include <interfaces/IInputPin.h>
 #include <interfaces/IInputSwitch.h>
 #include <interfaces/IIPNetwork.h>
 #include <interfaces/IKeyHandler.h>
+#include <interfaces/ILisa.h>
+#include <interfaces/ILanguageTag.h>
 #include <interfaces/IMath.h>
 #include <interfaces/IMemory.h>
 #include <interfaces/IMessenger.h>
 #include <interfaces/IMessageControl.h>
 #include <interfaces/INetworkControl.h>
+#include <interfaces/INetworkTools.h>
 #include <interfaces/INetflix.h>
 #include <interfaces/INetflixSecurity.h>
+#include <interfaces/IPackageManager.h>
 #include <interfaces/IPackager.h>
 #include <interfaces/IPerformance.h>
 #include <interfaces/IPlayerInfo.h>
@@ -67,9 +75,12 @@
 #include <interfaces/IScriptEngine.h>
 #include <interfaces/ISecureShellServer.h>
 #include <interfaces/IStream.h>
+#include <interfaces/IStore.h>
+#include <interfaces/IStoreCache.h>
 #include <interfaces/ISwitchBoard.h>
 #include <interfaces/ISystemCommands.h>
 #include <interfaces/ITestController.h>
+#include <interfaces/ITextToSpeech.h>
 #include <interfaces/ITestUtility.h>
 #include <interfaces/ITimeSync.h>
 #include <interfaces/ITimeZone.h>
@@ -78,6 +89,7 @@
 #include <interfaces/IWebDriver.h>
 #include <interfaces/IWebPA.h>
 #include <interfaces/IWebServer.h>
+#include <interfaces/IWifiControl.h>
 #include <interfaces/IDeviceInfo.h>
 #include <interfaces/IWatchDog.h>
 #include <interfaces/IZigWave.h>
diff --git a/interfaces/IApplication.h b/interfaces/IApplication.h
index d0dc73da..c6818fff 100644
--- a/interfaces/IApplication.h
+++ b/interfaces/IApplication.h
@@ -103,7 +103,7 @@ namespace Exchange {
         // @property
         // @brief Current application visibility
         virtual uint32_t Visible(bool& visiblity /* @out */) const = 0;
-        virtual uint32_t Visible(const bool&) = 0;
+        virtual uint32_t Visible(const bool) = 0;
 
         // @property
         // @brief Current application user interface language
diff --git a/interfaces/IDolby.h b/interfaces/IDolby.h
index 9afe7743..c68f1ad1 100644
--- a/interfaces/IDolby.h
+++ b/interfaces/IDolby.h
@@ -77,7 +77,7 @@ namespace Exchange {
             // @property
             // @brief Enable Atmos Audio Output
             // @param enable: enable/disable
-            virtual uint32_t EnableAtmosOutput(const bool& enable /* @in */) = 0;
+            virtual uint32_t EnableAtmosOutput(const bool enable /* @in */) = 0;
 
             // @property
             // @brief Dolby Mode
diff --git a/interfaces/IOCDM.h b/interfaces/IOCDM.h
index f738691a..a92fc368 100644
--- a/interfaces/IOCDM.h
+++ b/interfaces/IOCDM.h
@@ -165,7 +165,7 @@ struct ISessionExt : virtual public Core::IUnknown {
 
     virtual OCDM_RESULT StoreLicenseData(const uint8_t licenseData[] /* @in @length:licenseDataSize */,
         uint16_t licenseDataSize,
-        uint8_t* secureStopId /* @out @length:16 */)
+        uint8_t* secureStopId /* @out @maxlength:16 */)
         = 0;
 
     virtual OCDM_RESULT SelectKeyId(const uint8_t keyLength,
@@ -225,7 +225,7 @@ struct IAccessorOCDM : virtual public Core::IUnknown {
     virtual uint32_t ResetSecureStops(const std::string& keySystem) = 0;
 
     virtual OCDM_RESULT GetSecureStopIds(const std::string& keySystem,
-        uint8_t ids[] /* @out @length:idsLength */, uint16_t idsLength,
+        uint8_t ids[] /* @out @maxlength:idsLength */, uint16_t idsLength,
         uint32_t& count /* @inout */)
         = 0;
 
@@ -247,12 +247,12 @@ struct IAccessorOCDM : virtual public Core::IUnknown {
     virtual OCDM_RESULT DeleteSecureStore(const std::string& keySystem) = 0;
 
     virtual OCDM_RESULT GetKeyStoreHash(const std::string& keySystem,
-        uint8_t keyStoreHash[] /* @out @length:keyStoreHashLength */,
+        uint8_t keyStoreHash[] /* @out @maxlength:keyStoreHashLength */,
         uint16_t keyStoreHashLength)
         = 0;
 
     virtual OCDM_RESULT GetSecureStoreHash(const std::string& keySystem,
-        uint8_t secureStoreHash[] /* @out @length:secureStoreHashLength */,
+        uint8_t secureStoreHash[] /* @out @maxlength:secureStoreHashLength */,
         uint16_t secureStoreHashLength)
         = 0;
 };