diff --git a/32BitFloatDICOMExport/FloatDICOMExport.h b/32BitFloatDICOMExport/FloatDICOMExport.h
index b28cfe5..62a3990 100644
--- a/32BitFloatDICOMExport/FloatDICOMExport.h
+++ b/32BitFloatDICOMExport/FloatDICOMExport.h
@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <OsiriX Headers/PluginFilter.h>
+#import <OsiriXAPI/PluginFilter.h>
 
 @interface FloatDICOMExport : PluginFilter {
 
diff --git a/Cardiac Tagging MRI/CardiacTaggingMRI.xcodeproj/project.pbxproj b/Cardiac Tagging MRI/CardiacTaggingMRI.xcodeproj/project.pbxproj
index 1ff38f1..cbf675a 100644
--- a/Cardiac Tagging MRI/CardiacTaggingMRI.xcodeproj/project.pbxproj	
+++ b/Cardiac Tagging MRI/CardiacTaggingMRI.xcodeproj/project.pbxproj	
@@ -3,13 +3,13 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 44;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; };
 		8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
-		AB125D2A11299C5C002D63E2 /* OsiriX Headers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB125D2911299C5C002D63E2 /* OsiriX Headers.framework */; };
+		AB125D2A11299C5C002D63E2 /* OsiriXAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB125D2911299C5C002D63E2 /* OsiriXAPI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		ABDA6A480A50FE9300223368 /* CardiacTaggingMRIFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = ABDA6A460A50FE9300223368 /* CardiacTaggingMRIFilter.m */; };
 		ABDA6A490A50FE9300223368 /* CardiacTaggingMRIFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDA6A470A50FE9300223368 /* CardiacTaggingMRIFilter.h */; };
 		ABDA6A4B0A50FE9D00223368 /* CardiacTaggingMRI_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = ABDA6A4A0A50FE9D00223368 /* CardiacTaggingMRI_Prefix.pch */; };
@@ -23,7 +23,7 @@
 		089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		AB125D2911299C5C002D63E2 /* OsiriX Headers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "OsiriX Headers.framework"; path = "../../osirix/osirix/build/Development/OsiriX Headers.framework"; sourceTree = SOURCE_ROOT; };
+		AB125D2911299C5C002D63E2 /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = ../../osirix/osirix/build/Development/OsiriXAPI.framework; sourceTree = SOURCE_ROOT; };
 		AB94F8DF0682170900733F34 /* CardiacTaggingMRI.osirixplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CardiacTaggingMRI.osirixplugin; sourceTree = BUILT_PRODUCTS_DIR; };
 		ABDA6A460A50FE9300223368 /* CardiacTaggingMRIFilter.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CardiacTaggingMRIFilter.m; sourceTree = "<group>"; };
 		ABDA6A470A50FE9300223368 /* CardiacTaggingMRIFilter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CardiacTaggingMRIFilter.h; sourceTree = "<group>"; };
@@ -39,7 +39,7 @@
 			files = (
 				8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */,
 				CE25C4BE07BD5CFA00AFB3EA /* Accelerate.framework in Frameworks */,
-				AB125D2A11299C5C002D63E2 /* OsiriX Headers.framework in Frameworks */,
+				AB125D2A11299C5C002D63E2 /* OsiriXAPI.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -89,7 +89,7 @@
 		1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				AB125D2911299C5C002D63E2 /* OsiriX Headers.framework */,
+				AB125D2911299C5C002D63E2 /* OsiriXAPI.framework */,
 				1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */,
 				CE25C4BD07BD5CFA00AFB3EA /* Accelerate.framework */,
 			);
@@ -162,8 +162,15 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = CE6A9B5308AC847E00D0C1EE /* Build configuration list for PBXProject "CardiacTaggingMRI" */;
-			compatibilityVersion = "Xcode 3.0";
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 089C166AFE841209C02AAC07 /* Duplicate */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -269,7 +276,7 @@
 					x86_64,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+				SDKROOT = macosx10.5;
 			};
 			name = Development;
 		};
