diff --git a/cli/cli.c b/cli/cli.c
index 66e18d766..ced3deca4 100644
--- a/cli/cli.c
+++ b/cli/cli.c
@@ -31,7 +31,6 @@
 #include <libtransmission/transmission.h>
 #include <libtransmission/bencode.h>
 #include <libtransmission/makemeta.h>
-#include <libtransmission/metainfo.h> /* tr_metainfoFree */
 #include <libtransmission/tr-getopt.h>
 #include <libtransmission/utils.h> /* tr_wait */
 #include <libtransmission/web.h> /* tr_webRun */
diff --git a/daemon/daemon.c b/daemon/daemon.c
index fad29bece..14f2c7cd9 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -22,7 +22,6 @@
 
 #include <libtransmission/transmission.h>
 #include <libtransmission/bencode.h>
-#include <libtransmission/rpcimpl.h>
 #include <libtransmission/tr-getopt.h>
 #include <libtransmission/utils.h>
 #include <libtransmission/version.h>
diff --git a/libtransmission/bandwidth.h b/libtransmission/bandwidth.h
index ba8ca8e8b..2f7f56aa5 100644
--- a/libtransmission/bandwidth.h
+++ b/libtransmission/bandwidth.h
@@ -10,6 +10,10 @@
  * $Id:$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_BANDWIDTH_H
 #define TR_BANDWIDTH_H
 
diff --git a/libtransmission/blocklist.h b/libtransmission/blocklist.h
index 7b285b34d..c4b1e76e4 100644
--- a/libtransmission/blocklist.h
+++ b/libtransmission/blocklist.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_BLOCKLIST_H
 #define TR_BLOCKLIST_H
 
diff --git a/libtransmission/completion.h b/libtransmission/completion.h
index a707e08f8..071adea31 100644
--- a/libtransmission/completion.h
+++ b/libtransmission/completion.h
@@ -25,6 +25,10 @@
 #ifndef TR_COMPLETION_H
 #define TR_COMPLETION_H
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #include "transmission.h"
 
 struct tr_bitfield;
diff --git a/libtransmission/crypto.h b/libtransmission/crypto.h
index b44e9b437..f8dec9d3f 100644
--- a/libtransmission/crypto.h
+++ b/libtransmission/crypto.h
@@ -13,6 +13,10 @@
 #ifndef TR_ENCRYPTION_H
 #define TR_ENCRYPTION_H
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #include <inttypes.h>
 
 #include "utils.h" /* TR_GNUC_NULL_TERMINATED */
diff --git a/libtransmission/fastresume.h b/libtransmission/fastresume.h
index efd1c6766..0c86cf636 100644
--- a/libtransmission/fastresume.h
+++ b/libtransmission/fastresume.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_FAST_RESUME_H
 #define TR_FAST_RESUME_H
 
