diff --git a/headers/os/interface/Picture.h b/headers/os/interface/Picture.h
index 247ad0a755..d85b186dbf 100644
--- a/headers/os/interface/Picture.h
+++ b/headers/os/interface/Picture.h
@@ -1,83 +1,85 @@
 /*
- * Copyright 2001-2009, Haiku.
- * Distributed under the terms of the MIT License.
- *
+ * Copyright 2001-2009, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT license.
  */
-
 #ifndef	_PICTURE_H
 #define	_PICTURE_H
 
+
 #include <BeBuild.h>
 #include <InterfaceDefs.h>
 #include <Rect.h>
 #include <Archivable.h>
 
+
 class BDataIO;
 class BView;
 struct _BPictureExtent_;
 
-// BPicture class --------------------------------------------------------------
+
 class BPicture : public BArchivable {
 public:
-							BPicture();
-							BPicture(const BPicture &original);
-							BPicture(BMessage *data);
-virtual						~BPicture();
-static	BArchivable			*Instantiate(BMessage *data);
-virtual	status_t			Archive(BMessage *data, bool deep = true) const;
-virtual	status_t			Perform(perform_code d, void *arg);
+								BPicture();
+								BPicture(const BPicture& other);
+								BPicture(BMessage* archive);
+	virtual						~BPicture();
 
-		status_t			Play(void **callBackTable,
-								int32 tableEntries,
-								void *userData);
+	static	BArchivable*		Instantiate(BMessage* archive);
+	virtual	status_t			Archive(BMessage* archive,
+									bool deep = true) const;
+	virtual	status_t			Perform(perform_code d, void* arg);
 
-		status_t			Flatten(BDataIO *stream);
-		status_t			Unflatten(BDataIO *stream);
+			status_t			Play(void** callBackTable,
+									int32 tableEntries,
+									void* userData);
+
+			status_t			Flatten(BDataIO* stream);
+			status_t			Unflatten(BDataIO* stream);
 
-/*----- Private or reserved -----------------------------------------*/
 private:
+	// FBC padding and forbidden methods
+	virtual	void				_ReservedPicture1();
+	virtual	void				_ReservedPicture2();
+	virtual	void				_ReservedPicture3();
 
-friend class BWindow;
-friend class BView;
-friend class BPrintJob;
+			BPicture&			operator=(const BPicture&);
 
-virtual	void				_ReservedPicture1();
-virtual	void				_ReservedPicture2();
-virtual	void				_ReservedPicture3();
+private:
+	friend class BWindow;
+	friend class BView;
+	friend class BPrintJob;
 
-		BPicture			&operator=(const BPicture &);
+			void				_InitData();
+			void				_DisposeData();
 
-		void				_InitData();
-		void				_DisposeData();
+			void				_ImportOldData(const void* data, int32 size);
 
-		void				_ImportOldData(const void *data, int32 size);
+			void				SetToken(int32 token);
+			int32				Token() const;
 
-		void				SetToken(int32 token);
-		int32				Token() const;
+			bool				_AssertLocalCopy();
+			bool				_AssertOldLocalCopy();
+			bool				_AssertServerCopy();
 
-		bool				_AssertLocalCopy();
-		bool				_AssertOldLocalCopy();
-		bool				_AssertServerCopy();
+			status_t			_Upload();
+			status_t			_Download();
 
-		status_t			_Upload();
-		status_t			_Download();
+	// Deprecated API
+								BPicture(const void* data, int32 size);
+			const void*			Data() const;
+			int32				DataSize() const;
 
-		/**Deprecated API**/
-							BPicture(const void *data, int32 size);
-		const void			*Data() const;
-		int32				DataSize() const;
-
-		void				Usurp(BPicture *lameDuck);
-		BPicture			*StepDown();
+			void				Usurp(BPicture* lameDuck);
+			BPicture*			StepDown();
 		
 
-		int32				fToken;
-		_BPictureExtent_		*fExtent;
-		BPicture			*fUsurped;
+private:
+			int32				fToken;
+			_BPictureExtent_*	fExtent;
+			BPicture*			fUsurped;
 
-		uint32				_reserved[3];
+			uint32				_reserved[3];
 };
-//------------------------------------------------------------------------------
 
 #endif // _PICTURE_H