diff --git a/Cardiac Tagging MRI/CardiacTaggingMRIFilter.h b/Cardiac Tagging MRI/CardiacTaggingMRIFilter.h
index 905fbb8..9757ead 100644
--- a/Cardiac Tagging MRI/CardiacTaggingMRIFilter.h	
+++ b/Cardiac Tagging MRI/CardiacTaggingMRIFilter.h	
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "OsiriX Headers/PluginFilter.h"
+#import "OsiriXAPI/PluginFilter.h"
 
 @interface CardiacTaggingMRIFilter : PluginFilter
 {
diff --git a/Ejection Fraction/Ejection Fraction II.xcodeproj/project.pbxproj b/Ejection Fraction/Ejection Fraction II.xcodeproj/project.pbxproj
index 1844f27..ad14f9f 100644
--- a/Ejection Fraction/Ejection Fraction II.xcodeproj/project.pbxproj	
+++ b/Ejection Fraction/Ejection Fraction II.xcodeproj/project.pbxproj	
@@ -19,7 +19,7 @@
 		5969FC1F11184417006C9938 /* Hemi-ellipse-Preview.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 5969FC1E11184417006C9938 /* Hemi-ellipse-Preview.pdf */; };
 		596DF1FA10B59936006351CD /* EjectionFractionWorkflow+OsiriX.h in Headers */ = {isa = PBXBuildFile; fileRef = 596DF1F810B59936006351CD /* EjectionFractionWorkflow+OsiriX.h */; };
 		596DF1FB10B59936006351CD /* EjectionFractionWorkflow+OsiriX.mm in Sources */ = {isa = PBXBuildFile; fileRef = 596DF1F910B59936006351CD /* EjectionFractionWorkflow+OsiriX.mm */; };
-		597F141411A40C0F003E22B1 /* OsiriX Headers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 597F141311A40C0F003E22B1 /* OsiriX Headers.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		597F141411A40C0F003E22B1 /* OsiriXAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 597F141311A40C0F003E22B1 /* OsiriXAPI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		5986F7B510DBAFEA00D28EFB /* EjectionFractionDicomSaveDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 5986F7B310DBAFEA00D28EFB /* EjectionFractionDicomSaveDialog.h */; };
 		5986F7B610DBAFEA00D28EFB /* EjectionFractionDicomSaveDialog.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5986F7B410DBAFEA00D28EFB /* EjectionFractionDicomSaveDialog.mm */; };
 		5987F5D3103018A5006D39F5 /* Ejection_Fraction_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 5987F5D2103018A5006D39F5 /* Ejection_Fraction_Prefix.pch */; };
@@ -65,7 +65,7 @@
 		5969FC1E11184417006C9938 /* Hemi-ellipse-Preview.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "Hemi-ellipse-Preview.pdf"; path = "Resources/Previews/Hemi-ellipse-Preview.pdf"; sourceTree = "<group>"; };
 		596DF1F810B59936006351CD /* EjectionFractionWorkflow+OsiriX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "EjectionFractionWorkflow+OsiriX.h"; path = "Sources/EjectionFractionWorkflow+OsiriX.h"; sourceTree = "<group>"; };
 		596DF1F910B59936006351CD /* EjectionFractionWorkflow+OsiriX.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "EjectionFractionWorkflow+OsiriX.mm"; path = "Sources/EjectionFractionWorkflow+OsiriX.mm"; sourceTree = "<group>"; };
-		597F141311A40C0F003E22B1 /* OsiriX Headers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "OsiriX Headers.framework"; path = "../../osirix/osirix/build/Development/OsiriX Headers.framework"; sourceTree = SOURCE_ROOT; };
+		597F141311A40C0F003E22B1 /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = ../../osirix/osirix/build/Development/OsiriXAPI.framework; sourceTree = SOURCE_ROOT; };
 		5986F7B310DBAFEA00D28EFB /* EjectionFractionDicomSaveDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EjectionFractionDicomSaveDialog.h; path = Sources/EjectionFractionDicomSaveDialog.h; sourceTree = "<group>"; };
 		5986F7B410DBAFEA00D28EFB /* EjectionFractionDicomSaveDialog.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = EjectionFractionDicomSaveDialog.mm; path = Sources/EjectionFractionDicomSaveDialog.mm; sourceTree = "<group>"; };
 		5987F5D2103018A5006D39F5 /* Ejection_Fraction_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Ejection_Fraction_Prefix.pch; path = Sources/Ejection_Fraction_Prefix.pch; sourceTree = "<group>"; };
@@ -102,7 +102,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */,
-				597F141411A40C0F003E22B1 /* OsiriX Headers.framework in Frameworks */,
+				597F141411A40C0F003E22B1 /* OsiriXAPI.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -124,7 +124,7 @@
 		089C1671FE841209C02AAC07 /* Frameworks and Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				597F141311A40C0F003E22B1 /* OsiriX Headers.framework */,
+				597F141311A40C0F003E22B1 /* OsiriXAPI.framework */,
 				089C1672FE841209C02AAC07 /* Foundation.framework */,
 				089C167FFE841241C02AAC07 /* AppKit.framework */,
 				1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */,
diff --git a/Ejection Fraction/Sources/Algorithms/BiPlaneEjectionFractionAlgorithm.mm b/Ejection Fraction/Sources/Algorithms/BiPlaneEjectionFractionAlgorithm.mm
index 4943b46..0af118c 100644
--- a/Ejection Fraction/Sources/Algorithms/BiPlaneEjectionFractionAlgorithm.mm	
+++ b/Ejection Fraction/Sources/Algorithms/BiPlaneEjectionFractionAlgorithm.mm	
@@ -8,7 +8,7 @@
 
 #import "BiPlaneEjectionFractionAlgorithm.h"
 #import "EjectionFractionWorkflow.h"