diff --git a/libtransmission/fdlimit.h b/libtransmission/fdlimit.h
index 8865427b5..345d793c7 100644
--- a/libtransmission/fdlimit.h
+++ b/libtransmission/fdlimit.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #include "net.h"
 
 /***********************************************************************
diff --git a/libtransmission/handshake.h b/libtransmission/handshake.h
index 9f9c529aa..8fc68a763 100644
--- a/libtransmission/handshake.h
+++ b/libtransmission/handshake.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_HANDSHAKE_H
 #define TR_HANDSHAKE_H
 
diff --git a/libtransmission/inout.h b/libtransmission/inout.h
index 6b96cdbd7..eb7b3d999 100644
--- a/libtransmission/inout.h
+++ b/libtransmission/inout.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_IO_H
 #define TR_IO_H 1
 
diff --git a/libtransmission/list.h b/libtransmission/list.h
index a14f7533e..4e2eec709 100644
--- a/libtransmission/list.h
+++ b/libtransmission/list.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_LIST_H
 #define TR_LIST_H
 
diff --git a/libtransmission/metainfo.h b/libtransmission/metainfo.h
index fa7bab794..5738cdc31 100644
--- a/libtransmission/metainfo.h
+++ b/libtransmission/metainfo.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_METAINFO_H
 #define TR_METAINFO_H 1
 
@@ -37,8 +41,6 @@ int  tr_metainfoParse( const tr_handle *      handle,
                        tr_info *              info,
                        const struct tr_benc * benc );
 
-void tr_metainfoFree( tr_info * inf );
-
 void tr_metainfoRemoveSaved( const tr_handle * handle,
                              const tr_info *   info );
 
diff --git a/libtransmission/natpmp.h b/libtransmission/natpmp.h
index 872db4fb1..d2a387752 100644
--- a/libtransmission/natpmp.h
+++ b/libtransmission/natpmp.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_NATPMP_H
 #define TR_NATPMP_H 1
 
diff --git a/libtransmission/net.h b/libtransmission/net.h
index 5fa26d5e3..272f5f195 100644
--- a/libtransmission/net.h
+++ b/libtransmission/net.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef _TR_NET_H_
 #define _TR_NET_H_
 
diff --git a/libtransmission/peer-common.h b/libtransmission/peer-common.h
index d262845c0..3e5080a01 100644
--- a/libtransmission/peer-common.h
+++ b/libtransmission/peer-common.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_PEER_H
 #define TR_PEER_H
 
diff --git a/libtransmission/peer-io.h b/libtransmission/peer-io.h
index cdfd9bb36..598b4f06f 100644
--- a/libtransmission/peer-io.h
+++ b/libtransmission/peer-io.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_PEER_IO_H
 #define TR_PEER_IO_H
 
diff --git a/libtransmission/peer-mgr-private.h b/libtransmission/peer-mgr-private.h
index bc68cf3b3..ad652c941 100644
--- a/libtransmission/peer-mgr-private.h
+++ b/libtransmission/peer-mgr-private.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_PEER_MGR_PRIVATE_H
 #define TR_PEER_MGR_PRIVATE_H
 
diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h
index 13f45cd25..d04d8646c 100644
--- a/libtransmission/peer-mgr.h
+++ b/libtransmission/peer-mgr.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_PEER_MGR_H
 #define TR_PEER_MGR_H
 
diff --git a/libtransmission/peer-msgs.h b/libtransmission/peer-msgs.h
index 98aa08e53..c8301452f 100644
--- a/libtransmission/peer-msgs.h
+++ b/libtransmission/peer-msgs.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_PEER_MSGS_H
 #define TR_PEER_MSGS_H
 
diff --git a/libtransmission/port-forwarding.h b/libtransmission/port-forwarding.h
index cbdad4640..19d698d37 100644
--- a/libtransmission/port-forwarding.h
+++ b/libtransmission/port-forwarding.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef SHARED_H
 #define SHARED_H 1
 
diff --git a/libtransmission/ptrarray.h b/libtransmission/ptrarray.h
index d86acc75e..79341d818 100644
--- a/libtransmission/ptrarray.h
+++ b/libtransmission/ptrarray.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef _TR_PTR_ARRAY_H_
 #define _TR_PTR_ARRAY_H_
 
diff --git a/libtransmission/publish.h b/libtransmission/publish.h
index 42b644fe4..6421ba795 100644
--- a/libtransmission/publish.h
+++ b/libtransmission/publish.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef _TR_PUBLISHER_H_
 #define _TR_PUBLISHER_H_
 
diff --git a/libtransmission/ratecontrol.h b/libtransmission/ratecontrol.h
index 32d690c2c..7289eb4be 100644
--- a/libtransmission/ratecontrol.h
+++ b/libtransmission/ratecontrol.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef _TR_RATECONTROL_H_
 #define _TR_RATECONTROL_H_
 
diff --git a/libtransmission/resume.h b/libtransmission/resume.h
index d3d1465e1..db1f9fd25 100644
--- a/libtransmission/resume.h
+++ b/libtransmission/resume.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_RESUME_H
 #define TR_RESUME_H
 
diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h
index b21833e2e..94429d8f6 100644
--- a/libtransmission/rpc-server.h
+++ b/libtransmission/rpc-server.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_RPC_SERVER_H
 #define TR_RPC_SERVER_H
 
diff --git a/libtransmission/session.h b/libtransmission/session.h
index 02092d40b..f7fde96ba 100644
--- a/libtransmission/session.h
+++ b/libtransmission/session.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_INTERNAL_H
 #define TR_INTERNAL_H 1
 
diff --git a/libtransmission/stats.h b/libtransmission/stats.h
index 262a676eb..cb82ab996 100644
--- a/libtransmission/stats.h
+++ b/libtransmission/stats.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_STATS_H
 #define TR_STATS_H
 
diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h
index 2b3429b51..da50ae8e5 100644
--- a/libtransmission/torrent.h
+++ b/libtransmission/torrent.h
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_TORRENT_H
 #define TR_TORRENT_H 1
 
diff --git a/libtransmission/tracker.h b/libtransmission/tracker.h
index 7f14e6658..c40b2f0c8 100644
--- a/libtransmission/tracker.h
+++ b/libtransmission/tracker.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef _TR_TRACKER_H_
 #define _TR_TRACKER_H_
 
diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index 4a792ac5f..1f741511e 100644
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -806,6 +806,11 @@ int tr_torrentParse( const tr_session  * session,
                      const tr_ctor     * ctor,
                      tr_info           * setme_info_or_NULL );
 
+/** @brief free a metainfo
+    @see tr_torrentParse */
+void tr_metainfoFree( tr_info * inf );
+
+
 /** Instantiate a single torrent.
     @return 0 on success,
             TR_EINVALID if the torrent couldn't be parsed, or
diff --git a/libtransmission/trevent.h b/libtransmission/trevent.h
index 318278afa..058c97d26 100644
--- a/libtransmission/trevent.h
+++ b/libtransmission/trevent.h
@@ -10,7 +10,12 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_EVENT_H
+#define TR_EVENT_H
 
 #include <stddef.h> /* size_t */
 #include <inttypes.h> /* uint64_t */
