diff --git a/java/common/org/linphone/core/LinphoneCall.java b/java/common/org/linphone/core/LinphoneCall.java
index 7c02334e9..ac7b14d8d 100644
--- a/java/common/org/linphone/core/LinphoneCall.java
+++ b/java/common/org/linphone/core/LinphoneCall.java
@@ -32,7 +32,7 @@ public interface LinphoneCall {
 	 */
 	static class State {
 		
-		static private Vector values = new Vector();
+		static private Vector<State> values = new Vector<State>();
 		private final int mValue;
 		public final int value() {return mValue;}
 		
diff --git a/java/common/org/linphone/core/LinphoneCallLog.java b/java/common/org/linphone/core/LinphoneCallLog.java
index 8d0e4073a..821be24d0 100644
--- a/java/common/org/linphone/core/LinphoneCallLog.java
+++ b/java/common/org/linphone/core/LinphoneCallLog.java
@@ -32,7 +32,7 @@ public interface LinphoneCallLog {
 	 */
 	static class CallStatus {
 		
-		static private Vector values = new Vector();
+		static private Vector<CallStatus> values = new Vector<CallStatus>();
 		private final int mValue;
 		private final String mStringValue;
 		/**
diff --git a/java/common/org/linphone/core/LinphoneCallStats.java b/java/common/org/linphone/core/LinphoneCallStats.java
index 15b4cfb34..f1248c445 100644
--- a/java/common/org/linphone/core/LinphoneCallStats.java
+++ b/java/common/org/linphone/core/LinphoneCallStats.java
@@ -23,7 +23,7 @@ import java.util.Vector;
 
 public interface LinphoneCallStats {
 	static public class MediaType {
-		static private Vector values = new Vector();
+		static private Vector<MediaType> values = new Vector<MediaType>();
 		/**
 		 * Audio
 		 */
@@ -52,7 +52,7 @@ public interface LinphoneCallStats {
 		}
 	}
 	static public class IceState {
-		static private Vector values = new Vector();
+		static private Vector<IceState> values = new Vector<IceState>();
 		/**
 		 * Not activated
 		 */
diff --git a/java/common/org/linphone/core/LinphoneChatMessage.java b/java/common/org/linphone/core/LinphoneChatMessage.java
index 74f0961ac..d403d94bd 100644
--- a/java/common/org/linphone/core/LinphoneChatMessage.java
+++ b/java/common/org/linphone/core/LinphoneChatMessage.java
@@ -8,7 +8,7 @@ public interface LinphoneChatMessage {
 		void onLinphoneChatMessageStateChanged(LinphoneChatMessage msg, State state);
 	}
 	public static class State {
-		static private Vector values = new Vector();
+		static private Vector<State> values = new Vector<State>();
 		private final int mValue;
 		public final int value() {return mValue;}
 		
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index ba3802aa8..8815085d0 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -31,7 +31,7 @@ public interface LinphoneCore {
 	 */
 	static public class GlobalState {
 		
-		static private Vector values = new Vector();
+		static private Vector<GlobalState> values = new Vector<GlobalState>();
 		/**
 		 * Off
 		 */
@@ -76,7 +76,7 @@ public interface LinphoneCore {
 	 */
 	static public class RegistrationState {
 		
-		private static Vector values = new Vector();
+		private static Vector<RegistrationState> values = new Vector<RegistrationState>();
 		/**
 		 * None
 		 */
@@ -124,7 +124,7 @@ public interface LinphoneCore {
 	 */
 	static public class FirewallPolicy {
 		
-		static private Vector values = new Vector();
+		static private Vector<FirewallPolicy> values = new Vector<FirewallPolicy>();
 		/**
 		 * No firewall is assumed.
 		 */
@@ -191,7 +191,7 @@ public interface LinphoneCore {
 	 */
 	static public final class MediaEncryption {
 		
-		static private Vector values = new Vector();
+		static private Vector<MediaEncryption> values = new Vector<MediaEncryption>();
 		/**
 		 * None
 		 */
@@ -230,7 +230,7 @@ public interface LinphoneCore {
 	 */
 	static public class EcCalibratorStatus {
 		
-		static private Vector values = new Vector();
+		static private Vector<EcCalibratorStatus> values = new Vector<EcCalibratorStatus>();
 		/* Do not change the values of these constants or the strings associated with them to prevent breaking
 		   the collection of echo canceller calibration results during the wizard! */
 		public static final int IN_PROGRESS_STATUS=0;
diff --git a/java/common/org/linphone/core/LinphoneCoreFactory.java b/java/common/org/linphone/core/LinphoneCoreFactory.java
index fe35b257f..04cef4aea 100644
--- a/java/common/org/linphone/core/LinphoneCoreFactory.java
+++ b/java/common/org/linphone/core/LinphoneCoreFactory.java
@@ -40,7 +40,7 @@ abstract public class LinphoneCoreFactory {
 	public static final synchronized LinphoneCoreFactory instance() {
 		try {
 			if (theLinphoneCoreFactory == null) {
-				Class lFactoryClass = Class.forName(factoryName);
+				Class<?> lFactoryClass = Class.forName(factoryName);
 				theLinphoneCoreFactory = (LinphoneCoreFactory) lFactoryClass.newInstance();
 			}
 		} catch (Exception e) {
diff --git a/java/common/org/linphone/core/LinphoneFriend.java b/java/common/org/linphone/core/LinphoneFriend.java
index e070f6921..417c582d9 100644
--- a/java/common/org/linphone/core/LinphoneFriend.java
+++ b/java/common/org/linphone/core/LinphoneFriend.java
@@ -37,7 +37,7 @@ public interface LinphoneFriend {
 	static class SubscribePolicy {
 
 		
-		static private Vector values = new Vector();
+		static private Vector<SubscribePolicy> values = new Vector<SubscribePolicy>();
 		protected final int mValue;
 		private final String mStringValue;
 		/**
diff --git a/java/common/org/linphone/core/OnlineStatus.java b/java/common/org/linphone/core/OnlineStatus.java
index a1b36ab37..081084171 100644
--- a/java/common/org/linphone/core/OnlineStatus.java
+++ b/java/common/org/linphone/core/OnlineStatus.java
@@ -28,7 +28,7 @@ import java.util.Vector;
 
 public class OnlineStatus {
 	
-	static private Vector values = new Vector();
+	static private Vector<OnlineStatus> values = new Vector<OnlineStatus>();
 	/**
 	 * Offline
 	 */