-#import <OsiriX Headers/ROI.h>
+#import <OsiriXAPI/ROI.h>
 
 NSString* DiasHorLong = @"Diastole horizontal long axis area";
 NSString* SystHorLong = @"Systole horizontal long axis area";
diff --git a/Ejection Fraction/Sources/Algorithms/EjectionFractionAlgorithm.mm b/Ejection Fraction/Sources/Algorithms/EjectionFractionAlgorithm.mm
index 3cc2569..235dde8 100644
--- a/Ejection Fraction/Sources/Algorithms/EjectionFractionAlgorithm.mm	
+++ b/Ejection Fraction/Sources/Algorithms/EjectionFractionAlgorithm.mm	
@@ -8,7 +8,7 @@
 
 #import "EjectionFractionAlgorithm.h"
 #import "EjectionFractionWorkflow.h"
-#import <OsiriX Headers/DCMView.h>
+#import <OsiriXAPI/DCMView.h>
 #import "EjectionFractionPlugin.h"
 #import <algorithm>
 
diff --git a/Ejection Fraction/Sources/Algorithms/HemiEllipseEjectionFractionAlgorithm.mm b/Ejection Fraction/Sources/Algorithms/HemiEllipseEjectionFractionAlgorithm.mm
index ad14cd5..446fb41 100644
--- a/Ejection Fraction/Sources/Algorithms/HemiEllipseEjectionFractionAlgorithm.mm	
+++ b/Ejection Fraction/Sources/Algorithms/HemiEllipseEjectionFractionAlgorithm.mm	
@@ -8,7 +8,7 @@
 
 #import "HemiEllipseEjectionFractionAlgorithm.h"
 #import "EjectionFractionWorkflow.h"
-#import <OsiriX Headers/ROI.h>
+#import <OsiriXAPI/ROI.h>
 
 NSString* DiasShort = @"Diastole short axis area/diameter";
 NSString* SystShort = @"Systole short axis area/diameter";
diff --git a/Ejection Fraction/Sources/Algorithms/MonoPlaneEjectionFractionAlgorithm.mm b/Ejection Fraction/Sources/Algorithms/MonoPlaneEjectionFractionAlgorithm.mm
index 86e9fbf..6372d75 100644
--- a/Ejection Fraction/Sources/Algorithms/MonoPlaneEjectionFractionAlgorithm.mm	
+++ b/Ejection Fraction/Sources/Algorithms/MonoPlaneEjectionFractionAlgorithm.mm	
@@ -8,8 +8,8 @@
 
 #import "MonoPlaneEjectionFractionAlgorithm.h"
 #import "EjectionFractionWorkflow.h"
-#import <OsiriX Headers/ROI.h>
-#import <OsiriX Headers/DCMView.h>
+#import <OsiriXAPI/ROI.h>
+#import <OsiriXAPI/DCMView.h>
 
 NSString* DiasLong = @"Diastole long axis area";
 NSString* SystLong = @"Systole long axis area";
diff --git a/Ejection Fraction/Sources/Algorithms/SimpsonEjectionFractionAlgorithm.mm b/Ejection Fraction/Sources/Algorithms/SimpsonEjectionFractionAlgorithm.mm
index 13f1dc5..678ed08 100644
--- a/Ejection Fraction/Sources/Algorithms/SimpsonEjectionFractionAlgorithm.mm	
+++ b/Ejection Fraction/Sources/Algorithms/SimpsonEjectionFractionAlgorithm.mm	
@@ -8,7 +8,7 @@
 
 #import "SimpsonEjectionFractionAlgorithm.h"
 #import "EjectionFractionWorkflow.h"
-#import <OsiriX Headers/ROI.h>
+#import <OsiriXAPI/ROI.h>
 
 NSString* DiasMitral = @"Diastole base short axis area/diameter";
 NSString* SystMitral = @"Systole base short axis area/diameter";
diff --git a/Ejection Fraction/Sources/Algorithms/TeichholzEjectionFractionAlgorithm.mm b/Ejection Fraction/Sources/Algorithms/TeichholzEjectionFractionAlgorithm.mm
index 91fd40b..f2d0004 100644
--- a/Ejection Fraction/Sources/Algorithms/TeichholzEjectionFractionAlgorithm.mm	
+++ b/Ejection Fraction/Sources/Algorithms/TeichholzEjectionFractionAlgorithm.mm	
@@ -8,7 +8,7 @@
 
 #import "TeichholzEjectionFractionAlgorithm.h"
 #import "EjectionFractionWorkflow.h"
-#import <OsiriX Headers/ROI.h>
+#import <OsiriXAPI/ROI.h>
 
 @implementation TeichholzEjectionFractionAlgorithm
 