diff --git a/libtransmission/upnp.h b/libtransmission/upnp.h
index 263285721..af4aaafbd 100644
--- a/libtransmission/upnp.h
+++ b/libtransmission/upnp.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_UPNP_H
 #define TR_UPNP_H 1
 
diff --git a/libtransmission/verify.h b/libtransmission/verify.h
index d634cb7be..97c1bdcbc 100644
--- a/libtransmission/verify.h
+++ b/libtransmission/verify.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_VERIFY_H
 #define TR_VERIFY_H 1
 
diff --git a/libtransmission/webseed.h b/libtransmission/webseed.h
index eeba6f4b7..e5a2ebb7a 100644
--- a/libtransmission/webseed.h
+++ b/libtransmission/webseed.h
@@ -10,6 +10,10 @@
  * $Id$
  */
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_WEBSEED_H
 #define TR_WEBSEED_H
 
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 9cda81a3c..9b1258c5c 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -48,7 +48,6 @@
 #import "ExpandedPathToPathTransformer.h"
 #import "ExpandedPathToIconTransformer.h"
 #import "SpeedLimitToTurtleIconTransformer.h"
-#import "metainfo.h"
 #import "utils.h"
 
 #import "UKKQueue.h"
diff --git a/macosx/DragOverlayWindow.m b/macosx/DragOverlayWindow.m
index 8814dafc9..a44028761 100644
--- a/macosx/DragOverlayWindow.m
+++ b/macosx/DragOverlayWindow.m
@@ -25,7 +25,6 @@
 #import "DragOverlayWindow.h"
 #import "DragOverlayView.h"
 #import "NSStringAdditions.h"
-#import "metainfo.h"
 
 @implementation DragOverlayWindow
 
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 33b9e4d81..4f6b64bed 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -27,7 +27,6 @@
 #import "FileListNode.h"
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
-#import "metainfo.h"
 #import "utils.h" //tr_httpIsValidURL
 
 @interface Torrent (Private)