diff --git a/src/engine/AccountP.h b/src/engine/AccountP.h
index e432c21080..d258e80c63 100644
--- a/src/engine/AccountP.h
+++ b/src/engine/AccountP.h
@@ -40,8 +40,6 @@
 #define XACC_ACCOUNT_P_H
 
 #include "Account.h"
-#include "gnc-commodity.h"
-#include "gnc-engine.h"
 
 /** STRUCTS *********************************************************/
 
@@ -69,9 +67,4 @@ void xaccAccountSetGUID (Account *account, const GUID *guid);
 /* Register Accounts with the engine */
 gboolean xaccAccountRegister (void);
 
-/** killed for now, need to resurect this or something similar
- *  * for transactional/dirty kvp.  Later.  Right now a place holder
- *   */
-#define xaccAccountSetSlots_nc(A,S) qof_instance_set_slots(QOF_INSTANCE(A),S)
-
 #endif /* XACC_ACCOUNT_P_H */
diff --git a/src/engine/Period.c b/src/engine/Period.c
index 6c8144e172..4b81363353 100644
--- a/src/engine/Period.c
+++ b/src/engine/Period.c
@@ -668,7 +668,7 @@ add_closing_balances (Account *parent,
       kvp_frame_set_guid (cwd, "/book/prev-acct", xaccAccountGetGUID (candidate));
       kvp_frame_set_guid (cwd, "/book/prev-book", qof_book_get_guid(closed_book));
 
-      xaccAccountSetSlots_nc (twin, twin->inst.kvp_data);
+      qof_instance_set_slots(QOF_INSTANCE(twin), twin->inst.kvp_data);
       
       /* -------------------------------- */
       /* Add KVP to closed account, indicating where 
@@ -678,7 +678,7 @@ add_closing_balances (Account *parent,
       kvp_frame_set_guid (cwd, "/book/next-book", qof_book_get_guid(open_book));
       kvp_frame_set_guid (cwd, "/book/next-acct", xaccAccountGetGUID (twin));
 
-      xaccAccountSetSlots_nc (candidate, candidate->inst.kvp_data);
+      qof_instance_set_slots(QOF_INSTANCE(candidate), candidate->inst.kvp_data);
 
       /* -------------------------------- */
       /* We need to carry a balance on any account that is not
diff --git a/src/engine/cap-gains.c b/src/engine/cap-gains.c
index 6f43a145cd..49eecfb75b 100644
--- a/src/engine/cap-gains.c
+++ b/src/engine/cap-gains.c
@@ -285,7 +285,7 @@ xaccAccountSetDefaultGainAccount (Account *acc, Account *gain_acct)
   xaccAccountBeginEdit (acc);
   vvv = kvp_value_new_guid (xaccAccountGetGUID (gain_acct));
   kvp_frame_set_slot_nc (cwd, cur_name, vvv);
-  xaccAccountSetSlots_nc (acc, acc->inst.kvp_data);
+  qof_instance_set_slots(QOF_INSTANCE(acc), acc->inst.kvp_data);
   xaccAccountCommitEdit (acc);
 }
 
@@ -352,7 +352,7 @@ GetOrMakeGainAcct (Account *acc, gnc_commodity * currency)
 
       vvv = kvp_value_new_guid (xaccAccountGetGUID (gain_acct));
       kvp_frame_set_slot_nc (cwd, cur_name, vvv);
-      xaccAccountSetSlots_nc (acc, acc->inst.kvp_data);
+      qof_instance_set_slots(QOF_INSTANCE(acc), acc->inst.kvp_data);
       xaccAccountCommitEdit (acc);
 
   }
diff --git a/src/engine/test-core/test-engine-stuff.c b/src/engine/test-core/test-engine-stuff.c
index cb520b917b..91d071d7e1 100644
--- a/src/engine/test-core/test-engine-stuff.c
+++ b/src/engine/test-core/test-engine-stuff.c
@@ -1200,7 +1200,7 @@ get_random_account(QofBook *book)
 
     xaccAccountSetCommodity(ret, get_random_commodity(book));
 
-    xaccAccountSetSlots_nc(ret, get_random_kvp_frame());
+    qof_instance_set_slots(QOF_INSTANCE(ret), get_random_kvp_frame());
 
     root = gnc_book_get_root_account (book);
     if (!root) 
@@ -1233,7 +1233,7 @@ make_random_changes_to_account (QofBook *book, Account *account)
 
     xaccAccountSetCommodity (account, get_random_commodity(book));
 
-    xaccAccountSetSlots_nc (account, get_random_kvp_frame());
+    qof_instance_set_slots(QOF_INSTANCE(account), get_random_kvp_frame());
 
     xaccAccountCommitEdit (account);
 }