diff --git a/Ejection Fraction/Sources/EjectionFractionImageView.mm b/Ejection Fraction/Sources/EjectionFractionImageView.mm
index ea7f3bd..29a3993 100644
--- a/Ejection Fraction/Sources/EjectionFractionImageView.mm	
+++ b/Ejection Fraction/Sources/EjectionFractionImageView.mm	
@@ -7,14 +7,14 @@
 //
 
 #import "EjectionFractionImageView.h"
-#import <OsiriX Headers/DCMPix.h>
-#import <OsiriX Headers/DCMView.h>
-#import <OsiriX Headers/ROI.h>
-#import <OsiriX Headers/Notifications.h>
-#import <OsiriX Headers/MyPoint.h>
-#import <OsiriX Headers/N2Operators.h>
-#import <OsiriX Headers/N2MinMax.h>
-#import <OsiriX Headers/NSView+N2.h>
+#import <OsiriXAPI/DCMPix.h>
+#import <OsiriXAPI/DCMView.h>
+#import <OsiriXAPI/ROI.h>
+#import <OsiriXAPI/Notifications.h>
+#import <OsiriXAPI/MyPoint.h>
+#import <OsiriXAPI/N2Operators.h>
+#import <OsiriXAPI/N2MinMax.h>
+#import <OsiriXAPI/NSView+N2.h>
 
 
 @implementation EjectionFractionImageView
diff --git a/Ejection Fraction/Sources/EjectionFractionPlugin.h b/Ejection Fraction/Sources/EjectionFractionPlugin.h
index 07c19a8..8190bb4 100644
--- a/Ejection Fraction/Sources/EjectionFractionPlugin.h	
+++ b/Ejection Fraction/Sources/EjectionFractionPlugin.h	
@@ -6,7 +6,7 @@
 //  Copyright 2009 OsiriX Team. All rights reserved.
 //
 
-#import <OsiriX Headers/PluginFilter.h>
+#import <OsiriXAPI/PluginFilter.h>
 #import "EjectionFractionAlgorithm.h"
 
 extern NSString* EjectionFractionAlgorithmAddedNotification;
diff --git a/Ejection Fraction/Sources/EjectionFractionPlugin.mm b/Ejection Fraction/Sources/EjectionFractionPlugin.mm
index 9f42846..56468ba 100644
--- a/Ejection Fraction/Sources/EjectionFractionPlugin.mm	
+++ b/Ejection Fraction/Sources/EjectionFractionPlugin.mm	
@@ -9,13 +9,13 @@
 #import "EjectionFractionPlugin.h"
 #import "EjectionFractionWorkflow.h"
 #import "EjectionFractionStepsController.h"
-#import <OsiriX Headers/Notifications.h>
+#import <OsiriXAPI/Notifications.h>
 #import "MonoPlaneEjectionFractionAlgorithm.h"
 #import "BiPlaneEjectionFractionAlgorithm.h"
 #import "HemiEllipseEjectionFractionAlgorithm.h"
 #import "SimpsonEjectionFractionAlgorithm.h"
 #import "TeichholzEjectionFractionAlgorithm.h"
-#import <OsiriX Headers/N2Debug.h>
+#import <OsiriXAPI/N2Debug.h>
 
 NSString* EjectionFractionAlgorithmAddedNotification = @"EjectionFractionWorkflowAlgorithmAddedNotification";
 NSString* EjectionFractionAlgorithmRemovedNotification = @"EjectionFractionWorkflowAlgorithmRemovedNotification";
diff --git a/Ejection Fraction/Sources/EjectionFractionResultsController.mm b/Ejection Fraction/Sources/EjectionFractionResultsController.mm
index 2619830..7b30787 100644
--- a/Ejection Fraction/Sources/EjectionFractionResultsController.mm	
+++ b/Ejection Fraction/Sources/EjectionFractionResultsController.mm	
@@ -12,22 +12,22 @@
 #import "EjectionFractionAlgorithm.h"
 #import "EjectionFractionDicomSaveDialog.h"
 #import "EjectionFractionImageView.h"
-#import <OsiriX Headers/N2ColumnLayout.h>
-#import <OsiriX Headers/N2CellDescriptor.h>
-#import <OsiriX Headers/NSTextView+N2.h>
-#import <OsiriX Headers/N2View.h>
-#import <OsiriX Headers/N2MinMax.h>
-#import <OsiriX Headers/N2Window.h>
-#import <OsiriX Headers/NSWindow+N2.h>
-#import <OsiriX Headers/N2ImageView.h>
-#import <OsiriX Headers/NSImageView+N2.h>
-#import <OsiriX Headers/N2Operators.h>
-#import <OsiriX Headers/ROI.h>
-#import <OsiriX Headers/DCMView.h>
-#import <OsiriX Headers/MyPoint.h>
-#import <OsiriX Headers/DCMPix.h>
-#import <OsiriX Headers/DICOMExport.h>
-#import <OsiriX Headers/BrowserController.h>
+#import <OsiriXAPI/N2ColumnLayout.h>
+#import <OsiriXAPI/N2CellDescriptor.h>
+#import <OsiriXAPI/NSTextView+N2.h>
+#import <OsiriXAPI/N2View.h>
+#import <OsiriXAPI/N2MinMax.h>
+#import <OsiriXAPI/N2Window.h>
+#import <OsiriXAPI/NSWindow+N2.h>
+#import <OsiriXAPI/N2ImageView.h>
+#import <OsiriXAPI/NSImageView+N2.h>
+#import <OsiriXAPI/N2Operators.h>
+#import <OsiriXAPI/ROI.h>
+#import <OsiriXAPI/DCMView.h>
+#import <OsiriXAPI/MyPoint.h>
+#import <OsiriXAPI/DCMPix.h>
+#import <OsiriXAPI/DICOMExport.h>
+#import <OsiriXAPI/BrowserController.h>
 #import "EjectionFractionZoomView.h"
 
 const NSString* FileTypePDF = @"pdf";
diff --git a/Ejection Fraction/Sources/EjectionFractionStepsController.mm b/Ejection Fraction/Sources/EjectionFractionStepsController.mm
index e8eb857..33433a1 100644
--- a/Ejection Fraction/Sources/EjectionFractionStepsController.mm	
+++ b/Ejection Fraction/Sources/EjectionFractionStepsController.mm	
@@ -10,18 +10,18 @@
 #import "EjectionFractionStepsController.h"
 #import "EjectionFractionWorkflow.h"
 #import "EjectionFractionWorkflow+OsiriX.h"
-#import <OsiriX Headers/N2Operators.h>
-#import <OsiriX Headers/N2ColumnLayout.h>
-#import <OsiriX Headers/N2Resizer.h>
-#import <OsiriX Headers/N2Button.h>
-#import <OsiriX Headers/N2Step.h>
-#import <OsiriX Headers/N2CellDescriptor.h>
-#import <OsiriX Headers/N2Steps.h>
-#import <OsiriX Headers/N2View.h>
-#import <OsiriX Headers/NSButton+N2.h>
-#import <OsiriX Headers/N2Debug.h>
-#import <OsiriX Headers/Notifications.h>
-#import <OsiriX Headers/N2ColorWell.h>
+#import <OsiriXAPI/N2Operators.h>
+#import <OsiriXAPI/N2ColumnLayout.h>
+#import <OsiriXAPI/N2Resizer.h>
+#import <OsiriXAPI/N2Button.h>
+#import <OsiriXAPI/N2Step.h>
+#import <OsiriXAPI/N2CellDescriptor.h>
+#import <OsiriXAPI/N2Steps.h>
+#import <OsiriXAPI/N2View.h>
+#import <OsiriXAPI/NSButton+N2.h>
+#import <OsiriXAPI/N2Debug.h>
+#import <OsiriXAPI/Notifications.h>
+#import <OsiriXAPI/N2ColorWell.h>
 
 @interface EjectionFractionStepsController (Private)
 -(void)algorithmSelected:(NSMenuItem*)selection;
diff --git a/Ejection Fraction/Sources/EjectionFractionWorkflow+OsiriX.mm b/Ejection Fraction/Sources/EjectionFractionWorkflow+OsiriX.mm
index 1717ea9..58242f9 100644
--- a/Ejection Fraction/Sources/EjectionFractionWorkflow+OsiriX.mm	
+++ b/Ejection Fraction/Sources/EjectionFractionWorkflow+OsiriX.mm	
@@ -11,13 +11,13 @@
 #import "EjectionFractionPlugin.h"
 #import "EjectionFractionStepsController.h"
 #import "EjectionFractionResultsController.h"
-#import <OsiriX Headers/Notifications.h>
-#import <OsiriX Headers/ViewerController.h>
-#import <OsiriX Headers/DCMView.h>
-#import <OsiriX Headers/DicomSeries.h>
-#import <OsiriX Headers/ROI.h>
-#import <OsiriX Headers/NSDictionary+N2.h>
-#import <OsiriX Headers/N2Debug.h>
+#import <OsiriXAPI/Notifications.h>
+#import <OsiriXAPI/ViewerController.h>
+#import <OsiriXAPI/DCMView.h>
+#import <OsiriXAPI/DicomSeries.h>
+#import <OsiriXAPI/ROI.h>
+#import <OsiriXAPI/NSDictionary+N2.h>
+#import <OsiriXAPI/N2Debug.h>
 
 NSString* EjectionFractionWorkflowExpectedROIChangedNotification = @"EjectionFractionWorkflowExpectedROIChangedNotification";
 NSString* EjectionFractionWorkflowROIAssignedNotification = @"EjectionFractionWorkflowROIAssignedNotification";
diff --git a/Ejection Fraction/Sources/EjectionFractionWorkflow.h b/Ejection Fraction/Sources/EjectionFractionWorkflow.h
index aaa91f9..ebe3f1a 100644
--- a/Ejection Fraction/Sources/EjectionFractionWorkflow.h	
+++ b/Ejection Fraction/Sources/EjectionFractionWorkflow.h	
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <OsiriX Headers/ViewerController.h>
+#import <OsiriXAPI/ViewerController.h>
 
 @class EjectionFractionStepsController, EjectionFractionPlugin, EjectionFractionAlgorithm;
 
diff --git a/Ejection Fraction/Sources/EjectionFractionWorkflow.mm b/Ejection Fraction/Sources/EjectionFractionWorkflow.mm
index b12c89a..dddeb55 100644
--- a/Ejection Fraction/Sources/EjectionFractionWorkflow.mm	
+++ b/Ejection Fraction/Sources/EjectionFractionWorkflow.mm	
@@ -10,8 +10,8 @@
 #import "EjectionFractionWorkflow+OsiriX.h"
 #import "EjectionFractionAlgorithm.h"
 #import "EjectionFractionStepsController.h"
-#import <OsiriX Headers/N2Debug.h>
-#import <OsiriX Headers/N2UserDefaults.h>
+#import <OsiriXAPI/N2Debug.h>
+#import <OsiriXAPI/N2UserDefaults.h>
 
 NSString* Dias = @"Diastole";
 NSString* Syst = @"Systole";
diff --git a/Ejection Fraction/Sources/EjectionFractionZoomView.mm b/Ejection Fraction/Sources/EjectionFractionZoomView.mm
index 240f21c..67ed3fb 100644
--- a/Ejection Fraction/Sources/EjectionFractionZoomView.mm	
+++ b/Ejection Fraction/Sources/EjectionFractionZoomView.mm	
@@ -7,8 +7,8 @@
 //
 
 #import "EjectionFractionZoomView.h"
-#import <OsiriX Headers/NSView+N2.h>
-#import <OsiriX Headers/N2Operators.h>
+#import <OsiriXAPI/NSView+N2.h>
+#import <OsiriXAPI/N2Operators.h>
 
 
 @implementation EjectionFractionZoomView
diff --git a/Ejection Fraction/html/Ejection Fraction.osirixplugin.zip b/Ejection Fraction/html/Ejection Fraction.osirixplugin.zip
index 249dcd3..903a8f6 100644
Binary files a/Ejection Fraction/html/Ejection Fraction.osirixplugin.zip and b/Ejection Fraction/html/Ejection Fraction.osirixplugin.zip differ
diff --git a/GantryTiltCorrection/GantryTiltCorrection.xcodeproj/project.pbxproj b/GantryTiltCorrection/GantryTiltCorrection.xcodeproj/project.pbxproj
index 0417419..4325102 100644
--- a/GantryTiltCorrection/GantryTiltCorrection.xcodeproj/project.pbxproj
+++ b/GantryTiltCorrection/GantryTiltCorrection.xcodeproj/project.pbxproj
@@ -196,7 +196,14 @@
 			isa = PBXProject;
 			buildConfigurationList = CE6A9B5308AC847E00D0C1EE /* Build configuration list for PBXProject "GantryTiltCorrection" */;
 			compatibilityVersion = "Xcode 3.0";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 089C166AFE841209C02AAC07 /* Duplicate */;
 			projectDirPath = "";
 			projectRoot = "";
diff --git a/HipArthroplastyTemplating/Sources/ArthroplastyTemplatingPlugin.h b/HipArthroplastyTemplating/Sources/ArthroplastyTemplatingPlugin.h
index d687303..e689861 100644
--- a/HipArthroplastyTemplating/Sources/ArthroplastyTemplatingPlugin.h
+++ b/HipArthroplastyTemplating/Sources/ArthroplastyTemplatingPlugin.h
@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <OsiriX Headers/PluginFilter.h>
+#import <OsiriXAPI/PluginFilter.h>
 @class ArthroplastyTemplatingWindowController, ArthroplastyTemplatingStepsController;
 
 @interface ArthroplastyTemplatingPlugin : PluginFilter {
diff --git a/PDF to DICOM/DCMPDFImportFilter.h b/PDF to DICOM/DCMPDFImportFilter.h
index d448956..5a5fab2 100644
--- a/PDF to DICOM/DCMPDFImportFilter.h	
+++ b/PDF to DICOM/DCMPDFImportFilter.h	
@@ -4,7 +4,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "OsiriX Headers/PluginFilter.h"
+#import "OsiriXAPI/PluginFilter.h"
 
 @class DCMCalendarDate;
 
diff --git a/PDF to DICOM/DCMPDFImportFilter.m b/PDF to DICOM/DCMPDFImportFilter.m
index 7919f8e..a70b4dd 100644
--- a/PDF to DICOM/DCMPDFImportFilter.m	
+++ b/PDF to DICOM/DCMPDFImportFilter.m	
@@ -6,8 +6,8 @@
 #import "DCMPDFImportFilter.h"
 #import <OsiriX/DCM.h>
 
-#import "OsiriX Headers/browserController.h"
-#import "OsiriX Headers/DicomFile.h"
+#import "OsiriXAPI/browserController.h"
+#import "OsiriXAPI/DicomFile.h"
 
 @implementation DCMPDFImportFilter
 
diff --git a/PDF to DICOM/PDFToDicom.xcodeproj/project.pbxproj b/PDF to DICOM/PDFToDicom.xcodeproj/project.pbxproj
index a6904a9..8d1f6c6 100644
--- a/PDF to DICOM/PDFToDicom.xcodeproj/project.pbxproj	
+++ b/PDF to DICOM/PDFToDicom.xcodeproj/project.pbxproj	
@@ -8,7 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		8465D07711060DA1007ACA1E /* PDF2DICOM.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8465D07611060DA1007ACA1E /* PDF2DICOM.icns */; };
-		8465D2B711060F65007ACA1E /* OsiriX Headers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8465D2B611060F65007ACA1E /* OsiriX Headers.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		8465D2B711060F65007ACA1E /* OsiriXAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8465D2B611060F65007ACA1E /* OsiriXAPI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		8D5B49AE048680CD000E48DA /* Duplicate_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 32DBCF630370AF2F00C91783 /* Duplicate_Prefix.pch */; };
 		8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; };
 		8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
@@ -35,7 +35,7 @@
 		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		32DBCF630370AF2F00C91783 /* Duplicate_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Duplicate_Prefix.pch; sourceTree = "<group>"; };
 		8465D07611060DA1007ACA1E /* PDF2DICOM.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = PDF2DICOM.icns; sourceTree = "<group>"; };
-		8465D2B611060F65007ACA1E /* OsiriX Headers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "OsiriX Headers.framework"; path = "../../osirix/osirix/build/Development/OsiriX Headers.framework"; sourceTree = SOURCE_ROOT; };
+		8465D2B611060F65007ACA1E /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = ../../osirix/osirix/build/Development/OsiriXAPI.framework; sourceTree = SOURCE_ROOT; };
 		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		AB5D36050680E57E00F4007A /* PDFtoDICOM.osirixplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PDFtoDICOM.osirixplugin; sourceTree = BUILT_PRODUCTS_DIR; };
 		ABA48A640680BB600089EB4F /* DCMPDFImportFilter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DCMPDFImportFilter.h; sourceTree = "<group>"; };
@@ -48,7 +48,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */,
-				8465D2B711060F65007ACA1E /* OsiriX Headers.framework in Frameworks */,
+				8465D2B711060F65007ACA1E /* OsiriXAPI.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -98,7 +98,7 @@
 		1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				8465D2B611060F65007ACA1E /* OsiriX Headers.framework */,
+				8465D2B611060F65007ACA1E /* OsiriXAPI.framework */,
 				1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */,
 			);
 			name = "Linked Frameworks";
diff --git a/PDF to DICOM/html/PDFtoDICOM.osirixplugin.zip b/PDF to DICOM/html/PDFtoDICOM.osirixplugin.zip
index efe9f76..377323a 100644
Binary files a/PDF to DICOM/html/PDFtoDICOM.osirixplugin.zip and b/PDF to DICOM/html/PDFtoDICOM.osirixplugin.zip differ
diff --git a/ROI Enhancement II/Sources/ROI_Enhancement_II.h b/ROI Enhancement II/Sources/ROI_Enhancement_II.h
index 554d340..ce283ca 100644
--- a/ROI Enhancement II/Sources/ROI_Enhancement_II.h	
+++ b/ROI Enhancement II/Sources/ROI_Enhancement_II.h	
@@ -14,7 +14,7 @@
      PURPOSE.
 =========================================================================*/
 
-#import <OsiriX Headers/PluginFilter.h>
+#import <OsiriXAPI/PluginFilter.h>
 
 @interface ROI_Enhancement_II : PluginFilter {
 }
diff --git a/ROI Enhancement II/Sources/RoiEnhancementChart.mm b/ROI Enhancement II/Sources/RoiEnhancementChart.mm
index 00dbfee..42a2cff 100644
--- a/ROI Enhancement II/Sources/RoiEnhancementChart.mm	
+++ b/ROI Enhancement II/Sources/RoiEnhancementChart.mm	
@@ -13,15 +13,15 @@
 =========================================================================*/
 
 #import "RoiEnhancementChart.h"
-#import <OsiriX Headers/DCMPix.h>
+#import <OsiriXAPI/DCMPix.h>
 #import <GRAxes.h>
 #import <GRLineDataSet.h>
 #import "RoiEnhancementAreaDataSet.h"
 #import "RoiEnhancementInterface.h"
-#import <OsiriX Headers/ViewerController.h>
+#import <OsiriXAPI/ViewerController.h>
 #import "RoiEnhancementROIList.h"
-#import <OsiriX Headers/ROI.h>
-#import <OsiriX Headers/DCMView.h>
+#import <OsiriXAPI/ROI.h>
+#import <OsiriXAPI/DCMView.h>
 #import "RoiEnhancementOptions.h"
 
 @implementation RoiEnhancementChart
diff --git a/ROI Enhancement II/Sources/RoiEnhancementInterface.mm b/ROI Enhancement II/Sources/RoiEnhancementInterface.mm
index 3fee8f6..b1a26ab 100644
--- a/ROI Enhancement II/Sources/RoiEnhancementInterface.mm	
+++ b/ROI Enhancement II/Sources/RoiEnhancementInterface.mm	
@@ -13,17 +13,17 @@
 =========================================================================*/
 
 #import "RoiEnhancementInterface.h"
-#import <OsiriX Headers/ViewerController.h>
+#import <OsiriXAPI/ViewerController.h>
 #import "RoiEnhancementROIList.h"
 #import "RoiEnhancementChart.h"
 #import "RoiEnhancementOptions.h"
-#import <OsiriX Headers/DICOMExport.h>
-#import <OsiriX Headers/DCMPix.h>
-#import <OsiriX Headers/DCMView.h>
-#import <OsiriX Headers/BrowserController.h>
+#import <OsiriXAPI/DICOMExport.h>
+#import <OsiriXAPI/DCMPix.h>
+#import <OsiriXAPI/DCMView.h>
+#import <OsiriXAPI/BrowserController.h>
 #import "RoiEnhancementUserDefaults.h"
 #import "RoiEnhancementDicomSaveDialog.h"
-#import "OsiriX Headers/Notifications.h"
+#import "OsiriXAPI/Notifications.h"
 
 const NSString* FileTypePDF = @"pdf";
 const NSString* FileTypeTIFF = @"tiff";
diff --git a/ROI Enhancement II/Sources/RoiEnhancementOptions.mm b/ROI Enhancement II/Sources/RoiEnhancementOptions.mm
index 5e02da5..812934d 100644
--- a/ROI Enhancement II/Sources/RoiEnhancementOptions.mm	
+++ b/ROI Enhancement II/Sources/RoiEnhancementOptions.mm	
@@ -18,9 +18,9 @@
 #import "RoiEnhancementROIList.h"
 #import <GRAxes.h>
 #import "RoiEnhancementUserDefaults.h"
-#import <OsiriX Headers/ViewerController.h>
-#import <OsiriX Headers/DCMView.h>
-#import <OsiriX Headers/Notifications.h>
+#import <OsiriXAPI/ViewerController.h>
+#import <OsiriXAPI/DCMView.h>
+#import <OsiriXAPI/Notifications.h>
 
 @implementation RoiEnhancementOptions
 
diff --git a/ROI Enhancement II/Sources/RoiEnhancementROIList.mm b/ROI Enhancement II/Sources/RoiEnhancementROIList.mm
index 801887d..26600f4 100644
--- a/ROI Enhancement II/Sources/RoiEnhancementROIList.mm	
+++ b/ROI Enhancement II/Sources/RoiEnhancementROIList.mm	
@@ -13,14 +13,14 @@
 =========================================================================*/
 
 #import "RoiEnhancementROIList.h"
-#import <OsiriX Headers/ROI.h>
+#import <OsiriXAPI/ROI.h>
 #import "RoiEnhancementInterface.h"
 #import "RoiEnhancementChart.h"
-#import <OsiriX Headers/ViewerController.h>
+#import <OsiriXAPI/ViewerController.h>
 #import <GRLineDataSet.h>
 #import <GRAreaDataSet.h>
 #import "RoiEnhancementOptions.h"
-#import <OsiriX Headers/Notifications.h>
+#import <OsiriXAPI/Notifications.h>
 
 @implementation RoiEnhancementROIRec
 @synthesize roi = _roi;
diff --git a/ROI Enhancement II/html/ROI-Enhancement.osirixplugin.zip b/ROI Enhancement II/html/ROI-Enhancement.osirixplugin.zip
index c127c75..f6e2b35 100644
Binary files a/ROI Enhancement II/html/ROI-Enhancement.osirixplugin.zip and b/ROI Enhancement II/html/ROI-Enhancement.osirixplugin.zip differ
diff --git a/XploreReports/XploreReportsClass.h b/XploreReports/XploreReportsClass.h
index 11f1a36..61cf162 100644
--- a/XploreReports/XploreReportsClass.h
+++ b/XploreReports/XploreReportsClass.h
@@ -3,7 +3,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <OsiriX Headers/PluginFilter.h>
+#import <OsiriXAPI/PluginFilter.h>
 
 @interface XploreReportsClass : PluginFilter {